- {{#if and maxNumMeasurements (eq measurementType.id 'targets')}}
+ {{#if and maxNumMeasurements (eq toolGroup.id 'targets')}}
Max {{maxNumMeasurements}}
{{/if}}
- {{#let config=measurementConfiguration}}
- {{#each toolGroup in config.measurementTools}}
- {{#if shallDisplayGroup toolGroup.id}}
- {{#let collection=(groupByMeasurementNumber toolGroup.id)}}
- {{>measurementTableHeaderRow
- measurementType=toolGroup
- measurements=collection
- currentTimepointId=currentTimepointId
- timepointApi=timepointApi
- measurementApi=measurementApi
- conformanceCriteria=conformanceCriteria}}
-
- {{#each entry in collection}}
- {{>measurementTableRow (clone this rowItem=entry)}}
- {{/each}}
- {{/let}}
- {{/if}}
+ {{#let config=measurementConfiguration measurementGroups=getMeasurementsGroupedByNumber}}
+ {{#each measurementGroup in measurementGroups}}
+ {{>measurementTableHeaderRow (clone this
+ toolGroup=measurementGroup.toolGroup
+ measurementRows=measurementGroup.measurementRows)}}
+ {{#each rowItem in measurementGroup.measurementRows}}
+ {{>measurementTableRow (clone this rowItem=rowItem)}}
+ {{/each}}
{{/each}}
{{#if config.newMeasurementTool}}
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
index 51c883ec7..e06235aa8 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
@@ -2,34 +2,6 @@ import { Template } from 'meteor/templating';
import { _ } from 'meteor/underscore';
import { OHIF } from 'meteor/ohif:core';
-OHIF.measurements.getLocation = collection => {
- for (let i = 0; i < collection.length; i++) {
- if (collection[i].location) {
- return collection[i].location;
- }
- }
-};
-
-Template.measurementTableView.onCreated(() => {
- const instance = Template.instance();
- const measurementApi = instance.data.measurementApi;
- const configuration = OHIF.measurements.MeasurementApi.getConfiguration();
-
- instance.displayToolGroupMap = {};
- instance.displayToolList = [];
- configuration.measurementTools.forEach(toolGroup => {
- instance.displayToolGroupMap[toolGroup.id] = false;
- toolGroup.childTools.forEach(tool => {
- const willDisplay = !!(tool.options && tool.options.measurementTable && tool.options.measurementTable.displayFunction);
- if (willDisplay) {
- instance.displayToolList.push(tool.id);
- instance.displayToolGroupMap[toolGroup.id] = true;
- }
- });
- });
-});
-
-
Template.measurementTableView.helpers({
getNewMeasurementType(tool) {
// TODO: Check Conformance criteria here.
@@ -42,56 +14,9 @@ Template.measurementTableView.helpers({
};
},
- shallDisplayGroup(toolGroupId) {
- const instance = Template.instance();
- return instance.displayToolGroupMap[toolGroupId];
- },
-
- groupByMeasurementNumber(measurementTypeId) {
- const instance = Template.instance();
- const measurementApi = instance.data.measurementApi;
- const timepointApi = instance.data.timepointApi;
- const baseline = timepointApi.baseline();
- if (!measurementApi || !timepointApi || !baseline) {
- return;
- }
-
- // Retrieve all the data for this Measurement type (e.g. 'targets')
- // which was recorded at baseline.
- const atBaseline = measurementApi.fetch(measurementTypeId, {
- timepointId: baseline.timepointId
- });
-
- // Obtain a list of the Measurement Numbers from the
- // measurements which have baseline data
- const numbers = atBaseline.map(m => m.measurementNumber);
-
- // Retrieve all the data for this Measurement type which
- // match the Measurement Numbers obtained above
- const data = measurementApi.fetch(measurementTypeId, {
- toolId: {
- $in: instance.displayToolList
- },
- measurementNumber: {
- $in: numbers
- }
- });
-
- // Group the Measurements by Measurement Number
- const groupObject = _.groupBy(data, entry => entry.measurementNumber);
-
- // Reformat the data for display in the table
- return Object.keys(groupObject).map(key => {
- const anEntry = groupObject[key][0];
-
- return {
- measurementTypeId: measurementTypeId,
- measurementNumber: key,
- location: OHIF.measurements.getLocation(groupObject[key]),
- responseStatus: false, // TODO: Get the latest timepoint and determine the response status
- entries: groupObject[key]
- };
- });
+ getMeasurementsGroupedByNumber() {
+ const { measurementApi, timepointApi } = Template.instance().data;
+ return OHIF.measurements.getMeasurementsGroupedByNumber(measurementApi, timepointApi);
},
newMeasurements(measurementType) {
@@ -135,16 +60,12 @@ Template.measurementTableView.helpers({
const groupObject = _.groupBy(data, entry => entry.measurementNumber);
// Reformat the data for display in the table
- return Object.keys(groupObject).map(key => {
- const anEntry = groupObject[key][0];
-
- return {
- measurementTypeId: measurementTypeId,
- measurementNumber: key,
- location: OHIF.measurements.getLocation(groupObject[key]),
- responseStatus: false, // TODO: Get the latest timepoint and determine the response status
- entries: groupObject[key]
- };
- });
+ return Object.keys(groupObject).map(key => ({
+ measurementTypeId: measurementTypeId,
+ measurementNumber: key,
+ location: OHIF.measurements.getLocation(groupObject[key]),
+ responseStatus: false, // TODO: Get the latest timepoint and determine the response status
+ entries: groupObject[key]
+ }));
}
});
diff --git a/Packages/ohif-measurements/client/lib/getMeasurementsGroupedByNumber.js b/Packages/ohif-measurements/client/lib/getMeasurementsGroupedByNumber.js
new file mode 100644
index 000000000..c0becbc9a
--- /dev/null
+++ b/Packages/ohif-measurements/client/lib/getMeasurementsGroupedByNumber.js
@@ -0,0 +1,91 @@
+import { OHIF } from 'meteor/ohif:core';
+import { _ } from 'meteor/underscore';
+
+// TODO: change this to a const after refactoring newMeasurements code on measurementTableView.js
+OHIF.measurements.getLocation = collection => {
+ for (let i = 0; i < collection.length; i++) {
+ if (collection[i].location) {
+ return collection[i].location;
+ }
+ }
+};
+
+/**
+ * Group all measurements by its tool group and measurement number.
+ *
+ * @param measurementApi
+ * @param timepointApi
+ * @returns {*} A list containing each toolGroup and an array containing the measurement rows
+ */
+OHIF.measurements.getMeasurementsGroupedByNumber = (measurementApi, timepointApi) => {
+ const getPath = OHIF.utils.ObjectPath.get;
+ const configuration = OHIF.measurements.MeasurementApi.getConfiguration();
+
+ if (!measurementApi || !timepointApi || !configuration) return;
+
+ // Check which tools are going to be displayed
+ const displayToolGroupMap = {};
+ const displayToolList = [];
+ configuration.measurementTools.forEach(toolGroup => {
+ displayToolGroupMap[toolGroup.id] = false;
+ toolGroup.childTools.forEach(tool => {
+ const willDisplay = !!getPath(tool, 'options.measurementTable.displayFunction');
+ if (willDisplay) {
+ displayToolList.push(tool.id);
+ displayToolGroupMap[toolGroup.id] = true;
+ }
+ });
+ });
+
+ // Create the result object
+ const groupedMeasurements = [];
+
+ const baseline = timepointApi.baseline();
+ if (!baseline) return;
+
+ configuration.measurementTools.forEach(toolGroup => {
+ // Skip this tool group if it should not be displayed
+ if (!displayToolGroupMap[toolGroup.id]) return;
+
+ // Retrieve all the data for this Measurement type (e.g. 'targets')
+ // which was recorded at baseline.
+ const atBaseline = measurementApi.fetch(toolGroup.id, {
+ timepointId: baseline.timepointId
+ });
+
+ // Obtain a list of the Measurement Numbers from the
+ // measurements which have baseline data
+ const numbers = atBaseline.map(m => m.measurementNumber);
+
+ // Retrieve all the data for this Measurement type which
+ // match the Measurement Numbers obtained above
+ const data = measurementApi.fetch(toolGroup.id, {
+ toolId: {
+ $in: displayToolList
+ },
+ measurementNumber: {
+ $in: numbers
+ }
+ });
+
+ // Group the Measurements by Measurement Number
+ const groupObject = _.groupBy(data, entry => entry.measurementNumber);
+
+ // Reformat the data for display in the table
+ const measurementRows = Object.keys(groupObject).map(key => ({
+ measurementTypeId: toolGroup.id,
+ measurementNumber: key,
+ location: OHIF.measurements.getLocation(groupObject[key]),
+ responseStatus: false, // TODO: Get the latest timepoint and determine the response status
+ entries: groupObject[key]
+ }));
+
+ // Add the group to the result
+ groupedMeasurements.push({
+ toolGroup,
+ measurementRows
+ });
+ });
+
+ return groupedMeasurements;
+};
diff --git a/Packages/ohif-measurements/client/lib/index.js b/Packages/ohif-measurements/client/lib/index.js
index d8d271e3a..5bf5d7c92 100644
--- a/Packages/ohif-measurements/client/lib/index.js
+++ b/Packages/ohif-measurements/client/lib/index.js
@@ -2,6 +2,7 @@ import './jumpToRowItem.js';
import './activateMeasurements.js';
import './deactivateAllToolData.js';
import './exportPdf.js';
+import './getMeasurementsGroupedByNumber.js';
import './getTimepointName.js';
import './hangingProtocolCustomizations.js';
import './MeasurementHandlers.js';