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

Packages/lesiontracker/client/components/studyDateList/studyDateList.js

@@ -4,21 +4,22 @@ Template.studyDateList.helpers({
      * The value for 'selected' for the currently loaded study is set to true, so that
      * this becomes the current option in the combo box.
      *
-     * @returns {*}
+     * @returns {*} Array of studies that are related to the current study by patient ID
      */
     relatedStudies: function() {
-        // TODO= Fix this! This won't work to retrieve all studies
-        // related to this patient. We will need to do a real search
-        // since the WorklistStudies Collection only contains the studies on-screen
-
         // Check which study is currently loaded into the study browser
         var currentStudyInBrowser = ViewerStudies.findOne({
             selected: true
         });
 
-        // Find studies which have the same patientId as the currently selected study
-        var relatedStudies = WorklistStudies.find({patientId: currentStudyInBrowser.patientId},
-                {sort: {studyDate: 1}}).fetch();
+        // Find all Timepoint-associated studies which have the same patientId as the currently selected study
+        var relatedStudies = Studies.find({
+            patientId: currentStudyInBrowser.patientId
+        }, {
+            sort: {
+                studyDate: 1
+            }
+        });
 
         // Modify the array of related studies so the default option is the currently selected study
         relatedStudies.forEach(function(study) {
@@ -31,6 +32,26 @@ Template.studyDateList.helpers({
 
         // Use this array to populate the combo box
         return relatedStudies;
+    },
+    timepointName: function() {
+        var data = this;
+        var study = Studies.findOne({
+            studyInstanceUid: data.studyInstanceUid
+        });
+
+        if (!study) {
+            return;
+        }
+
+        var timepoint = Timepoints.findOne({
+            timepointId: study.timepointId
+        });
+
+        if (!timepoint) {
+            return;
+        }
+
+        return getTimepointName(timepoint);
     }
 });
 
@@ -46,7 +67,6 @@ Template.studyDateList.events({
      */
     'change select#selectStudyDate': function(e) {
         var selectBox = $(e.currentTarget);
-
         var studyInstanceUid = selectBox.val();
 
         // Hide the select box
@@ -57,6 +77,11 @@ Template.studyDateList.events({
         loadingIndicator.css('display', 'block');
 
         Meteor.call('GetStudyMetadata', studyInstanceUid, function(error, study) {
+            if (error) {
+                log.warn(error);
+                return;
+            }
+
             sortStudy(study);
 
             // Hide the loading indicator
@@ -66,21 +91,20 @@ Template.studyDateList.events({
             selectBox.css('display', 'block');
 
             // Set "Selected" to false for the entire collection
-            ViewerStudies.update({},
-                {
-                    $set: {
-                        selected: false
-                    }
-                },
-                {
-                    multi: true
-                });
+            ViewerStudies.update({}, {
+                $set: {
+                    selected: false
+                }
+            }, {
+                multi: true
+            });
 
             // Check if this study already exists in the ViewerStudies collection
             // of loaded studies. If it does, set it's 'selected' value to true.
             var existingStudy = ViewerStudies.findOne({
                 studyInstanceUid: studyInstanceUid
             });
+
             if (existingStudy) {
                 // Set the current finding in the collection to true
                 ViewerStudies.update(existingStudy._id, {
@@ -95,29 +119,6 @@ Template.studyDateList.events({
             // with the value True, and insert it into the ViewerStudies Collection
             study.selected = true;
             ViewerStudies.insert(study);
-
-            var timepointID = uuid.v4();
-
-            var timepoint = Timepoints.findOne({
-                timepointName: study.studyDate
-            });
-            if (timepoint) {
-                log.warn('A timepoint with that study date already exists!');
-                return;
-            }
-
-            var testTimepoint = Timepoints.findOne({});
-            if (testTimepoint && testTimepoint.patientId !== study.patientId) {
-                log.warn('Timepoints collection related to the wrong subject');
-                return;
-            }
-
-            log.info('Inserting a new timepoint');
-            Timepoints.insert({
-                patientId: study.patientId,
-                timepointID: timepointID,
-                timepointName: study.studyDate
-            });
         });
     }
 });