From b2fa171d1776364fd29f89b452f511531d7610ce Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Tue, 10 Nov 2015 16:08:40 -0700
Subject: [PATCH] Save measurement

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

diff --git a/app/pods/protected/strains/edit/controller.js b/app/pods/protected/strains/edit/controller.js
index d3640c7..0bc7bc0 100644
--- a/app/pods/protected/strains/edit/controller.js
+++ b/app/pods/protected/strains/edit/controller.js
@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import SaveModel from '../../../../mixins/save-model';
+import ajaxError from '../../../../utils/ajax-error';
 
 const { Controller } = Ember;
 
@@ -14,5 +15,14 @@ export default Controller.extend(SaveModel, {
         characteristic: this.store.createRecord('characteristic', { sortOrder: -999 }),
       });
     },
+
+    saveMeasurement: function(measurement) {
+      measurement.save().then(() => {
+        this.get('flashMessages').clearMessages();
+      }, () => {
+        ajaxError(measurement.get('errors'), this.get('flashMessages'));
+      });
+    },
+
   },
 });
diff --git a/app/pods/protected/strains/edit/template.hbs b/app/pods/protected/strains/edit/template.hbs
index 727510c..f252090 100644
--- a/app/pods/protected/strains/edit/template.hbs
+++ b/app/pods/protected/strains/edit/template.hbs
@@ -4,6 +4,7 @@
   speciesList=speciesList
   add-characteristic=(action "addCharacteristic")
   allCharacteristics=allCharacteristics
+  save-measurement=(action "saveMeasurement")
   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 62bf56f..0c7f96c 100644
--- a/app/pods/protected/strains/measurements-table-row/component.js
+++ b/app/pods/protected/strains/measurements-table-row/component.js
@@ -1,5 +1,4 @@
 import Ember from 'ember';
-import ajaxError from '../../../../utils/ajax-error';
 
 const { Component, computed } = Ember;
 
@@ -25,16 +24,8 @@ export default Component.extend({
     },
 
     save: function() {
-      if (this.get('rowChanged')) {
-        this.get('measurement').save().then(() => {
-          this.get('flashMessages').clearMessages();
-          this.toggleProperty('isEditing');
-        }, () => {
-          ajaxError(this.get('measurement.errors'), this.get('flashMessages'));
-        });
-      } else {
-        this.toggleProperty('isEditing');
-      }
+      this.attrs['save-measurement'](this.get('measurement'));
+      this.toggleProperty('isEditing');
     },
 
     delete: function() {
diff --git a/app/pods/protected/strains/measurements-table/component.js b/app/pods/protected/strains/measurements-table/component.js
index 497dd39..a797815 100644
--- a/app/pods/protected/strains/measurements-table/component.js
+++ b/app/pods/protected/strains/measurements-table/component.js
@@ -12,6 +12,7 @@ export default Component.extend({
 
   // Actions
   "add-characteristic": null,
+  "save-measurement": null,
 
   // Properties
   sortParams: ['characteristic.characteristicTypeName', 'characteristic.sortOrder', 'characteristic.characteristicName'],
@@ -40,6 +41,10 @@ export default Component.extend({
       this.set('paramsChanged', false);
       this.set('sortAsc', true);
     },
+
+    saveMeasurement: function(measurement) {
+      return this.attrs['save-measurement'](measurement);
+    },
   },
 
 });
diff --git a/app/pods/protected/strains/measurements-table/template.hbs b/app/pods/protected/strains/measurements-table/template.hbs
index 146d44e..5a813d7 100644
--- a/app/pods/protected/strains/measurements-table/template.hbs
+++ b/app/pods/protected/strains/measurements-table/template.hbs
@@ -43,6 +43,7 @@
       {{
         protected/strains/measurements-table-row
         measurement=measurement
+        save-measurement=(action "saveMeasurement")
         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 b224aef..c291343 100644
--- a/app/pods/protected/strains/strain-form/component.js
+++ b/app/pods/protected/strains/strain-form/component.js
@@ -16,6 +16,7 @@ export default Component.extend(SetupMetaData, {
   "on-cancel": null,
   "on-update": null,
   "add-characteristic": null,
+  "save-measurement": null,
 
   // Property mapping
   propertiesList: ['strainName', 'typeStrain', 'species', 'isolatedFrom', 'accessionNumbers', 'genbank', 'wholeGenomeSequence', 'notes'],
@@ -60,6 +61,10 @@ export default Component.extend(SetupMetaData, {
       return this.attrs['add-characteristic']();
     },
 
+    saveMeasurement: function(measurement) {
+      return this.attrs['save-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 0200ea7..9999954 100644
--- a/app/pods/protected/strains/strain-form/template.hbs
+++ b/app/pods/protected/strains/strain-form/template.hbs
@@ -55,6 +55,7 @@
       strain=strain
       add-characteristic=(action "addCharacteristic")
       allCharacteristics=allCharacteristics
+      save-measurement=(action "saveMeasurement")
       canEdit=strain.canEdit
       canAdd=metaData.canAdd
     }}