From e6fd2e60b0bcde9a0792a07df329bb8e65e81746 Mon Sep 17 00:00:00 2001
From: Evren Ozkan <evren217@gmail.com>
Date: Tue, 24 Nov 2015 11:55:10 -0500
Subject: [PATCH] Move removeCollections.js to server folder from both and
 check patientId while setting null array to toolState data

---
 .../client/components/viewerMain/viewerMain.js   | 16 +++++++++++-----
 Packages/lesiontracker/package.js                |  2 +-
 .../{both => server}/removeCollections.js        |  8 +++++---
 3 files changed, 17 insertions(+), 9 deletions(-)
 rename Packages/lesiontracker/{both => server}/removeCollections.js (65%)

diff --git a/LesionTracker/client/components/viewerMain/viewerMain.js b/LesionTracker/client/components/viewerMain/viewerMain.js
index 5961c4944..97d090ea6 100644
--- a/LesionTracker/client/components/viewerMain/viewerMain.js
+++ b/LesionTracker/client/components/viewerMain/viewerMain.js
@@ -70,25 +70,31 @@ Template.viewerMain.helpers({
 
 Template.viewerMain.events({
     'click button#clearTools': function(e, template) {
+        var contentId = template.data.contentId;
+        var patientId = template.data.studies[0].patientId;
         var toolTypes = ["lesion", "nonTarget"];
         var toolState = cornerstoneTools.globalImageIdSpecificToolStateManager.toolState;
         var toolStateKeys = Object.keys(toolState).slice(0);
+
         toolStateKeys.forEach(function (imageId) {
             toolTypes.forEach(function (toolType) {
-                toolState[imageId][toolType] = {
-                    data: []
-                };
+                if(toolState[imageId][toolType]) {
+                    if(toolState[imageId][toolType].data[0].patientId === patientId) {
+                        toolState[imageId][toolType] = {
+                            data: []
+                        }
+                    }
+                }
             });
 
         });
 
         // Update imageViewerViewport elements
-        $(".imageViewerViewport").each(function(viewportIndex, element) {
+        $("#"+contentId+" .imageViewerViewport").each(function(viewportIndex, element) {
             cornerstone.updateImage(element);
         });
 
         // Remove patient's measurements
-        var patientId = template.data.studies[0].patientId;
         Meteor.call('removeMeasurementsByPatientId', patientId);
 
     }
diff --git a/Packages/lesiontracker/package.js b/Packages/lesiontracker/package.js
index 0ab56e842..8c2763f41 100644
--- a/Packages/lesiontracker/package.js
+++ b/Packages/lesiontracker/package.js
@@ -48,10 +48,10 @@ Package.onUse(function (api) {
 
     // Server functions
     api.addFiles('server/collections.js', 'server');
+    api.addFiles('server/removeCollections.js', ['server']);
 
     // Both client and server functions
     api.addFiles('both/collections.js', ['client', 'server']);
-    api.addFiles('both/removeCollections.js', ['client', 'server']);
 
 
     // Library functions
diff --git a/Packages/lesiontracker/both/removeCollections.js b/Packages/lesiontracker/server/removeCollections.js
similarity index 65%
rename from Packages/lesiontracker/both/removeCollections.js
rename to Packages/lesiontracker/server/removeCollections.js
index 17a8d021d..3d4d18913 100644
--- a/Packages/lesiontracker/both/removeCollections.js
+++ b/Packages/lesiontracker/server/removeCollections.js
@@ -1,8 +1,10 @@
+
 Meteor.methods({
     "removeMeasurementsByPatientId": function(patientId) {
         Measurements.remove(
-            {patientId: patientId},
-            {multi: true}
+            {patientId: patientId}
         );
     }
-});
\ No newline at end of file
+
+});
+