From 7c1a0c38c0b91686afd98b463d48cda851771955 Mon Sep 17 00:00:00 2001
From: Evren Ozkan <evren217@gmail.com>
Date: Sat, 21 Nov 2015 16:19:32 -0500
Subject: [PATCH] bringing series into viewport (work in progress)

---
 .../compatibility/measurementManagerDAL.js         |  9 +++++++--
 .../components/lesionTable/lesionTable.js          | 14 +++++++++++---
 .../nonTargetLesionDialog/nonTargetLesionDialog.js |  4 ++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Packages/lesiontracker/compatibility/measurementManagerDAL.js b/Packages/lesiontracker/compatibility/measurementManagerDAL.js
index 0d898b4fa..bd3ecec6a 100644
--- a/Packages/lesiontracker/compatibility/measurementManagerDAL.js
+++ b/Packages/lesiontracker/compatibility/measurementManagerDAL.js
@@ -69,6 +69,10 @@ var measurementManagerDAL = (function() {
 
         // Update timepoints from lesion data
         var timepoints = measurement.timepoints;
+        if (timepoints[timepointID] === undefined) {
+           timepoints[timepointID] = {};
+        }
+
         timepoints[timepointID].longestDiameter = lesionData.measurementText;
         timepoints[timepointID].imageId = lesionData.imageId;
         timepoints[timepointID].seriesInstanceUid = lesionData.seriesInstanceUid;
@@ -108,7 +112,7 @@ var measurementManagerDAL = (function() {
     // Returns new lesion number according to timepointID
     function getNewLesionNumber(timepointID, isTarget) {
         // Get all current lesion measurements
-        var measurements = Measurements.find({isTarget: isTarget}).fetch();
+        var measurements = Measurements.find({isTarget: isTarget},{sort: {lesionNumber: 1}}).fetch();
 
         // If no measurements exist yet, start at 1
         if (!measurements.length) {
@@ -123,7 +127,8 @@ var measurementManagerDAL = (function() {
             var timepoints = measurement.timepoints;
 
             if (!timepoints[timepointID]) {
-                return;
+                // Find lesion number for this timepointID
+                return measurement.lesionNumber
             }
 
             if (timepoints[timepointID].longestDiameter === '') {
diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.js b/Packages/lesiontracker/components/lesionTable/lesionTable.js
index e5fb1b636..bdc8083bf 100644
--- a/Packages/lesiontracker/components/lesionTable/lesionTable.js
+++ b/Packages/lesiontracker/components/lesionTable/lesionTable.js
@@ -41,10 +41,16 @@ function updateLesions(e) {
 
         var timepointObject = timepoints[timepointID];
 
-        // TODO: Bring series in correct imageViewport
+        if (timepointObject === undefined) {
+            return;
+        }
+
+        if (!timepointObject ) {
+            timepointObject = {}
+        }
+
+        if (timepointObject.seriesInstanceUid !== "") {
 
-        if (timepointObject.seriesInstanceUid !== series.seriesInstanceUid) {
-            console.log("not in same series");
             var newSeriesData  = {
                 seriesInstanceUid: timepointObject.seriesInstanceUid,
                 studyInstanceUid: timepointObject.studyInstanceUid
@@ -55,6 +61,8 @@ function updateLesions(e) {
         }
 
         // Defines event data
+        console.log(element);
+        console.log(cornerstone.getEnabledElement(element));
         var eventData = {
             enabledElement: cornerstone.getEnabledElement(element),
             lesionData: {
diff --git a/Packages/lesiontracker/components/nonTargetLesionDialog/nonTargetLesionDialog.js b/Packages/lesiontracker/components/nonTargetLesionDialog/nonTargetLesionDialog.js
index 45b1792ec..f5946a44b 100644
--- a/Packages/lesiontracker/components/nonTargetLesionDialog/nonTargetLesionDialog.js
+++ b/Packages/lesiontracker/components/nonTargetLesionDialog/nonTargetLesionDialog.js
@@ -11,6 +11,10 @@ function setLesionNumberCallback(measurementData, eventData, doneCallback) {
     if (!timepoint) {
         return;
     }
+
+    // TODO: Get patientId
+    // TODO: add measurement data according to patientId to get correct lesion number for each patient
+
     measurementData.timepointID = timepoint.timepointID;
 
     // Get a lesion number for this lesion, depending on whether or not the same lesion previously