Move server-side functions from viewerbase to worklist. Split multi-frame and single-image modalities into separate display sets (OHIF-36)

Packages/lesiontracker/client/components/lesionTableRow/lesionTableRow.js

@@ -23,6 +23,7 @@ Template.lesionTableRow.events({
         $row.closest('.lesionTableView').find('.lesionTableRow').not($row).removeClass('active');
         $row.toggleClass('active');
     },
+
     'dblclick .location': function() {
         log.info('Double clicked on Lesion Location cell');
 
@@ -33,6 +34,7 @@ Template.lesionTableRow.events({
 
         changeLesionLocationCallback(measurementData, null, doneCallback);
     },
+
     'keydown .location': function(e) {
         var keyCode = e.which;
 
@@ -45,8 +47,8 @@ Template.lesionTableRow.events({
                 text: 'Are you sure you would like to remove the entire measurement?'
             };
 
-            showConfirmDialog(function() {
-                Meteor.call('removeMeasurement', currentMeasurement._id, function(error, response) {
+            showConfirmDialog(() => {
+                Meteor.call('removeMeasurement', currentMeasurement._id, (error, response) => {
                     if (error) {
                         log.warn(error);
                     }

Packages/lesiontracker/client/components/lesionTableView/lesionTableView.js

@@ -9,8 +9,8 @@ Template.lesionTableView.helpers({
             }
         });
     },
+
     nonTargets() {
-        // All Targets shall be listed first followed by Non-Targets
         return Measurements.find({
             isTarget: false
         }, {
@@ -19,8 +19,8 @@ Template.lesionTableView.helpers({
             }
         });
     },
+
     newLesions() {
-        // All Targets shall be listed first followed by Non-Targets
         return Measurements.find({
             saved: false
         }, {

Packages/lesiontracker/client/components/studySeriesQuickSwitch/studySeriesQuickSwitch.html

@@ -18,7 +18,7 @@
                     <div class="seriesSwitch clearfix">
                         {{#each thumbnail in thumbnailsList}}
                             {{#if lt @index 8}}
-                                <div class="seriesItem {{#if eq side 'right'}}pull-left{{else}}pull-right{{/if}} {{#if isSeriesActive thumbnail.stack.seriesInstanceUid viewportIndex}}active{{/if}}"></div>
+                                <div class="seriesItem {{#if eq side 'right'}}pull-left{{else}}pull-right{{/if}} {{#if isDisplaySetActive thumbnail.stack.displaySetInstanceUid viewportIndex}}active{{/if}}"></div>
                             {{else}}
                                 {{#if eq @index 8}}
                                     <div class="seriesItem count {{#if eq side 'right'}}pull-left{{else}}pull-right{{/if}}">{{thumbnailsList.length}}</div>

Packages/lesiontracker/client/components/studyTimepointBrowser/studyTimepointStudy.js

@@ -66,6 +66,7 @@ Template.studyTimepointStudy.events({
             if (!alreadyLoaded) {
                 $study.addClass('loading');
                 getStudyMetadata(studyInstanceUid, studyData => {
+                    study.displaySets = createStacks(study);
                     ViewerStudies.insert(studyData);
                     instance.select(isQuickSwitch);
                 });

Packages/lesiontracker/client/components/viewer/viewer.js

@@ -72,6 +72,7 @@ Template.viewer.onCreated(() => {
 
     instance.data.studies.forEach(study => {
         study.selected = true;
+        study.displaySets = createStacks(study);
         ViewerStudies.insert(study);
     });