From 2bf7534ec4be5ec7d7cd89c5ae30a3c82c94c4f6 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Fri, 12 Jun 2015 11:23:33 -0800
Subject: [PATCH] Try computed properties

---
 app/models/strain.js                                | 13 +++++++++----
 .../measurement-search-table/template.hbs           |  7 ++++++-
 app/pods/components/strain-index-row/template.hbs   |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/models/strain.js b/app/models/strain.js
index 12c7196..cf0fe3a 100644
--- a/app/models/strain.js
+++ b/app/models/strain.js
@@ -1,5 +1,4 @@
 import DS from 'ember-data';
-import Ember from 'ember';
 
 export default DS.Model.extend({
   measurements: DS.hasMany('measurements', { async: true }),
@@ -17,7 +16,13 @@ export default DS.Model.extend({
   updatedBy: DS.attr('number'),
   deletedBy: DS.attr('number'),
   totalMeasurements: DS.attr('number'),
-  fullName: Ember.computed('species.speciesName', 'strainName', function() {
-    return this.get('species.speciesName') + ' (strain ' + this.get('strainName') + ')';
-  })
+  fullName: function() {
+    return `${this.get('species.speciesName')} (strain ${this.get('strainName')})`;
+  }.property('species', 'strainName').readOnly(),
+  fullNameMU: function() {
+    let species = `<em>${this.get('species.speciesName')}</em>`,
+      type = this.get('typeStrain') ? '<sup>T</sup>' : '',
+      strain = `(strain ${this.get('strainName')}${type})`;
+    return `${species} ${strain}`;
+  }.property('species', 'strainName').readOnly(),
 });
diff --git a/app/pods/components/measurement-search-table/template.hbs b/app/pods/components/measurement-search-table/template.hbs
index 667312e..93d8ab8 100644
--- a/app/pods/components/measurement-search-table/template.hbs
+++ b/app/pods/components/measurement-search-table/template.hbs
@@ -10,6 +10,7 @@
 </div>
 
 {{#if isLoading}}
+  {{!-- This doesn't work yet --}}
   {{loading-panel}}
 {{else}}
   <table class="flakes-table">
@@ -22,7 +23,11 @@
     </thead>
     <tbody>
       {{#each measurements as |measurement|}}
-        {{measurement-index-row data=measurement}}
+        <tr>
+          <td>{{{measurement.strain.fullNameMU}}}</td>
+          <td>{{measurement.characteristic.characteristicName}}</td>
+          <td>{{{measurement.value}}}</td>
+        </tr>
       {{/each}}
     </tbody>
   </table>
diff --git a/app/pods/components/strain-index-row/template.hbs b/app/pods/components/strain-index-row/template.hbs
index 4d64b0b..f512924 100644
--- a/app/pods/components/strain-index-row/template.hbs
+++ b/app/pods/components/strain-index-row/template.hbs
@@ -1,6 +1,6 @@
 <td>
   {{#link-to 'strains.show' data.id classBinding="data.typeStrain:type-strain"}}
-    {{scientific-name strain=data}}
+    {{{data.fullNameMU}}}
   {{/link-to}}
 </td>
 <td>