From c1ff0d57b46cec89379001c9caa141effa147ba8 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Tue, 10 Nov 2015 16:14:02 -0700
Subject: [PATCH] Delete measurement

---
 app/pods/protected/strains/edit/controller.js      |  8 ++++++++
 app/pods/protected/strains/edit/template.hbs       |  1 +
 .../strains/measurements-table-row/component.js    | 14 +++++++-------
 .../strains/measurements-table/component.js        |  5 +++++
 .../strains/measurements-table/template.hbs        |  1 +
 .../protected/strains/strain-form/component.js     |  5 +++++
 .../protected/strains/strain-form/template.hbs     |  1 +
 7 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/pods/protected/strains/edit/controller.js b/app/pods/protected/strains/edit/controller.js
index 0bc7bc0..17f47d6 100644
--- a/app/pods/protected/strains/edit/controller.js
+++ b/app/pods/protected/strains/edit/controller.js
@@ -24,5 +24,13 @@ export default Controller.extend(SaveModel, {
       });
     },
 
+    deleteMeasurement: function(measurement) {
+      const characteristic = measurement.get('characteristic');
+      if (characteristic.get('isNew')) {
+        characteristic.destroyRecord();
+      }
+      measurement.destroyRecord();
+    },
+
   },
 });
diff --git a/app/pods/protected/strains/edit/template.hbs b/app/pods/protected/strains/edit/template.hbs
index f252090..59d1633 100644
--- a/app/pods/protected/strains/edit/template.hbs
+++ b/app/pods/protected/strains/edit/template.hbs
@@ -5,6 +5,7 @@
   add-characteristic=(action "addCharacteristic")
   allCharacteristics=allCharacteristics
   save-measurement=(action "saveMeasurement")
+  delete-measurement=(action "deleteMeasurement")
   on-save=(action "save")
   on-cancel=(action "cancel")
 }}
diff --git a/app/pods/protected/strains/measurements-table-row/component.js b/app/pods/protected/strains/measurements-table-row/component.js
index 0c7f96c..cba52a6 100644
--- a/app/pods/protected/strains/measurements-table-row/component.js
+++ b/app/pods/protected/strains/measurements-table-row/component.js
@@ -8,8 +8,12 @@ export default Component.extend({
   allCharacteristics: null,
   measurement: null,
 
+  // Actions
+  "save-measurement": null,
+  "delete-measurement": null,
+
   oldCharacteristicId: function() {
-    let json = this.get('measurement').toJSON();
+    const json = this.get('measurement').toJSON();
     return json.characteristic;
   }.property(),
 
@@ -29,12 +33,8 @@ export default Component.extend({
     },
 
     delete: function() {
-      let char = this.get('measurement.characteristic');
-      if (char.get('isNew')) {
-        char.destroyRecord();
-      }
-      this.get('measurement').destroyRecord();
-    }
+      this.attrs['delete-measurement'](this.get('measurement'));
+    },
 
   },
 });
diff --git a/app/pods/protected/strains/measurements-table/component.js b/app/pods/protected/strains/measurements-table/component.js
index a797815..ab0b72e 100644
--- a/app/pods/protected/strains/measurements-table/component.js
+++ b/app/pods/protected/strains/measurements-table/component.js
@@ -13,6 +13,7 @@ export default Component.extend({
   // Actions
   "add-characteristic": null,
   "save-measurement": null,
+  "delete-measurement": null,
 
   // Properties
   sortParams: ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName'],
@@ -45,6 +46,10 @@ export default Component.extend({
     saveMeasurement: function(measurement) {
       return this.attrs['save-measurement'](measurement);
     },
+
+    deleteMeasurement: function(measurement) {
+      return this.attrs['delete-measurement'](measurement);
+    },
   },
 
 });
diff --git a/app/pods/protected/strains/measurements-table/template.hbs b/app/pods/protected/strains/measurements-table/template.hbs
index 5a813d7..9e22393 100644
--- a/app/pods/protected/strains/measurements-table/template.hbs
+++ b/app/pods/protected/strains/measurements-table/template.hbs
@@ -44,6 +44,7 @@
         protected/strains/measurements-table-row
         measurement=measurement
         save-measurement=(action "saveMeasurement")
+        delete-measurement=(action "deleteMeasurement")
         allCharacteristics=allCharacteristics
         canEdit=canEdit
       }}
diff --git a/app/pods/protected/strains/strain-form/component.js b/app/pods/protected/strains/strain-form/component.js
index c291343..be823bc 100644
--- a/app/pods/protected/strains/strain-form/component.js
+++ b/app/pods/protected/strains/strain-form/component.js
@@ -17,6 +17,7 @@ export default Component.extend(SetupMetaData, {
   "on-update": null,
   "add-characteristic": null,
   "save-measurement": null,
+  "delete-measurement": null,
 
   // Property mapping
   propertiesList: ['strainName', 'typeStrain', 'species', 'isolatedFrom', 'accessionNumbers', 'genbank', 'wholeGenomeSequence', 'notes'],
@@ -65,6 +66,10 @@ export default Component.extend(SetupMetaData, {
       return this.attrs['save-measurement'](measurement);
     },
 
+    deleteMeasurement: function(measurement) {
+      return this.attrs['delete-measurement'](measurement);
+    },
+
     strainNameDidChange: function(value) {
       this.updateField('strainName', value);
     },
diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs
index 9999954..47c5112 100644
--- a/app/pods/protected/strains/strain-form/template.hbs
+++ b/app/pods/protected/strains/strain-form/template.hbs
@@ -56,6 +56,7 @@
       add-characteristic=(action "addCharacteristic")
       allCharacteristics=allCharacteristics
       save-measurement=(action "saveMeasurement")
+      delete-measurement=(action "deleteMeasurement")
       canEdit=strain.canEdit
       canAdd=metaData.canAdd
     }}