LT-115: Set CR/UN/EX buttons as enabled for follow-up timepoints

LesionTracker/client/components/viewer.js

@@ -121,6 +121,9 @@ Template.viewer.onCreated(function() {
 
         if (subscriptionsReady) {
 
+            // Set buttons as enabled/disabled when Timepoints collection is ready
+            timepointAutoCheck(dataContext);
+
             TrialResponseCriteria.validateAllDelayed();
 
             ViewerStudies.find().observe({
@@ -261,15 +264,6 @@ Template.viewer.onCreated(function() {
                     TrialResponseCriteria.validateAll();
                 }
             });
-
-            // Set active tool for timepoint
-            if (dataContext && dataContext.timepointIds) {
-                dataContext.timepointIds.forEach(function(timepointId) {
-                    var timepoint = Timepoints.findOne({timepointId: timepointId});
-                    setTimepointActiveTool(timepoint);
-                });
-            }
-
         }
     });
 });

Packages/lesiontracker/lib/setTimepointActiveTool.js

@@ -1,10 +0,0 @@
-// If timepoint is baseline, sets lesion tool as active tool
-// Else sets default tool
-setTimepointActiveTool = function(timepoint) {
-    if ((timepoint.timepointType).toLowerCase() === "baseline") {
-        // Set active tool as lesion tool
-        toolManager.setActiveTool('lesion');
-    } else {
-        toolManager.setActiveTool(toolManager.getDefaultTool());
-    }
-};

Packages/lesiontracker/lib/timepointAutoCheck.js

@@ -0,0 +1,23 @@
+// If timepoint is baseline, sets lesion tool as active tool
+setTimepointTools = function(timepoint) {
+
+    // Enabled tools for only follow-up tools
+    var fuTools = ["button#crunexTools"];
+    if ((timepoint.timepointType).toLowerCase() === "baseline") {
+        // Set active tool as lesion tool
+        toolManager.setActiveTool('lesion');
+        toolManager.addDisabledTool({tools: fuTools, status: true});
+    } else {
+        toolManager.setActiveTool(toolManager.getDefaultTool());
+        toolManager.addDisabledTool({tools: fuTools, status: false});
+    }
+};
+
+timepointAutoCheck = function(templateData) {
+    if (templateData && templateData.timepointIds) {
+        templateData.timepointIds.forEach(function(timepointId) {
+            var timepoint = Timepoints.findOne({timepointId: timepointId});
+            setTimepointTools(timepoint);
+        });
+    }
+};

Packages/lesiontracker/lib/worklist/worklistModification.js

@@ -33,9 +33,6 @@ function dblClickOnStudy(data) {
         return;
     }
 
-    // Set active tool for timepoint
-    setTimepointActiveTool(timepoint);
-
     // Add the Timepoint name to the Patient name to create the tab title
     title += ' ' + getTimepointName(timepoint);
 

Packages/lesiontracker/package.js

@@ -169,7 +169,7 @@ Package.onUse(function(api) {
     api.addFiles('lib/clearTools.js', 'client');
     api.addFiles('lib/calculateTotalLesionBurden.js', 'client');
     api.addFiles('lib/convertToNonTarget.js', 'client');
-    api.addFiles('lib/setTimepointActiveTool.js', 'client');
+    api.addFiles('lib/timepointAutoCheck.js', 'client');
 
     api.addFiles('lib/syncMeasurementAndToolData.js', 'client');
     api.addFiles('lib/syncImageMeasurementAndToolData.js', 'client');
@@ -201,7 +201,7 @@ Package.onUse(function(api) {
     api.export('getTrialCriteriaConstraints', 'client');
     api.export('calculateTotalLesionBurden', 'client');
     api.export('convertToNonTarget', 'client');
-    api.export('setTimepointActiveTool', 'client');
+    api.export('timepointAutoCheck', 'client');
 
 
     // Export global objects

Packages/viewerbase/client/components/viewer/toolbar/toolbar.js

@@ -108,6 +108,17 @@ function getDefaultButtonData() {
     return buttonData;
 }
 
+function setButtonsDisability() {
+    var disabledTools = toolManager.getDisabledTool();
+    disabledTools.forEach(function(toolData) {
+        var tools = toolData.tools;
+        var status =  toolData.status;
+        tools.forEach(function(element) {
+            $(element).prop("disabled", status);
+        });
+    });
+}
+
 Template.toolbar.events({
     'click .imageViewerTool': function(e) {
         $(e.currentTarget).tooltip('hide');
@@ -146,6 +157,9 @@ Template.toolbar.onRendered(function() {
     // Enable tooltips for the layout button
     var extraTooltipButtons = $('[rel="tooltip"]');
     extraTooltipButtons.tooltip(OHIF.viewer.tooltipConfig);
+
+    // Set disabled/enabled tool buttons
+    setButtonsDisability();
 });
 
 Template.toolbar.helpers({

Packages/viewerbase/lib/toolManager.js

@@ -1,5 +1,6 @@
 var activeTool = "wwwc";
 var defaultTool = "wwwc";
+var disabledTools = [];
 
 var tools = {};
 
@@ -218,5 +219,11 @@ toolManager = {
     },
     getDefaultTool: function() {
         return defaultTool;
+    },
+    addDisabledTool: function(toolData) {
+        disabledTools.push(toolData);
+    },
+    getDisabledTool: function() {
+        return disabledTools;
     }
 };