Merge branch 'master' into clostridium

* master:
  Notes
  Cleaning up measurement edit
  Dummy measurement edit
  Fix login error transition

app/models/measurement.js

@@ -3,9 +3,7 @@ import DS from 'ember-data';
 export default DS.Model.extend({
   strain             : DS.belongsTo('strain', { async: false }),
   characteristic     : DS.belongsTo('characteristic', { async: false }),
-  textMeasurementType: DS.attr('string'),
+  value              : DS.attr('string'),
-  txtValue           : DS.attr('string'),
-  numValue           : DS.attr('number'),
   confidenceInterval : DS.attr('number'),
   unitType           : DS.attr('string'),
   notes              : DS.attr('string'),
@@ -14,17 +12,4 @@ export default DS.Model.extend({
   updatedAt          : DS.attr('date'),
   createdBy          : DS.attr('number'),
   updatedBy          : DS.attr('number'),
-
-  value: function() {
-    if (this.get('textMeasurementType')) {
-      return this.get('textMeasurementType');
-    }
-    if (this.get('txtValue')) {
-      return this.get('txtValue');
-    }
-    if (this.get('numValue')) {
-      return this.get('numValue');
-    }
-    return "error";
-  }.property('textMeasurementType', 'txtValue', 'numValue'),
 });

app/pods/application/loading/template.hbs

@@ -0,0 +1 @@
+{{loading-panel}}

app/pods/login/controller.js

@@ -11,6 +11,7 @@ export default Ember.Controller.extend({
       this.get('flashMessages').clearMessages();
       this.transitionToRoute('loading').then(() => {
         session.authenticate(authenticator, credentials).then(null, (error)=> {
+          this.transitionToRoute('login');
           this.get('flashMessages').error(error.error);
         });
       });

app/pods/protected/characteristics/show/measurements-table/component.js

@@ -5,6 +5,7 @@ export default Ember.Component.extend({
     return this.get('model.measurements.length') > 0;
   }.property('model.measurements'),
 
+  // TODO: this is way more complicated than it should be
   measurementsTable: function() {
     let measurements = this.get('model.measurements');
     let table = [];

app/pods/protected/strains/show/measurements-table-row/component.js

@@ -0,0 +1,20 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend({
+  tagName: 'tr',
+  isEditing: false,
+
+  actions: {
+    edit: function() {
+      // The parent table fetches all of the characteristics ahead of time
+      this.set('characteristics', this.store.peekAll('characteristic'));
+      this.toggleProperty('isEditing');
+    },
+
+    save: function() {
+      this.toggleProperty('isEditing');
+      this.get('row').save();
+    },
+    
+  },
+});

app/pods/protected/strains/show/measurements-table-row/template.hbs

@@ -0,0 +1,43 @@
+{{#if isEditing}}
+  <td>
+    {{
+      select-2
+      multiple=false
+      content=characteristics
+      value=row.characteristic
+      optionLabelPath="characteristicName"
+    }}
+  </td>
+  <td>
+    {{input value=row.value}}
+  </td>
+  <td>
+    {{input value=row.notes}}
+  </td>
+  {{#if canEdit}}
+    <td>
+      <button class="button-red smaller" {{action 'save'}}>
+        Save
+      </button>
+    </td>
+  {{/if}}
+{{else}}
+  <td>
+    {{#link-to 'protected.characteristics.show' row.characteristic.id}}
+      {{{row.characteristic.characteristicName}}}
+    {{/link-to}}
+  </td>
+  <td>
+    {{row.value}}
+  </td>
+  <td>
+    {{row.notes}}
+  </td>
+  {{#if canEdit}}
+    <td>
+      <button class="button-gray smaller" {{action 'edit'}}>
+        Edit
+      </button>
+    </td>
+  {{/if}}
+{{/if}}

app/pods/protected/strains/show/measurements-table/component.js

@@ -5,21 +5,13 @@ export default Ember.Component.extend({
     return this.get('model.measurements.length') > 0;
   }.property('model.measurements'),
 
-  measurementsTable: function() {
+  fetchCharacteristics: function() {
-    let measurements = this.get('model.measurements');
+    if (this.get('canEdit')) {
-    let table = [];
+      this.store.findAll('characteristic');
-    measurements.forEach((measurement) => {
+    }
-      let row = {};
+  }.on('didInsertElement'),
-      row['measurement'] = measurement;
+
-      row['characteristic'] = this.store.peekRecord('characteristic', measurement.get('characteristic.id'));
+  sortParams: ['characteristicTypeName', 'sortOrder', 'characteristicName'],
-      table.push(row);
+  sortedMeasurements: Ember.computed.sort('model.measurements', 'sortParams'),
-    });
-    table.sort((a, b) => {
-      let a_sort = a['characteristic'] && a['characteristic'].get('sortOrder');
-      let b_sort = b['characteristic'] && b['characteristic'].get('sortOrder');
-      return a_sort - b_sort;
-    });
-    return table;
-  }.property(),
 
 });

app/pods/protected/strains/show/measurements-table/template.hbs

@@ -1,27 +1,34 @@
 {{#if measurementsPresent}}
 <table class="flakes-table">
+  <colgroup>
+    {{#if canEdit}}
+      <col span="1" style="width:40%">
+      <col span="1" style="width:20%">
+      <col span="1" style="width:30%">
+      <col span="1" style="width:10%">
+    {{else}}
+      <col span="1" style="width:40%">
+      <col span="1" style="width:30%">
+      <col span="1" style="width:30%">
+    {{/if}}
+  </colgroup>
   <thead>
     <tr>
       <th>Characteristic</th>
       <th>Value</th>
       <th>Notes</th>
+      {{#if canEdit}}
+      <th>Edit</th>
+      {{/if}}
     </tr>
   </thead>
   <tbody>
-    {{#each measurementsTable as |row|}}
+    {{#each sortedMeasurements as |measurement|}}
-      <tr>
+      {{
-        <td>
+        protected/strains/show/measurements-table-row
-          {{#link-to 'protected.characteristics.show' row.characteristic.id}}
+        row=measurement
-            {{{row.characteristic.characteristicName}}}
+        canEdit=canEdit
-          {{/link-to}}
+      }}
-        </td>
-        <td>
-          {{row.measurement.value}}
-        </td>
-        <td>
-          {{row.measurement.notes}}
-        </td>
-      </tr>
     {{/each}}
   </tbody>
 </table>

app/pods/protected/strains/show/template.hbs

@@ -73,7 +73,11 @@
       <dl class="span-1">
         <dt>Characteristics</dt>
         <dd>
-          {{protected/strains/show/measurements-table model=model}}
+          {{
+            protected/strains/show/measurements-table
+            model=model
+            canEdit=false
+          }}
         </dd>
       </dl>
     </div>

app/pods/protected/strains/strain-form/component.js

@@ -4,6 +4,7 @@ export default Ember.Component.extend({
   actions: {
     save: function() {
       // Need to override the string id for some reason
+      // TODO: check this
       let strain = this.get('strain');
       let id = strain.get('species.id');
       strain.set('species.id', +id);

app/pods/protected/strains/strain-form/template.hbs

@@ -49,6 +49,13 @@
       </div>
     </div>
   </fieldset>
+  <div>
+    {{
+      protected/strains/show/measurements-table
+      model=strain
+      canEdit=strain.canEdit
+    }}
+  </div>
   <br>
   <a class="button-red smaller" {{action 'cancel'}}>
     Cancel

app/styles/app.css

@@ -1,3 +1,10 @@
+input[type="text"] {
+     width: 100%;
+     box-sizing: border-box;
+     -webkit-box-sizing:border-box;
+     -moz-box-sizing: border-box;
+}
+
 .ql-editor {
   font-size: 18px;
 }