From a9266608d284456e83e346504249d21b6a0bc574 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.ziegler@ulg.ac.be>
Date: Sun, 10 Jan 2016 15:40:51 +0100
Subject: [PATCH] Made lesion removal confirmation dialogs different for
 timepoints and complete measurments

---
 .../confirmDeleteDialog/confirmDeleteDialog.html     | 12 ++++++++++--
 .../confirmDeleteDialog/confirmDeleteDialog.js       |  8 +++++++-
 .../lesionLocationDialog/lesionLocationDialog.js     |  8 +++++++-
 .../components/lesionTableRow/lesionTableRow.js      |  4 +++-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.html b/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.html
index 947939ce9..9c15a94df 100644
--- a/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.html
+++ b/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.html
@@ -1,7 +1,15 @@
 <template name="confirmDeleteDialog">
     <div id="confirmDeleteDialog" tabindex="0">
-        <h5>Remove Measurement?</h5>
-        <p>Are you sure you would like to remove this measurement?</p>
+        {{ #if title }}
+        <h5>{{title}}</h5>
+        {{ else }}
+        <h5>Remove data from Timepoint?</h5>
+        {{/if}}
+        {{ #if text }}
+        <p>{{text}}</p>
+        {{ else }}
+        <p>Are you sure you would like to remove the measurement data at this timepoint?</p>
+        {{/if}}
         <button id="cancel" class="btn btn-link" tabindex="1">Cancel</button>
         <button id="confirm" class="btn btn-primary" tabindex="0">OK</button>
     </div>
diff --git a/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.js b/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.js
index b05c0d2a9..59c3f9179 100644
--- a/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.js
+++ b/Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.js
@@ -17,12 +17,18 @@ showConfirmDialog = function(doneCallback, options) {
     options = options || {};
     UI.renderWithData(Template.removableBackdrop, options, document.body);
 
+    var confirmDeleteDialog = $("#confirmDeleteDialog");
+    confirmDeleteDialog.remove();
+
+    var viewer = document.getElementById('viewer');
+    UI.renderWithData(Template.confirmDeleteDialog, options, viewer);
+
     // Make sure the context menu is closed when the user clicks away
     $(".removableBackdrop").one('mousedown touchstart', function() {
         closeHandler();
     });
 
-    var confirmDeleteDialog = $("#confirmDeleteDialog");
+    confirmDeleteDialog = $("#confirmDeleteDialog");
     confirmDeleteDialog.css('display', 'block');
     confirmDeleteDialog.focus();
 
diff --git a/Packages/lesiontracker/client/components/lesionLocationDialog/lesionLocationDialog.js b/Packages/lesiontracker/client/components/lesionLocationDialog/lesionLocationDialog.js
index 9db3fae22..eeaea823d 100644
--- a/Packages/lesiontracker/client/components/lesionLocationDialog/lesionLocationDialog.js
+++ b/Packages/lesiontracker/client/components/lesionLocationDialog/lesionLocationDialog.js
@@ -238,12 +238,18 @@ Template.lesionLocationDialog.events({
         var doneCallback = Template.lesionLocationDialog.doneCallback;
         var dialog = Template.lesionLocationDialog.dialog;
 
+        var options = {
+            keyPressAllowed: false,
+            title: 'Remove measurement?',
+            text: 'Are you sure you would like to remove the entire measurement?'
+        };
+
         showConfirmDialog(function() {
             if (doneCallback && typeof doneCallback === 'function') {
                 var deleteTool = true;
                 doneCallback(measurementData, deleteTool);
             }
-        });
+        }, options);
 
         closeHandler(dialog);
     },
diff --git a/Packages/lesiontracker/client/components/lesionTableRow/lesionTableRow.js b/Packages/lesiontracker/client/components/lesionTableRow/lesionTableRow.js
index 8dcc762ce..c6949addc 100644
--- a/Packages/lesiontracker/client/components/lesionTableRow/lesionTableRow.js
+++ b/Packages/lesiontracker/client/components/lesionTableRow/lesionTableRow.js
@@ -41,7 +41,9 @@ Template.lesionTableRow.events({
             (keyCode === keys.D && e.ctrlKey === true)) {
             var currentMeasurement = this;
             var options = {
-                keyPressAllowed: false
+                keyPressAllowed: false,
+                title: 'Remove measurement?',
+                text: 'Are you sure you would like to remove the entire measurement?'
             };
 
             showConfirmDialog(function() {