othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LT-275: Location is properly displayed in Measurement Table

Browse Source
This commit is contained in:
Erik Ziegler 2016-11-06 13:33:10 +01:00
parent 72339b57a6
commit 38c804b2f5
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.js
View File

@ -1,3 +1,4 @@
import { Template } from 'meteor/templating';
import { OHIF } from 'meteor/ohif:core'; import { OHIF } from 'meteor/ohif:core';
Template.measurementTableView.helpers({ Template.measurementTableView.helpers({
@ -15,9 +16,13 @@ Template.measurementTableView.helpers({
const groupObject = _.groupBy(data, entry => { return entry.measurementNumber }); const groupObject = _.groupBy(data, entry => { return entry.measurementNumber });
return Object.keys(groupObject).map(key => { return Object.keys(groupObject).map(key => {
const anEntry = groupObject[key][0];
return { return {
measurementTypeId: measurementTypeId, measurementTypeId: measurementTypeId,
measurementNumber: key, measurementNumber: key,
location: anEntry.location,
responseStatus: false, // TODO: Get the latest timepoint and determine the response status
entries: groupObject[key] entries: groupObject[key]
}; };
}); });
@ -31,8 +36,6 @@ Template.measurementTableView.helpers({
return; return;
} }
const api = instance.data.measurementApi;
const config = OHIF.measurements.MeasurementApi.getConfiguration(); const config = OHIF.measurements.MeasurementApi.getConfiguration();
const measurementTools = config.measurementTools; const measurementTools = config.measurementTools;
@ -53,14 +56,14 @@ Template.measurementTableView.helpers({
// Find only those measurements made at this timepoint // Find only those measurements made at this timepoint
const selector = { const selector = {
timepointId: current.timepointId timepointId: current.timepointId
} };
// Sort ascending by measurement number // Sort ascending by measurement number
const options = { const options = {
sort: { sort: {
measurementNumber: 1 measurementNumber: 1
} }
} };
// Retrieve measurements made at this timepoint // Retrieve measurements made at this timepoint
const api = Template.instance().data.measurementApi; const api = Template.instance().data.measurementApi;
@ -83,11 +86,11 @@ Template.measurementTableView.helpers({
if (previousMeasurements.length === 0) { if (previousMeasurements.length === 0) {
newMeasurements.push(measurement); newMeasurements.push(measurement);
} }
}) });
// Concatenate new measurements of all measurement types // Concatenate new measurements of all measurement types
data = data.concat(newMeasurements); data = data.concat(newMeasurements);
}) });
const groupObject = _.groupBy(data, entry => { return entry.measurementNumber }); const groupObject = _.groupBy(data, entry => { return entry.measurementNumber });