From ffc32fb214bdce0eaed9767578237e94c4f40466 Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Wed, 8 Feb 2017 08:19:10 -0200
Subject: [PATCH] Fixing issues on exportPdf and adding extensibility to
 location labels

---
 Packages/ohif-lesiontracker/package.js        |  1 -
 .../ohif-lesiontracker/server/publications.js | 10 --------
 .../measurementTableRow.html                  |  2 +-
 .../client/helpers/measurements.js            |  5 ++++
 .../ohif-measurements/client/lib/exportPdf.js |  4 ++--
 .../client/lib/getLocationLabel.js            | 11 +++++++++
 .../ohif-measurements/client/lib/index.js     | 23 ++++++++++---------
 7 files changed, 31 insertions(+), 25 deletions(-)
 create mode 100644 Packages/ohif-measurements/client/lib/getLocationLabel.js

diff --git a/Packages/ohif-lesiontracker/package.js b/Packages/ohif-lesiontracker/package.js
index f75e213be..0ae134e04 100644
--- a/Packages/ohif-lesiontracker/package.js
+++ b/Packages/ohif-lesiontracker/package.js
@@ -41,6 +41,5 @@ Package.onUse(function(api) {
     api.export('TrialCriteriaTypes', 'client');
 
     // Export collections spanning both client and server
-    api.export('AdditionalFindings', [ 'client', 'server' ]);
     api.export('Configuration', ['client', 'server']);
 });
diff --git a/Packages/ohif-lesiontracker/server/publications.js b/Packages/ohif-lesiontracker/server/publications.js
index 7c64498fe..4aca6c6cd 100644
--- a/Packages/ohif-lesiontracker/server/publications.js
+++ b/Packages/ohif-lesiontracker/server/publications.js
@@ -32,16 +32,6 @@ Meteor.publish('singlePatientImageMeasurements', function(patientId) {
     });
 });
 
-Meteor.publish('additionalFindings', function() {
-    return AdditionalFindings.find();
-});
-
-Meteor.publish('singlePatientAdditionalFindings', function(patientId) {
-    return AdditionalFindings.find({
-        patientId: patientId
-    });
-});
-
 Meteor.publish('reviewers', function() {
     return Reviewers.find();
 });
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html
index 0e89b6c57..cad965c47 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableRow/measurementTableRow.html
@@ -20,7 +20,7 @@
         <div class="measurementDetails">
             <div class='location'>
                 {{#if rowItem.location}}
-                    {{rowItem.location}}
+                    {{getLocationLabel rowItem.location}}
                 {{else}}
                     (No description)
                 {{/if}}
diff --git a/Packages/ohif-measurements/client/helpers/measurements.js b/Packages/ohif-measurements/client/helpers/measurements.js
index c10714d95..1e1f1724b 100644
--- a/Packages/ohif-measurements/client/helpers/measurements.js
+++ b/Packages/ohif-measurements/client/helpers/measurements.js
@@ -7,3 +7,8 @@ import { OHIF } from 'meteor/ohif:core';
 Template.registerHelper('measurementConfiguration', () => {
     return OHIF.measurements.MeasurementApi.getConfiguration();
 });
+
+// Translates the location and return a string containing its label
+Template.registerHelper('getLocationLabel', label => {
+    return OHIF.measurements.getLocationLabel(label);
+});
diff --git a/Packages/ohif-measurements/client/lib/exportPdf.js b/Packages/ohif-measurements/client/lib/exportPdf.js
index 8b0a78098..6642d6ab7 100644
--- a/Packages/ohif-measurements/client/lib/exportPdf.js
+++ b/Packages/ohif-measurements/client/lib/exportPdf.js
@@ -10,7 +10,7 @@ OHIF.measurements.exportPdf = (measurementApi, timepointApi) => {
     const report = new MeasurementReport({
         header: {
             trial: 'RECIST 1.1',
-            patientName: formatPN(study.patientName),
+            patientName: OHIF.viewerbase.helpers.formatPN(study.patientName),
             mrn: study.patientId,
             timepoint: timepointApi.name(currentTimepoint)
         }
@@ -69,7 +69,7 @@ OHIF.measurements.exportPdf = (measurementApi, timepointApi) => {
             report.printMeasurement({
                 type,
                 number: measurement.measurementNumber,
-                location: measurement.location || '',
+                location: OHIF.measurements.getLocationLabel(measurement.location) || '',
                 info,
                 image: enabledElement.canvas.toDataURL('image/jpeg', 0.85)
             });
diff --git a/Packages/ohif-measurements/client/lib/getLocationLabel.js b/Packages/ohif-measurements/client/lib/getLocationLabel.js
new file mode 100644
index 000000000..65b175cd9
--- /dev/null
+++ b/Packages/ohif-measurements/client/lib/getLocationLabel.js
@@ -0,0 +1,11 @@
+import { OHIF } from 'meteor/ohif:core';
+
+/**
+ * Extensible method to translate the location and return a string containing its label
+ *
+ * @param location
+ * @returns string - label for the given location
+ */
+OHIF.measurements.getLocationLabel = location => {
+    return location;
+};
diff --git a/Packages/ohif-measurements/client/lib/index.js b/Packages/ohif-measurements/client/lib/index.js
index 5bf5d7c92..45e2919bd 100644
--- a/Packages/ohif-measurements/client/lib/index.js
+++ b/Packages/ohif-measurements/client/lib/index.js
@@ -1,11 +1,12 @@
-import './jumpToRowItem.js';
-import './activateMeasurements.js';
-import './deactivateAllToolData.js';
-import './exportPdf.js';
-import './getMeasurementsGroupedByNumber.js';
-import './getTimepointName.js';
-import './hangingProtocolCustomizations.js';
-import './MeasurementHandlers.js';
-import './MeasurementManager.js';
-import './syncMeasurementAndToolData.js';
-import './toggleLabelButton.js';
+import './jumpToRowItem';
+import './activateMeasurements';
+import './deactivateAllToolData';
+import './exportPdf';
+import './getMeasurementsGroupedByNumber';
+import './getLocationLabel';
+import './getTimepointName';
+import './hangingProtocolCustomizations';
+import './MeasurementHandlers';
+import './MeasurementManager';
+import './syncMeasurementAndToolData';
+import './toggleLabelButton';