LT-115: Grouping tools schemas

Packages/ohif-measurements/client/components/caseProgress/caseProgress.js

@@ -66,7 +66,7 @@ Template.caseProgress.onRendered(() => {
 
     const config = OHIF.measurements.MeasurementApi.getConfiguration();
     const tools = config.measurementTools;
-    const toolsToInclude = tools.filter(tool => tool.options && tool.options.includeInCaseProgress);
+    const toolsToInclude = tools.filter(tool => tool.options && tool.options.caseProgress && tool.options.caseProgress.include);
     const toolIds = toolsToInclude.map(tool => tool.id);
     const api = instance.data.measurementApi;
 

Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointCell/measurementTableTimepointCell.js

@@ -37,7 +37,7 @@ Template.measurementTableTimepointCell.helpers({
             // TODO: Figure out what is going on here?
             console.warn('Something went wrong?');
         }
-        const displayFunction = tool.options.measurementTableOptions.displayFunction;
+        const displayFunction = tool.options.measurementTable.displayFunction;
         return displayFunction(data);
     }
 });

Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.html

@@ -2,7 +2,7 @@
     <div class="measurementTableView scrollArea">
         {{#let config=measurementConfiguration}}
             {{#each measurementType in config.measurementTools}}
-                {{#if measurementType.options.showInMeasurementTable}}
+                {{#if measurementType.options.measurementTable.displayFunction}}
                     {{#let collection=(groupByMeasurementNumber measurementType.id)}}
                         {{>measurementTableHeaderRow
                             measurementType=measurementType