Fixes for activeViewport reactivity

LesionTracker/client/components/viewer.js

@@ -59,9 +59,15 @@ function resizeViewports() {
 }
 
 Template.viewer.onCreated(function() {
-     this.data.activeViewport = new ReactiveVar(0);
-     this.data.viewportRows = new ReactiveVar(1);
-     this.data.viewportColumns = new ReactiveVar(2);
+    if (this.data.activeViewport === undefined) {
+        this.data.activeViewport = new ReactiveVar(0);
+    }
+    if (this.data.viewportRows === undefined) {
+        this.data.viewportRows = new ReactiveVar(1);
+    }
+    if (this.data.viewportColumns === undefined) {
+        this.data.viewportColumns = new ReactiveVar(2);
+    }
 });
 
 // Avoid doing DOM manipulation during the resize handler

LesionTracker/client/components/viewerMain/viewerMain.html

@@ -1,6 +1,6 @@
 <template name="viewerMain">
     <div class="viewerMain">
-        {{ >toolbar toolbarOptions  activeViewport=activeViewport viewportRows=viewportRows viewportColumns=viewportColumns}}
+        {{ >toolbar toolbarOptions=toolbarOptions activeViewport=activeViewport viewportRows=viewportRows viewportColumns=viewportColumns}}
         {{ >imageViewerViewports studies=studies activeViewport=activeViewport viewportRows=viewportRows viewportColumns=viewportColumns}}
         {{ >lesionTableContainer studies=studies activeViewport=activeViewport}}
     </div>

LesionTracker/client/route.js

@@ -19,7 +19,9 @@ Router.route('/viewer/:_id', {
         Meteor.call('GetStudyMetadata', this.params._id, function(error, study) {
             sortStudy(study);
 
-            var studies = [study];
+            var data = {
+                studies: [study]
+            };
             var title = study.seriesList[0].instances[0].patientName;
             var contentid = generateUUID();
 
@@ -30,8 +32,7 @@ Router.route('/viewer/:_id', {
             tabs.insert(newTabObject);
 
             self.render('worklist');
-            console.log('Setting studesInTab');
-            Session.set('StudiesInTab#' + contentid, studies);
+            Session.set('DataInTab#' + contentid, data);
             Session.set('OpenNewTabEvent', contentid);
         });
     }