From ceccf6e53659a4b97d7a46234d287016243bd1d8 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Fri, 4 Sep 2015 10:47:32 -0700
Subject: [PATCH] Rough in detail view for characteristics

---
 .../components/x-application/template.hbs     |  6 +--
 .../characteristics/{ => index}/controller.js |  0
 .../{ => index}/editable-row/component.js     |  0
 .../{ => index}/editable-row/template.hbs     |  0
 .../characteristics/{ => index}/route.js      |  0
 .../characteristics/{ => index}/template.hbs  | 11 +++-
 .../protected/characteristics/show/route.js   |  8 +++
 .../characteristics/show/template.hbs         | 53 +++++++++++++++++++
 app/router.js                                 |  6 ++-
 9 files changed, 77 insertions(+), 7 deletions(-)
 rename app/pods/protected/characteristics/{ => index}/controller.js (100%)
 rename app/pods/protected/characteristics/{ => index}/editable-row/component.js (100%)
 rename app/pods/protected/characteristics/{ => index}/editable-row/template.hbs (100%)
 rename app/pods/protected/characteristics/{ => index}/route.js (100%)
 rename app/pods/protected/characteristics/{ => index}/template.hbs (55%)
 create mode 100644 app/pods/protected/characteristics/show/route.js
 create mode 100644 app/pods/protected/characteristics/show/template.hbs

diff --git a/app/pods/components/x-application/template.hbs b/app/pods/components/x-application/template.hbs
index a2097bd..3057eac 100644
--- a/app/pods/components/x-application/template.hbs
+++ b/app/pods/components/x-application/template.hbs
@@ -5,15 +5,15 @@
       {{#link-to 'protected.compare' tagName='li' href=false}}
         {{link-to 'Compare' 'protected.compare'}}
       {{/link-to}}
-      {{#link-to 'protected.characteristics' tagName='li' href=false}}
-        {{link-to 'Characteristics' 'protected.characteristics'}}
-      {{/link-to}}
       {{#link-to 'protected.species' tagName='li' href=false}}
         {{link-to 'Species' 'protected.species'}}
       {{/link-to}}
       {{#link-to 'protected.strains' tagName='li' href=false}}
         {{link-to 'Strains' 'protected.strains'}}
       {{/link-to}}
+      {{#link-to 'protected.characteristics' tagName='li' href=false}}
+        {{link-to 'Characteristics' 'protected.characteristics'}}
+      {{/link-to}}
       {{#link-to 'protected.about' tagName='li' href=false}}
         {{link-to 'About' 'protected.about'}}
       {{/link-to}}
diff --git a/app/pods/protected/characteristics/controller.js b/app/pods/protected/characteristics/index/controller.js
similarity index 100%
rename from app/pods/protected/characteristics/controller.js
rename to app/pods/protected/characteristics/index/controller.js
diff --git a/app/pods/protected/characteristics/editable-row/component.js b/app/pods/protected/characteristics/index/editable-row/component.js
similarity index 100%
rename from app/pods/protected/characteristics/editable-row/component.js
rename to app/pods/protected/characteristics/index/editable-row/component.js
diff --git a/app/pods/protected/characteristics/editable-row/template.hbs b/app/pods/protected/characteristics/index/editable-row/template.hbs
similarity index 100%
rename from app/pods/protected/characteristics/editable-row/template.hbs
rename to app/pods/protected/characteristics/index/editable-row/template.hbs
diff --git a/app/pods/protected/characteristics/route.js b/app/pods/protected/characteristics/index/route.js
similarity index 100%
rename from app/pods/protected/characteristics/route.js
rename to app/pods/protected/characteristics/index/route.js
diff --git a/app/pods/protected/characteristics/template.hbs b/app/pods/protected/characteristics/index/template.hbs
similarity index 55%
rename from app/pods/protected/characteristics/template.hbs
rename to app/pods/protected/characteristics/index/template.hbs
index 12ce1c1..76efee6 100644
--- a/app/pods/protected/characteristics/template.hbs
+++ b/app/pods/protected/characteristics/index/template.hbs
@@ -7,12 +7,19 @@
       <th>Name</th>
       <th>Type</th>
       <th>Sort Order</th>
-      <th></th>
     </tr>
   </thead>
   <tbody>
     {{#each sortedCharacteristics as |row|}}
-      {{protected/characteristics/editable-row row=row}}
+      <tr>
+        <td>
+          {{#link-to 'protected.characteristics.show' row}}
+            {{row.characteristicName}}
+          {{/link-to}}
+        </td>
+        <td>{{row.characteristicTypeName}}</td>
+        <td>{{row.sortOrder}}</td>
+      </tr>
     {{/each}}
   </tbody>
 </table>
diff --git a/app/pods/protected/characteristics/show/route.js b/app/pods/protected/characteristics/show/route.js
new file mode 100644
index 0000000..f66a9c7
--- /dev/null
+++ b/app/pods/protected/characteristics/show/route.js
@@ -0,0 +1,8 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+  model: function(params) {
+    return this.store.findRecord('characteristic', params.characteristic_id, { reload: true });
+  },
+
+});
diff --git a/app/pods/protected/characteristics/show/template.hbs b/app/pods/protected/characteristics/show/template.hbs
new file mode 100644
index 0000000..faf6596
--- /dev/null
+++ b/app/pods/protected/characteristics/show/template.hbs
@@ -0,0 +1,53 @@
+<div class="grid-1">
+  <div class="span-1">
+    <fieldset class="flakes-information-box {{if isEditing 'is-editing'}}">
+      <legend>
+        {{model.characteristicName}}
+      </legend>
+
+      {{! ROW 1 }}
+      <div class="grid-2 gutter-20">
+        <dl class="span-2">
+          <dt>Characteristic Type</dt>
+          <dd>
+            {{model.characteristicTypeName}}
+          </dd>
+        </dl>
+      </div>
+
+      {{! ROW 2 }}
+      <div class="grid-2 gutter-20">
+        <dl class="span-2">
+          <dt>Strains</dt>
+          <dd>
+            <ul>
+              {{#each model.strains as |strain index|}}
+                <li>
+                  {{#link-to 'protected.strains.show' strain.id}}
+                    {{{strain.strainNameMU}}}
+                  {{/link-to}}
+                </li>
+              {{/each}}
+            </ul>
+          </dd>
+        </dl>
+      </div>
+
+      {{! ROW 3 }}
+      <div class="grid-3 gutter-20">
+        <dl class="span-1">
+          <dt>Record Created</dt>
+          <dd>{{null-time model.createdAt 'LL'}}</dd>
+        </dl>
+        <dl class="span-1">
+          <dt>Record Updated</dt>
+          <dd>{{null-time model.updatedAt 'LL'}}</dd>
+        </dl>
+        <dl class="span-1">
+          <dt>Record Deleted</dt>
+          <dd>{{null-time model.deletedAt 'LL'}}</dd>
+        </dl>
+      </div>
+    </fieldset>
+  </div>
+</div>
diff --git a/app/router.js b/app/router.js
index c34e885..42a594b 100644
--- a/app/router.js
+++ b/app/router.js
@@ -18,13 +18,15 @@ Router.map(function() {
 
   this.route('protected', { path: '/' }, function() {
     this.route('about');
-    this.route('characteristics');
-    this.route('measurements');
 
     this.route('compare', function() {
       this.route('results');
     });
 
+    this.route('characteristics', function() {
+      this.route('show', { path: ':characteristic_id' });
+    });
+
     this.route('species', function() {
       this.route('new');
       this.route('show', { path: ':species_id' });