From d2951e600fd3d75c81e322ff17f79cf9fdf3c2c1 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Tue, 3 Feb 2015 11:09:50 -0900
Subject: [PATCH] Moving measurements into strain for now
---
app/adapters/species.js | 5 --
app/router.js | 1 -
.../{measurements.hbs => measurement.hbs} | 2 -
app/templates/strain.hbs | 58 +++++++++++++++++++
4 files changed, 58 insertions(+), 8 deletions(-)
delete mode 100644 app/adapters/species.js
rename app/templates/{measurements.hbs => measurement.hbs} (97%)
diff --git a/app/adapters/species.js b/app/adapters/species.js
deleted file mode 100644
index 2c5e29d..0000000
--- a/app/adapters/species.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import DS from 'ember-data';
-
-export default DS.RESTAdapter.reopen({
- namespace: 'api'
-});
diff --git a/app/router.js b/app/router.js
index 457fe4f..05396c9 100644
--- a/app/router.js
+++ b/app/router.js
@@ -14,7 +14,6 @@ Router.map(function() {
this.resource('strain', { path: '/strain/:strain_id' }, function() {
this.resource('measurements');
});
- this.resource('measurements');
this.resource('measurement', { path: '/measurement/:measurement_id' });
});
diff --git a/app/templates/measurements.hbs b/app/templates/measurement.hbs
similarity index 97%
rename from app/templates/measurements.hbs
rename to app/templates/measurement.hbs
index 51ee84b..3b6e6a5 100644
--- a/app/templates/measurements.hbs
+++ b/app/templates/measurement.hbs
@@ -1,5 +1,4 @@
<div class="grid-1">
- {{#each}}
<div class="span-1">
<fieldset class="read-only-information">
<legend>{{id}}</legend>
@@ -49,5 +48,4 @@
</dl>
</fieldset>
</div>
- {{/each}}
</div>
diff --git a/app/templates/strain.hbs b/app/templates/strain.hbs
index 96eb99c..ed914a4 100644
--- a/app/templates/strain.hbs
+++ b/app/templates/strain.hbs
@@ -50,4 +50,62 @@
</div>
</fieldset>
</div>
+ <div>
+ {{#each measurements}}
+ <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">
+ <dt>Text Measurement Type</dt>
+ <dd>{{textMeasurementTypeId}}</dd>
+ </dl>
+ <dl class="span-3">
+ <dt>Text Value</dt>
+ <dd>{{txtValue}}</dd>
+ </dl>
+ </div>
+ <div class="grid-9">
+ <dl class="span-3">
+ <dt>Numerical Value</dt>
+ <dd>{{numValue}}</dd>
+ </dl>
+ <dl class="span-3">
+ <dt>Confidence Interval</dt>
+ <dd>{{confidenceInterval}}</dd>
+ </dl>
+ <dl class="span-3">
+ <dt>Unit Type</dt>
+ <dd>{{unitTypeId}}</dd>
+ </dl>
+ </div>
+ <div class="grid-8">
+ <dl class="span-4">
+ <dt>Notes</dt>
+ <dd>{{notes}}</dd>
+ </dl>
+ <dl class="span-4">
+ <dt>Test Method</dt>
+ <dd>{{testMethodId}}</dd>
+ </dl>
+ </div>
+ <div class="grid-8">
+ <dl class="span-4">
+ <dt>Created</dt>
+ <dd>{{createdAt}}</dd>
+ </dl>
+ <dl class="span-4">
+ <dt>Updated</dt>
+ <dd>{{updatedAt}}</dd>
+ </dl>
+ </div>
+ </fieldset>
+ </div>
+ </div>
+ {{/each}}
</div>