From a9658e6a000852857a71958cd76ea0785efe70ce Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Fri, 26 Jan 2018 19:10:50 -0200
Subject: [PATCH] Final split lesion adjustments

---
 .../measurementTableHeaderRow.html               |  2 +-
 .../measurementTableHeaderRow.js                 | 16 ++++++++++++++--
 .../client/conformance/criteria/MaxTargets.js    |  3 ++-
 .../conformance/criteria/MaxTargetsPerOrgan.js   |  5 ++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html
index c79fce0f1..86cbc8073 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html
@@ -13,6 +13,6 @@
                 <p class="maxNumMeasurements">Max {{getMax toolGroup.id}}</p>
             {{/if}}
         </div>
-        <div class="numberOfMeasurements">{{numberOfMeasurements}}</div>
+        <div class="numberOfMeasurements">{{numberOfMeasurements toolGroup.id}}</div>
     </div>
 </template>
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.js b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.js
index f20e0280f..aa78e099a 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.js
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.js
@@ -3,8 +3,20 @@ import { OHIF } from 'meteor/ohif:core';
 import { Viewerbase } from 'meteor/ohif:viewerbase';
 
 Template.measurementTableHeaderRow.helpers({
-    numberOfMeasurements() {
-        const { measurementRows } = Template.instance().data;
+    numberOfMeasurements(toolGroupId) {
+        const { toolGroup, measurementRows } = Template.instance().data;
+        if (toolGroup.id === 'newTargets') {
+            let result = 0;
+
+            measurementRows.forEach(measurementRow => {
+                const measurementData = measurementRow.entries[0];
+                if (measurementData.isSplitLesion) return;
+                result++;
+            });
+
+            return result;
+        }
+
         return measurementRows.length ? measurementRows.length : null;
     },
 
diff --git a/Packages/ohif-measurements/client/conformance/criteria/MaxTargets.js b/Packages/ohif-measurements/client/conformance/criteria/MaxTargets.js
index 353d49e0f..f49213f0d 100644
--- a/Packages/ohif-measurements/client/conformance/criteria/MaxTargets.js
+++ b/Packages/ohif-measurements/client/conformance/criteria/MaxTargets.js
@@ -56,7 +56,8 @@ export class MaxTargetsCriterion extends BaseCriterion {
         const newTargetNumbers = this.getNewTargetNumbers(data);
         const measurementNumbers = [];
         _.each(data.targets, target => {
-            const { location, measurementNumber } = target.measurement;
+            const { location, measurementNumber, isSplitLesion } = target.measurement;
+            if (isSplitLesion) return;
             if (options.newTarget && !newTargetNumbers.has(measurementNumber)) return;
             if (options.locationIn && options.locationIn.indexOf(location) === -1) return;
             if (options.locationNotIn && options.locationNotIn.indexOf(location) > -1) return;
diff --git a/Packages/ohif-measurements/client/conformance/criteria/MaxTargetsPerOrgan.js b/Packages/ohif-measurements/client/conformance/criteria/MaxTargetsPerOrgan.js
index c361822a6..76298070a 100644
--- a/Packages/ohif-measurements/client/conformance/criteria/MaxTargetsPerOrgan.js
+++ b/Packages/ohif-measurements/client/conformance/criteria/MaxTargetsPerOrgan.js
@@ -38,7 +38,10 @@ export class MaxTargetsPerOrganCriterion extends BaseCriterion {
         const newTargetNumbers = this.getNewTargetNumbers(data);
         _.each(data.targets, target => {
             const { measurement } = target;
-            const { location, measurementNumber } = measurement;
+            const { location, measurementNumber, isSplitLesion } = measurement;
+
+            if (isSplitLesion) return;
+
             if (!targetsPerOrgan[location]) {
                 targetsPerOrgan[location] = new Set();
             }