From e106f150412acf9fe1e1a02941fdc11b842816b4 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Tue, 3 Feb 2015 12:32:46 -0900
Subject: [PATCH] Added characteristic

---
 app/models/characteristic.js | 11 +++++++++++
 app/models/measurement.js    |  1 +
 app/templates/strain.hbs     | 12 ++++--------
 3 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 app/models/characteristic.js

diff --git a/app/models/characteristic.js b/app/models/characteristic.js
new file mode 100644
index 0000000..b8ef634
--- /dev/null
+++ b/app/models/characteristic.js
@@ -0,0 +1,11 @@
+import DS from 'ember-data';
+import Ember from 'ember';
+
+export default DS.Model.extend({
+  characteristicName: DS.attr(),
+  characteristicTypeId: DS.attr(),
+  measurements: DS.hasMany('measurement', {async: true}),
+  createdAt: DS.attr('date'),
+  updatedAt: DS.attr('date'),
+  deletedAt: DS.attr('date')
+});
diff --git a/app/models/measurement.js b/app/models/measurement.js
index 05d8b90..00ef030 100644
--- a/app/models/measurement.js
+++ b/app/models/measurement.js
@@ -10,6 +10,7 @@ export default DS.Model.extend({
   notes: DS.attr(),
   testMethodId: DS.attr(),
   strain: DS.belongsTo('strain', {async: true}),
+  characteristic: DS.belongsTo('characteristic', {async: true}),
   createdAt: DS.attr('date'),
   updatedAt: DS.attr('date')
 });
diff --git a/app/templates/strain.hbs b/app/templates/strain.hbs
index ed914a4..c902592 100644
--- a/app/templates/strain.hbs
+++ b/app/templates/strain.hbs
@@ -55,17 +55,13 @@
     <div class="grid-1">
       <div class="span-1">
         <fieldset class="flakes-information-box">
-          <legend>{{id}}</legend>
-          <div class="grid-9">
-            <dl class="span-3">
-              <dt>Characteristic</dt>
-              <dd>{{characteristicId}}</dd>
-            </dl>
-            <dl class="span-3">
+          <legend>{{characteristic.characteristicName}}</legend>
+          <div class="grid-8">
+            <dl class="span-4">
               <dt>Text Measurement Type</dt>
               <dd>{{textMeasurementTypeId}}</dd>
             </dl>
-            <dl class="span-3">
+            <dl class="span-4">
               <dt>Text Value</dt>
               <dd>{{txtValue}}</dd>
             </dl>