Merge pull request #1452 from StochSS/hotfix-spatial-model-presentations

HOTFIX: Spatial Model Presentations

client/domain-view/templates/actionsView.pug

@@ -16,7 +16,7 @@ div#domain-actions-editor.card
 
           a.nav-link.tab(data-hook="actions-view-tab" data-toggle="tab" href="#view-actions") View
 
-    button.btn.btn-outline-collapse.inline(data-toggle="collapse" data-target="#collapse-actions" data-hook="collapse") +
+    button.btn.btn-outline-collapse.inline(data-toggle="collapse" data-target="#collapse-actions" data-hook="collapse-actions") +
 
   div.card-body
 

client/domain-view/templates/shapesView.pug

@@ -16,7 +16,7 @@ div#domain-geometries-editor.card
 
           a.nav-link.tab(data-hook="shapes-view-tab" data-toggle="tab" href="#view-shapes") View
 
-    button.btn.btn-outline-collapse.inline(data-toggle="collapse" data-target="#collapse-shapes" data-hook="collapse") +
+    button.btn.btn-outline-collapse.inline(data-toggle="collapse" data-target="#collapse-shapes" data-hook="collapse-shapes") +
 
   div.card-body
     p.mb-0

client/domain-view/templates/transformationsView.pug

@@ -16,7 +16,7 @@ div#domain-transformation-editor.card
 
           a.nav-link.tab(data-hook="transformations-view-tab" data-toggle="tab" href="#view-transformations") View
 
-    button.btn.btn-outline-collapse.inline(data-toggle="collapse" data-target="#collapse-transformations" data-hook="collapse") +
+    button.btn.btn-outline-collapse.inline(data-toggle="collapse" data-target="#collapse-transformations" data-hook="collapse-transformations") +
 
   div.card-body
 

client/domain-view/views/actions-view.js

@@ -29,7 +29,7 @@ let template = require('../templates/actionsView.pug');
 module.exports = View.extend({
   template: template,
   events: {
-    'click [data-hook=collapse]' : 'changeCollapseButtonText',
+    'click [data-hook=collapse-actions]' : 'changeCollapseButtonText',
     'click [data-hook=fill-action]' : 'addAction',
     'click [data-hook=set-action]' : 'addAction',
     'click [data-hook=remove-action]' : 'addAction',

client/domain-view/views/shapes-view.js

@@ -29,7 +29,7 @@ let template = require('../templates/shapesView.pug');
 module.exports = View.extend({
   template: template,
   events: {
-    'click [data-hook=collapse]' : 'changeCollapseButtonText',
+    'click [data-hook=collapse-shapes]' : 'changeCollapseButtonText',
     'click [data-hook=cartesian-lattice]' : 'addShape',
     'click [data-hook=spherical-lattice]' : 'addShape',
     'click [data-hook=cylindrical-lattice]' : 'addShape'

client/domain-view/views/transformations-view.js

@@ -29,7 +29,7 @@ let template = require('../templates/transformationsView.pug');
 module.exports = View.extend({
   template: template,
   events: {
-    'click [data-hook=collapse]' : 'changeCollapseButtonText',
+    'click [data-hook=collapse-transformations]' : 'changeCollapseButtonText',
     'click [data-hook=translate-transformation]' : 'addTransformation',
     'click [data-hook=rotate-transformation]' : 'addTransformation',
     'click [data-hook=reflect-transformation]' : 'addTransformation',

client/domain-view/views/types-view.js

@@ -63,6 +63,19 @@ module.exports = View.extend({
   changeCollapseButtonText: function (e) {
     app.changeCollapseButtonText(this, e);
   },
+  getParticleCounts: function (particles) {
+    let particleCounts = {};
+    particles.forEach((particle) => {
+      if(particleCounts[particle.type]) {
+        particleCounts[particle.type] += 1;
+      }else{
+        particleCounts[particle.type] = 1;
+      }
+    });
+    this.collection.forEach((type) => {
+      type.numParticles = particleCounts[type.typeID] ? particleCounts[type.typeID] : 0;
+    });
+  },
   handleAddDomainType: function () {
     let name = this.collection.addType();
     this.collection.parent.trigger('update-particle-type-options', {currName: name});
@@ -135,17 +148,7 @@ module.exports = View.extend({
     });
   },
   updateParticleCounts: function (particles) {
-    let particleCounts = {};
-    particles.forEach((particle) => {
-      if(particleCounts[particle.type]) {
-        particleCounts[particle.type] += 1;
-      }else{
-        particleCounts[particle.type] = 1;
-      }
-    });
-    this.collection.forEach((type) => {
-      type.numParticles = particleCounts[type.typeID] ? particleCounts[type.typeID] : 0;
-    });
+    this.getParticleCounts(particles);
     $(this.queryByHook('unassigned-type-count')).text(this.collection.models[0].numParticles);
     this.renderEditTypeView();
     this.renderViewTypeView();

client/pages/model-presentation.js

@@ -52,10 +52,22 @@ let ModelPresentationPage = PageView.extend({
     let endpoint = `api/file/json-data?file=${this.model.directory}&owner=${owner}`;
     app.getXHR(endpoint, {
       success: (err, response, body) => {
+        let particles = body.model.domain.particles
         this.model.set(body.model);
         if(this.model.is_spatial && Object.keys(body.model.domain).includes("particles")) {
           let particles = new Particles(body.model.domain.particles);
           this.model.domain.particles = particles;
+          this.model.domain.actions.forEach((action) => {
+            action.filename = action.filename.split('/').pop();
+            action.subdomainFile = action.subdomainFile.split('/').pop();
+          });
+          this.model.domain.x_lim = body.domainLimits[0];
+          this.model.domain.y_lim = body.domainLimits[1];
+          this.model.domain.z_lim = body.domainLimits[2];
+          let particleCounts = {};
+          this.model.domain.types.forEach((type) => { particleCounts[type.typeID] = 0; });
+          particles.forEach((particle) => { particleCounts[particle.type] += 1; });
+          this.model.domain.types.forEach((type) => { type.numParticles = particleCounts[type.typeID]; });
         }
         let domainPlot = Boolean(body.domainPlot) ? body.domainPlot : null;
         this.renderSubviews(false, domainPlot);