From 7ef0dd812b3781a849e2afb31d7b29bc0bbfa489 Mon Sep 17 00:00:00 2001
From: Leonardo Campos <leonardoscampos@gmail.com>
Date: Mon, 16 Jan 2017 16:55:51 -0200
Subject: [PATCH] LT-92: removing unecessary code

---
 .../client/conformance/ConformanceCriteria.js             | 8 ++++++--
 .../client/conformance/criteria/NonTargetResponse.js      | 6 ++----
 .../client/conformance/criteria/TargetType.js             | 5 +----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Packages/ohif-measurements/client/conformance/ConformanceCriteria.js b/Packages/ohif-measurements/client/conformance/ConformanceCriteria.js
index 82d6eaa47..00fbab7d8 100644
--- a/Packages/ohif-measurements/client/conformance/ConformanceCriteria.js
+++ b/Packages/ohif-measurements/client/conformance/ConformanceCriteria.js
@@ -10,10 +10,14 @@ class ConformanceCriteria {
         this.timepointApi = timepointApi;
         this.results = [];
 
+        const validate = _.debounce(trialCriteriaType => {
+            this.validate(trialCriteriaType);
+        }, 300);
+
         Tracker.autorun(() => {
             const trialCriteriaType = TrialCriteriaTypes.findOne({ selected: true });
             this.measurementApi.changeObserver.depend();
-            this.validate(trialCriteriaType);
+            validate(trialCriteriaType);
         });
     }
 
@@ -25,9 +29,9 @@ class ConformanceCriteria {
         mergedData.targets = mergedData.targets.concat(followupData.targets);
         mergedData.nonTargets = mergedData.nonTargets.concat(followupData.nonTargets);
 
+        const resultBoth = this.validateTimepoint('both', trialCriteriaType, mergedData);
         const resultBaseline = this.validateTimepoint('baseline', trialCriteriaType, baselineData);
         const resultFollowup = this.validateTimepoint('followup', trialCriteriaType, followupData);
-        const resultBoth = this.validateTimepoint('both', trialCriteriaType, mergedData);
         const results = resultBaseline.concat(resultFollowup).concat(resultBoth);
 
         console.warn('>>>> validate', results);
diff --git a/Packages/ohif-measurements/client/conformance/criteria/NonTargetResponse.js b/Packages/ohif-measurements/client/conformance/criteria/NonTargetResponse.js
index fcd67ba70..41d3662ae 100644
--- a/Packages/ohif-measurements/client/conformance/criteria/NonTargetResponse.js
+++ b/Packages/ohif-measurements/client/conformance/criteria/NonTargetResponse.js
@@ -20,11 +20,9 @@ export class NonTargetResponseCriterion extends BaseCriterion {
 
         items.forEach(item => {
             const measurement = item.measurement;
-            const response = measurement.response.toLowerCase();
-            const timepoint = item.timepoint;
-            const timepointType = timepoint.timepointType.toLowerCase();
+            const response = (measurement.response || '').toLowerCase();
 
-            if ((timepointType === 'baseline') && (response !== 'present')) {
+            if (response !== 'present') {
                 measurements.push(measurement);
             }
         });
diff --git a/Packages/ohif-measurements/client/conformance/criteria/TargetType.js b/Packages/ohif-measurements/client/conformance/criteria/TargetType.js
index 49cd7e022..861f6190a 100644
--- a/Packages/ohif-measurements/client/conformance/criteria/TargetType.js
+++ b/Packages/ohif-measurements/client/conformance/criteria/TargetType.js
@@ -20,11 +20,8 @@ export class TargetTypeCriterion extends BaseCriterion {
 
         items.forEach(item => {
             const measurement = item.measurement;
-            const toolType = measurement.toolType.toLowerCase();
-            const timepoint = item.timepoint;
-            const timepointType = timepoint.timepointType.toLowerCase();
 
-            if ((timepointType === 'baseline') && (toolType !== 'bidirectional')) {
+            if (measurement.toolType !== 'bidirectional') {
                 measurements.push(measurement);
             }
         });