From ced405cd0337f19d7dd0d0384e629a0b8cb84f6e Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Thu, 19 Mar 2015 09:25:53 -0800
Subject: [PATCH] Misc data cleanup

---
 app/templates/strains/show.hbs | 10 +++--
 server/mocks/measurements.js   | 80 +++++++++++++++++-----------------
 server/mocks/strains.js        |  8 ++--
 3 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/app/templates/strains/show.hbs b/app/templates/strains/show.hbs
index 8c50468..67d9c98 100644
--- a/app/templates/strains/show.hbs
+++ b/app/templates/strains/show.hbs
@@ -22,15 +22,19 @@
       </div>
       <div class="grid-4">
         <dl class="span-1">
-          <dt>Created</dt>
+          <dt>Isolated From</dt>
+          <dd>{{model.isolatedFrom}}</dd>
+        </dl>
+        <dl class="span-1">
+          <dt>Record Created</dt>
           <dd>{{null-time model.createdAt 'LL'}}</dd>
         </dl>
         <dl class="span-1">
-          <dt>Updated</dt>
+          <dt>Record Updated</dt>
           <dd>{{null-time model.updatedAt 'LL'}}</dd>
         </dl>
         <dl class="span-1">
-          <dt>Deleted</dt>
+          <dt>Record Deleted</dt>
           <dd>{{null-time model.deletedAt 'LL'}}</dd>
         </dl>
         <dl class="span-1"></dl>
diff --git a/server/mocks/measurements.js b/server/mocks/measurements.js
index 2c0e17a..42f1c1d 100644
--- a/server/mocks/measurements.js
+++ b/server/mocks/measurements.js
@@ -6,140 +6,140 @@ module.exports = function(app) {
     {
       id: 1,
       strain: 1,
-      characteristic: 1,
-      textMeasurementTypeId: 1,
+      characteristic: 'Characteristic 1',
+      textMeasurementType: 'Meas. Type 1',
       txtValue: null,
       numValue: null,
       confidenceInterval: null,
-      unitTypeId: null,
+      unitType: null,
       notes: null,
-      testMethodId: null,
+      testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z"
     },
     {
       id: 2,
       strain: 1,
-      characteristic: 2,
-      textMeasurementTypeId: 1,
+      characteristic: 'Characteristic 2',
+      textMeasurementType: 'Meas. Type 1',
       txtValue: null,
       numValue: null,
       confidenceInterval: null,
-      unitTypeId: null,
+      unitType: null,
       notes: null,
-      testMethodId: null,
+      testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z"
     },
     {
       id: 3,
       strain: 1,
-      characteristic: 3,
-      textMeasurementTypeId: null,
+      characteristic: 'Characteristic 3',
+      textMeasurementType: null,
       txtValue: "text value",
       numValue: null,
       confidenceInterval: null,
-      unitTypeId: null,
+      unitType: null,
       notes: "some notes",
-      testMethodId: null,
+      testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z"
     },
     {
       id: 4,
       strain: 1,
-      characteristic: 4,
-      textMeasurementTypeId: null,
+      characteristic: 'Characteristic 4',
+      textMeasurementType: null,
       txtValue: null,
       numValue: 123.4,
       confidenceInterval: null,
-      unitTypeId: 1,
+      unitType: 'Unit 1',
       notes: null,
-      testMethodId: null,
+      testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z"
     },
     {
       id: 5,
       strain: 1,
-      characteristic: 4,
-      textMeasurementTypeId: null,
+      characteristic: 'Characteristic 4',
+      textMeasurementType: null,
       txtValue: null,
       numValue: 567.8,
       confidenceInterval: 0.2,
-      unitTypeId: 1,
+      unitType: 'Unit 1',
       notes: null,
-      testMethodId: null,
+      testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z"
     },
     {
       id: 6,
       strain: 2,
-      characteristic: 1,
-      textMeasurementTypeId: 1,
+      characteristic: 'Characteristic 1',
+      textMeasurementType: 'Meas. Type 1',
       txtValue: null,
       numValue: null,
       confidenceInterval: null,
-      unitTypeId: null,
+      unitType: null,
       notes: null,
-      testMethodId: null,
+      testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z"
     },
     {
       id: 7,
       strain: 2,
-      characteristic: 2,
-      textMeasurementTypeId: 1,
+      characteristic: 'Characteristic 2',
+      textMeasurementType: 'Meas. Type 1',
       txtValue: null,
       numValue: null,
       confidenceInterval: null,
-      unitTypeId: null,
+      unitType: null,
       notes: null,
-      testMethodId: null,
+      testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z"
     },
     {
       id: 8,
       strain: 2,
-      characteristic: 3,
-      textMeasurementTypeId: null,
+      characteristic: 'Characteristic 3',
+      textMeasurementType: 'Meas. Type 1',
       txtValue: "text value",
       numValue: null,
       confidenceInterval: null,
-      unitTypeId: null,
+      unitType: null,
       notes: "some notes",
-      testMethodId: null,
+      testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z"
     },
     {
       id: 9,
       strain: 2,
-      characteristic: 4,
-      textMeasurementTypeId: null,
+      characteristic: 'Characteristic 4',
+      textMeasurementType: null,
       txtValue: null,
       numValue: 123.4,
       confidenceInterval: null,
-      unitTypeId: 1,
+      unitType: 'Unit 1',
       notes: null,
-      testMethodId: null,
+      testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z"
     },
     {
       id: 10,
       strain: 2,
-      characteristic: 4,
-      textMeasurementTypeId: null,
+      characteristic: 'Characteristic 4',
+      textMeasurementType: null,
       txtValue: null,
       numValue: 567.8,
       confidenceInterval: 0.2,
-      unitTypeId: 1,
+      unitType: 'Unit 1',
       notes: null,
-      testMethodId: null,
+      testMethod: null,
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z"
     }
diff --git a/server/mocks/strains.js b/server/mocks/strains.js
index 4769fd9..84ae778 100644
--- a/server/mocks/strains.js
+++ b/server/mocks/strains.js
@@ -11,7 +11,7 @@ module.exports = function(app) {
       etymology: "Test Etymology",
       accessionBanks: "Test Accession",
       genbankEmblDdb: "Test Genbank",
-      isolatedFrom: null,
+      isolatedFrom: "Location 1",
       measurements: [1,2,3,4,5],
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z",
@@ -25,7 +25,7 @@ module.exports = function(app) {
       etymology: "Test Etymology",
       accessionBanks: "Test Accession",
       genbankEmblDdb: "Test Genbank",
-      isolatedFrom: null,
+      isolatedFrom: "Location 2",
       measurements: [6,7,8,9,10],
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z",
@@ -39,7 +39,7 @@ module.exports = function(app) {
       etymology: "Test Etymology",
       accessionBanks: "Test Accession",
       genbankEmblDdb: "Test Genbank",
-      isolatedFrom: null,
+      isolatedFrom: "Location 1",
       measurements: [],
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z",
@@ -53,7 +53,7 @@ module.exports = function(app) {
       etymology: "Test Etymology",
       accessionBanks: "Test Accession",
       genbankEmblDdb: "Test Genbank",
-      isolatedFrom: null,
+      isolatedFrom: "Location 2",
       measurements: [],
       createdAt: "0001-01-01T00:00:00Z",
       updatedAt: "0001-01-01T00:00:00Z",