LT-115: Add location and response data in lesion table (WIP)

Packages/lesiontracker/client/compatibility/crunexTool.js

@@ -158,10 +158,10 @@
                 seriesInstanceUid: seriesInstanceUid,
                 studyInstanceUid: studyInstanceUid,
                 patientId: patientId,
-                response: '',
+                response: toolName,
                 isTarget: true,
                 measurementType: 'nonTarget',
-                toolName: toolName
+                toolName: 'Target'
             };
 
             return measurementData;

Packages/lesiontracker/client/components/lesionTableTimepointCell/lesionTableTimepointCell.html

@@ -1,6 +1,6 @@
 <template name="lesionTableTimepointCell">
     {{ #if hasDataAtThisTimepoint }}
-        {{ #if isTarget }}
+        {{ #if isBirectional }}
             <td class="lesionTableTimepointCell targetCell" tabindex="1">{{displayData}}</td>
         {{ else }}
             <td class="lesionTableTimepointCell nonTargetCell" tabindex="1">{{displayData}}</td>

Packages/lesiontracker/client/components/lesionTableTimepointCell/lesionTableTimepointCell.js

@@ -18,7 +18,7 @@ Template.lesionTableTimepointCell.helpers({
 
         var data = lesionData.timepoints[this.timepointId];
 
-        if (lesionData.isTarget === true) {
+        if (lesionData.measurementType === 'bidirectional') {
             if (data.shortestDiameter) {
                 return data.longestDiameter + ' x ' + data.shortestDiameter;
             }
@@ -31,6 +31,14 @@ Template.lesionTableTimepointCell.helpers({
     isTarget: function() {
         var lesionData = Template.parentData(1);
         return lesionData.isTarget;
+    },
+
+    isBidirectional: function() {
+        var lesionData = Template.parentData(1);
+        if (lesionData.measurementType === 'bidirectional') {
+            return true;
+        }
+        return false
     }
 });
 

Packages/lesiontracker/lib/LesionManager.js

@@ -80,7 +80,8 @@ function updateLesionData(lesionData) {
             lesionNumber: lesionData.lesionNumber,
             isTarget: lesionData.isTarget,
             patientId: lesionData.patientId,
-            id: lesionData.id
+            id: lesionData.id,
+            measurementType: lesionData.measurementType
         };
 
         // Retrieve the location name given the locationUID

Packages/lesiontracker/lib/handleMeasurementAdded.js

@@ -1,8 +1,9 @@
 handleMeasurementAdded = function(e, eventData) {
     var measurementData = eventData.measurementData;
 
-    switch (eventData.toolType) {
+    switch (measurementData.measurementType) {
         case 'nonTarget':
+        case 'bidirectional':
         case 'lesion':
             log.info('CornerstoneToolsMeasurementAdded');
             LesionManager.updateLesionData(measurementData);

Packages/lesiontracker/lib/handleMeasurementModified.js

@@ -1,9 +1,9 @@
 handleMeasurementModified = function(e, eventData) {
     var measurementData = eventData.measurementData;
-
-    switch (eventData.toolType) {
+    switch (measurementData.measurementType) {
         case 'nonTarget':
         case 'lesion':
+        case 'bidirectional':
             log.info('CornerstoneToolsMeasurementModified');
             LesionManager.updateLesionData(measurementData);
             TrialResponseCriteria.validateDelayed(measurementData);