From ddc306ef299133a89b3f64320b7037e922741c38 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Thu, 19 Mar 2015 11:04:17 -0800
Subject: [PATCH] Adding computedType to measurements

---
 app/models/measurement.js                       | 17 ++++++++++++++---
 .../components/measurements/measurement-row.hbs |  1 +
 app/templates/measurements/index.hbs            |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/models/measurement.js b/app/models/measurement.js
index ef58639..c66bd10 100644
--- a/app/models/measurement.js
+++ b/app/models/measurement.js
@@ -13,13 +13,24 @@ export default DS.Model.extend({
   testMethod: DS.attr('string'),
   createdAt: DS.attr('date'),
   updatedAt: DS.attr('date'),
+  computedType: Ember.computed('textMeasurementType', 'txtValue', 'numValue', function() {
+    if (this.get('textMeasurementType') && !this.get('txtValue') && !this.get('numValue')) {
+      return 'Fixed-text';
+    } else if (!this.get('textMeasurementType') && this.get('txtValue') && !this.get('numValue')) {
+      return 'Free-text';
+    } else if (!this.get('textMeasurementType') && !this.get('txtValue') && this.get('numValue')) {
+      return 'Numerical';
+    } else {
+      return "error";
+    }
+  }),
   computedValue: Ember.computed('textMeasurementType', 'txtValue', 'numValue', function() {
     var val;
-    if (this.get('textMeasurementType')) {
+    if (this.get('computedType') == 'Fixed-text') {
       val = this.get('textMeasurementType');
-    } else if (this.get('txtValue')) {
+    } else if (this.get('computedType') == 'Free-text') {
       val = this.get('txtValue');
-    } else if (this.get('numValue')) {
+    } else if (this.get('computedType') == 'Numerical') {
       val = this.get('numValue');
       if (this.get('confidenceInterval')) {
         val = val + ' &pm; ' + this.get('confidenceInterval');
diff --git a/app/templates/components/measurements/measurement-row.hbs b/app/templates/components/measurements/measurement-row.hbs
index 3adb708..6568cbc 100644
--- a/app/templates/components/measurements/measurement-row.hbs
+++ b/app/templates/components/measurements/measurement-row.hbs
@@ -1,4 +1,5 @@
 <td>{{measurement.characteristic}}</td>
+<td>{{measurement.computedType}}</td>
 <td>{{{measurement.computedValue}}}</td>
 <td>{{measurement.notes}}</td>
 <td>{{measurement.testMethod}}</td>
diff --git a/app/templates/measurements/index.hbs b/app/templates/measurements/index.hbs
index 931e659..0aadbb5 100644
--- a/app/templates/measurements/index.hbs
+++ b/app/templates/measurements/index.hbs
@@ -2,6 +2,7 @@
   <thead>
     <tr>
       <th>Characteristic</th>
+      <th>Measurement Type</th>
       <th>Measurement</th>
       <th>Notes</th>
       <th>Test Method</th>