From 9a459e69f88962d59afa6637284859781b7b4ccb Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Tue, 15 Nov 2016 09:42:19 -0200
Subject: [PATCH] LT-291: Fixing location on measurement table and
 synchronizing the default location for same measurement number

---
 .../ohif-lesiontracker/both/schema/fields.js  | 31 -------------
 .../components/dialog/nonTargetMeasurement.js | 44 +++++++++++++++----
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/Packages/ohif-lesiontracker/both/schema/fields.js b/Packages/ohif-lesiontracker/both/schema/fields.js
index 3c8a1d5fc..fc453df73 100644
--- a/Packages/ohif-lesiontracker/both/schema/fields.js
+++ b/Packages/ohif-lesiontracker/both/schema/fields.js
@@ -2,37 +2,6 @@ export const FieldLesionLocation = {
     type: String,
     label: 'Lesion Location',
     allowedValues: [
-        '',
-        'abdominalChestWall',
-        'adrenal',
-        'bladder',
-        'bone',
-        'brain',
-        'breast',
-        'colon',
-        'esophagus',
-        'extremities',
-        'gallbladder',
-        'kidney',
-        'liver',
-        'lung',
-        'lymphNode',
-        'mediastinumHilum',
-        'muscle',
-        'neck',
-        'otherSoftTissue',
-        'ovary',
-        'pancreas',
-        'pelvis',
-        'peritoneumOmentum',
-        'prostate',
-        'retroperitoneum',
-        'smallBowel',
-        'spleen',
-        'stomach',
-        'subcutaneous'
-    ],
-    valuesLabels: [
         '',
         'Abdominal/Chest Wall',
         'Adrenal',
diff --git a/Packages/ohif-lesiontracker/client/components/dialog/nonTargetMeasurement.js b/Packages/ohif-lesiontracker/client/components/dialog/nonTargetMeasurement.js
index d6a5439f2..c4a9c35b9 100644
--- a/Packages/ohif-lesiontracker/client/components/dialog/nonTargetMeasurement.js
+++ b/Packages/ohif-lesiontracker/client/components/dialog/nonTargetMeasurement.js
@@ -56,17 +56,38 @@ Template.dialogNonTargetMeasurement.onRendered(() => {
     instance.viewerData = Blaze.getData(viewerMain);
 
     const measurementApi = instance.viewerData.measurementApi;
+    const timepointApi = instance.viewerData.timepointApi;
 
     const measurementData = instance.data.measurementData;
     const collection = measurementApi[instance.measurementTypeId];
 
     // Get the current inserted measurement from the collection
-    const currentMeasurement = collection.findOne({
-        _id: measurementData._id
-    });
+    const currentMeasurement = collection.findOne({ _id: measurementData._id });
 
-    // Set the data that is already defined
-    form.value(currentMeasurement);
+    // Check if it's a edition or creation
+    if (instance.data.edit) {
+        // Set the data that is already defined for current measurement
+        form.value(currentMeasurement);
+    } else {
+        // LT-112 Non-target response shall default to non-measurable on baseline, present on follow-up
+        const timepoint = timepointApi.study(measurementData.studyInstanceUid)[0];
+        const response = timepoint && timepoint.timepointType === 'baseline' ? 'NE' : 'Present';
+
+        // Get a previously inserted Non-target
+        const previousMeasurement = collection.findOne({
+            _id: { $not: measurementData._id },
+            measurementNumber: currentMeasurement.measurementNumber
+        });
+
+        // Change the location for current measurement if it's not the first one
+        const location = previousMeasurement && previousMeasurement.location;
+
+        // Set the default location and response
+        form.value({
+            location,
+            response
+        });
+    }
 
     // Synchronize the measurement number with the one inserted in the collection
     measurementData.measurementNumber = currentMeasurement.measurementNumber;
@@ -85,13 +106,18 @@ Template.dialogNonTargetMeasurement.onRendered(() => {
 
     // Update the location and response after confirming the dialog data
     instance.data.promise.then(formData => {
+        // Update the response for current measurement
         collection.update({
             _id: measurementData._id,
         }, {
-            $set: {
-                location: formData.location,
-                response: formData.response
-            }
+            $set: { response: formData.response }
+        });
+
+        // Change the location for all Non-Target measurements with the same measurementNumber
+        collection.update({
+            measurementNumber: currentMeasurement.measurementNumber
+        }, {
+            $set: { location: formData.location }
         });
     });