From f26fc22cef82d2b76fd4cde1ffc9ae1e158c1ad1 Mon Sep 17 00:00:00 2001
From: Aysel Afsar <aysel.afsar@gmail.com>
Date: Wed, 24 Feb 2016 12:45:37 -0500
Subject: [PATCH] LT-32: Set lesion tool as active tool if timepoint is
 baseline otherwise window level when switch the tabs

---
 LesionTracker/client/components/viewer.js             |  7 +++++++
 Packages/lesiontracker/lib/setTimepointActiveTool.js  | 10 ++++++++++
 .../lib/worklist/worklistModification.js              | 11 +++++------
 Packages/lesiontracker/package.js                     |  4 ++++
 4 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 Packages/lesiontracker/lib/setTimepointActiveTool.js

diff --git a/LesionTracker/client/components/viewer.js b/LesionTracker/client/components/viewer.js
index 7e6e2e97a..b4bc48a93 100644
--- a/LesionTracker/client/components/viewer.js
+++ b/LesionTracker/client/components/viewer.js
@@ -120,6 +120,7 @@ Template.viewer.onCreated(function() {
         log.info('autorun viewer.js. Ready: ' + subscriptionsReady);
 
         if (subscriptionsReady) {
+
             TrialResponseCriteria.validateAllDelayed();
 
             ViewerStudies.find().observe({
@@ -260,6 +261,12 @@ Template.viewer.onCreated(function() {
                     TrialResponseCriteria.validateAll();
                 }
             });
+
+            // Set active tool for timepoint
+            dataContext.timepointIds.forEach(function(timepointId) {
+                var timepoint = Timepoints.findOne({timepointId: timepointId});
+                setTimepointActiveTool(timepoint);
+            });
         }
     });
 });
diff --git a/Packages/lesiontracker/lib/setTimepointActiveTool.js b/Packages/lesiontracker/lib/setTimepointActiveTool.js
new file mode 100644
index 000000000..43cd7a8ee
--- /dev/null
+++ b/Packages/lesiontracker/lib/setTimepointActiveTool.js
@@ -0,0 +1,10 @@
+// If timepoint is baseline, sets lesion tool as active tool
+// Else sets default tool
+setTimepointActiveTool = function(timepoint) {
+    if ((timepoint.timepointType).toLowerCase() === "baseline") {
+        // Set active tool as lesion tool
+        toolManager.setActiveTool('lesion');
+    } else {
+        toolManager.setActiveTool(toolManager.getDefaultTool());
+    }
+};
\ No newline at end of file
diff --git a/Packages/lesiontracker/lib/worklist/worklistModification.js b/Packages/lesiontracker/lib/worklist/worklistModification.js
index b96eaad35..8010d40f9 100644
--- a/Packages/lesiontracker/lib/worklist/worklistModification.js
+++ b/Packages/lesiontracker/lib/worklist/worklistModification.js
@@ -14,6 +14,8 @@ function dblClickOnStudy(data) {
         studyInstanceUid: data.studyInstanceUid
     });
 
+    console.log(study);
+
     // Check if the study has been associated, and if not, just open it on its own
     if (!study) {
         // Open a new tab with this study
@@ -28,17 +30,14 @@ function dblClickOnStudy(data) {
         }
     });
 
-    // Check timepointType whether or not baseline
-    if ((timepoint.timepointType).toLowerCase() === "baseline") {
-        // Set active tool as lesion tool
-        toolManager.setActiveTool('lesion');
-    }
-
     if (!timepoint) {
         openNewTab(data.studyInstanceUid, title);
         return;
     }
 
+    // Set active tool for timepoint
+    setTimepointActiveTool(timepoint);
+
     // Add the Timepoint name to the Patient name to create the tab title
     title += ' ' + getTimepointName(timepoint);
 
diff --git a/Packages/lesiontracker/package.js b/Packages/lesiontracker/package.js
index 72ca75ad9..167f10231 100644
--- a/Packages/lesiontracker/package.js
+++ b/Packages/lesiontracker/package.js
@@ -160,6 +160,8 @@ Package.onUse(function(api) {
     api.addFiles('lib/clearTools.js', 'client');
     api.addFiles('lib/calculateTotalLesionBurden.js', 'client');
     api.addFiles('lib/convertToNonTarget.js', 'client');
+    api.addFiles('lib/setTimepointActiveTool.js', 'client');
+
 
     api.addFiles('lib/syncMeasurementAndToolData.js', 'client');
     api.addFiles('lib/syncImageMeasurementAndToolData.js', 'client');
@@ -194,6 +196,8 @@ Package.onUse(function(api) {
     api.export('calculateTotalLesionBurden', 'client');
     api.export('convertToNonTarget', 'client');
     api.export('exportStudies', 'client');
+    api.export('setTimepointActiveTool', 'client');
+
 
     // Export global objects
     api.export('TrialResponseCriteria', 'client');