From fdc29a6baa01a435dc9869329765cb11e93cee27 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Fri, 27 Mar 2015 14:04:38 -0800
Subject: [PATCH] Cleaned up scientific naming.

---
 app/components/scientific-name.js             |  8 +++++++
 app/controllers/strains/index.js              |  2 +-
 app/models/strain.js                          |  5 ++++-
 app/templates/characteristics/index.hbs       |  2 +-
 app/templates/components/scientific-name.hbs  |  1 +
 app/templates/strains/index.hbs               | 10 ++++++---
 app/templates/strains/show.hbs                |  4 ++--
 server/mocks/strains.js                       |  8 +++----
 tests/unit/components/scientific-name-test.js | 21 +++++++++++++++++++
 9 files changed, 49 insertions(+), 12 deletions(-)
 create mode 100644 app/components/scientific-name.js
 create mode 100644 app/templates/components/scientific-name.hbs
 create mode 100644 tests/unit/components/scientific-name-test.js

diff --git a/app/components/scientific-name.js b/app/components/scientific-name.js
new file mode 100644
index 0000000..26c2df5
--- /dev/null
+++ b/app/components/scientific-name.js
@@ -0,0 +1,8 @@
+import Ember from 'ember';
+import layout from '../templates/components/scientific-name';
+
+export default Ember.Component.extend({
+  layout: layout,
+  tagName: 'span',
+  strain: null, // passed in
+});
diff --git a/app/controllers/strains/index.js b/app/controllers/strains/index.js
index 09496c9..86fd495 100644
--- a/app/controllers/strains/index.js
+++ b/app/controllers/strains/index.js
@@ -1,5 +1,5 @@
 import SortableController from '../sortable';
 
 export default SortableController.extend({
-  sortBy: 'strainName',
+  sortBy: 'fullName',
 });
diff --git a/app/models/strain.js b/app/models/strain.js
index 293cc9f..74503ee 100644
--- a/app/models/strain.js
+++ b/app/models/strain.js
@@ -12,5 +12,8 @@ export default DS.Model.extend({
   createdAt: DS.attr('date'),
   updatedAt: DS.attr('date'),
   deletedAt: DS.attr('date'),
-  totalMeasurements: DS.attr('number')
+  totalMeasurements: DS.attr('number'),
+  fullName: Ember.computed('speciesName', 'strainName', function() {
+    return this.get('speciesName') + ' (' + this.get('strainName') + ')';
+  })
 });
diff --git a/app/templates/characteristics/index.hbs b/app/templates/characteristics/index.hbs
index b882ae1..fbd2d23 100644
--- a/app/templates/characteristics/index.hbs
+++ b/app/templates/characteristics/index.hbs
@@ -1,4 +1,4 @@
-<h2>Hymenobacter Characteristics</h2>
+<h2><em>Hymenobacter</em> Characteristics</h2>
 <h3>Total characteristics: {{controller.length}}</h3>
 
 <table class="flakes-table">
diff --git a/app/templates/components/scientific-name.hbs b/app/templates/components/scientific-name.hbs
new file mode 100644
index 0000000..4683ffa
--- /dev/null
+++ b/app/templates/components/scientific-name.hbs
@@ -0,0 +1 @@
+<em>{{strain.speciesName}}</em> (strain {{strain.strainName}})
diff --git a/app/templates/strains/index.hbs b/app/templates/strains/index.hbs
index 10d5fd4..b84fce6 100644
--- a/app/templates/strains/index.hbs
+++ b/app/templates/strains/index.hbs
@@ -1,17 +1,21 @@
-<h2>Hymenobacter Strains</h2>
+<h2><em>Hymenobacter</em> Strains</h2>
 <h3>Total strains: {{controller.length}}</h3>
 
 <table class="flakes-table">
   <thead>
     <tr>
-      <th {{action "setSortBy" "strainName"}}>Name</th>
+      <th {{action "setSortBy" "fullName"}}>Name</th>
       <th {{action "setSortBy" "totalMeasurements"}}>Measurements</th>
     </tr>
   </thead>
   <tbody>
     {{#each strain in controller}}
       <tr>
-        <td>{{link-to strain.strainName 'measurements' strain}}</td>
+        <td>
+          {{#link-to 'measurements' strain}}
+            {{scientific-name strain=strain}}
+          {{/link-to}}
+        </td>
         <td>{{strain.totalMeasurements}}</td>
       </tr>
     {{/each}}
diff --git a/app/templates/strains/show.hbs b/app/templates/strains/show.hbs
index 0c10449..4a06500 100644
--- a/app/templates/strains/show.hbs
+++ b/app/templates/strains/show.hbs
@@ -1,12 +1,12 @@
 <div class="grid-1">
   <div class="span-1">
     <fieldset class="flakes-information-box">
-      <legend>{{model.strainName}}</legend>
+      <legend>Strain {{model.strainName}}</legend>
       {{! ROW 1 }}
       <div class="grid-4">
         <dl class="span-2">
           <dt>Species</dt>
-          <dd>{{model.speciesName}}</dd>
+          <dd><em>{{model.speciesName}}</em></dd>
         </dl>
         <dl class="span-2">
           <dt>Type</dt>
diff --git a/server/mocks/strains.js b/server/mocks/strains.js
index b96191e..d21f525 100644
--- a/server/mocks/strains.js
+++ b/server/mocks/strains.js
@@ -6,7 +6,7 @@ module.exports = function(app) {
     {
       id: 1,
       speciesName: "Species One",
-      strainName: "Strain 1",
+      strainName: "ABC",
       strainType: "Test Type",
       etymology: "Test Etymology",
       accessionBanks: "Test Accession",
@@ -21,7 +21,7 @@ module.exports = function(app) {
     {
       id: 2,
       speciesName: "Species Two",
-      strainName: "Strain 2",
+      strainName: "XYZ",
       strainType: "Test Type",
       etymology: "Test Etymology",
       accessionBanks: "Test Accession",
@@ -36,7 +36,7 @@ module.exports = function(app) {
     {
       id: 3,
       speciesName: "Species Three",
-      strainName: "Strain 3",
+      strainName: "QRS",
       strainType: "Test Type",
       etymology: "Test Etymology",
       accessionBanks: "Test Accession",
@@ -51,7 +51,7 @@ module.exports = function(app) {
     {
       id: 4,
       speciesName: "Species Four",
-      strainName: "Strain 4",
+      strainName: "LMN",
       strainType: "Test Type",
       etymology: "Test Etymology",
       accessionBanks: "Test Accession",
diff --git a/tests/unit/components/scientific-name-test.js b/tests/unit/components/scientific-name-test.js
new file mode 100644
index 0000000..b6a7957
--- /dev/null
+++ b/tests/unit/components/scientific-name-test.js
@@ -0,0 +1,21 @@
+import {
+  moduleForComponent,
+  test
+} from 'ember-qunit';
+
+moduleForComponent('scientific-name', {
+  // specify the other units that are required for this test
+  // needs: ['component:foo', 'helper:bar']
+});
+
+test('it renders', function(assert) {
+  assert.expect(2);
+
+  // creates the component instance
+  var component = this.subject();
+  assert.equal(component._state, 'preRender');
+
+  // renders the component to the page
+  this.render();
+  assert.equal(component._state, 'inDOM');
+});