Updates for Timepoint assocation (LT-60) and Conformance Checks (LT-92, LT-93, LT-94)

Packages/lesiontracker/client/components/lesionLocationDialog/lesionLocationDialog.js

@@ -11,24 +11,29 @@ function closeHandler(dialog) {
 
 // This event sets lesion number for new lesion
 function setLesionNumberCallback(measurementData, eventData, doneCallback) {
-    // Get the current element's timepointID from the study date metadata
+    // Get the current element's timepointId from the study date metadata
     var element = eventData.element;
     var enabledElement = cornerstone.getEnabledElement(element);
     var imageId = enabledElement.image.imageId;
 
     var study = cornerstoneTools.metaData.get('study', imageId);
+
+    // Find the relevant timepoint given the current study
     var timepoint = Timepoints.findOne({
-        timepointName: study.studyDate
+        studyInstanceUids: {
+            $in: [study.studyInstanceUid]
+        }
     });
+
     if (!timepoint) {
         return;
     }
 
-    measurementData.timepointID = timepoint.timepointID;
+    measurementData.timepointId = timepoint.timepointId;
 
     // Get a lesion number for this lesion, depending on whether or not the same lesion previously
     // exists at a different timepoint
-    var lesionNumber = LesionManager.getNewLesionNumber(measurementData.timepointID, isTarget = true);
+    var lesionNumber = LesionManager.getNewLesionNumber(measurementData.timepointId, isTarget = true);
     measurementData.lesionNumber = lesionNumber;
 
     // Set lesion number
@@ -226,6 +231,9 @@ Template.lesionLocationDialog.events({
             /// Set the isTarget value to true, since this is the target-lesion dialog callback
             measurementData.isTarget = true;
 
+            // Set the isNodal value based on the Location's properties
+            measurementData.isNodal = locationObj.isNodal;
+
             // Adds lesion data to timepoints array
             LesionManager.updateLesionData(measurementData);
         } else {
@@ -233,6 +241,7 @@ Template.lesionLocationDialog.events({
                 $set: {
                     location: locationObj.location,
                     locationId: locationObj.id,
+                    isNodal: locationObj.isNodal,
                     locationUID: id
                 }
             });