diff --git a/app/models/measurement.js b/app/models/measurement.js
index 80b6136..41a7644 100644
--- a/app/models/measurement.js
+++ b/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'),
- txtValue : DS.attr('string'),
- numValue : DS.attr('number'),
+ value : DS.attr('string'),
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'),
});
diff --git a/app/pods/application/loading/template.hbs b/app/pods/application/loading/template.hbs
new file mode 100644
index 0000000..e5a3e05
--- /dev/null
+++ b/app/pods/application/loading/template.hbs
@@ -0,0 +1 @@
+{{loading-panel}}
diff --git a/app/pods/login/controller.js b/app/pods/login/controller.js
index fed3485..496efda 100644
--- a/app/pods/login/controller.js
+++ b/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);
});
});
diff --git a/app/pods/protected/characteristics/show/measurements-table/component.js b/app/pods/protected/characteristics/show/measurements-table/component.js
index 63d3165..00d5dd4 100644
--- a/app/pods/protected/characteristics/show/measurements-table/component.js
+++ b/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 = [];
diff --git a/app/pods/protected/strains/show/measurements-table-row/component.js b/app/pods/protected/strains/show/measurements-table-row/component.js
new file mode 100644
index 0000000..252e6e3
--- /dev/null
+++ b/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();
+ },
+
+ },
+});
diff --git a/app/pods/protected/strains/show/measurements-table-row/template.hbs b/app/pods/protected/strains/show/measurements-table-row/template.hbs
new file mode 100644
index 0000000..bdf8566
--- /dev/null
+++ b/app/pods/protected/strains/show/measurements-table-row/template.hbs
@@ -0,0 +1,43 @@
+{{#if isEditing}}
+ |
+ {{
+ select-2
+ multiple=false
+ content=characteristics
+ value=row.characteristic
+ optionLabelPath="characteristicName"
+ }}
+ |
+
+ {{input value=row.value}}
+ |
+
+ {{input value=row.notes}}
+ |
+ {{#if canEdit}}
+
+
+ |
+ {{/if}}
+{{else}}
+
+ {{#link-to 'protected.characteristics.show' row.characteristic.id}}
+ {{{row.characteristic.characteristicName}}}
+ {{/link-to}}
+ |
+
+ {{row.value}}
+ |
+
+ {{row.notes}}
+ |
+ {{#if canEdit}}
+
+
+ |
+ {{/if}}
+{{/if}}
diff --git a/app/pods/protected/strains/show/measurements-table/component.js b/app/pods/protected/strains/show/measurements-table/component.js
index bddc5d1..af846d0 100644
--- a/app/pods/protected/strains/show/measurements-table/component.js
+++ b/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() {
- let measurements = this.get('model.measurements');
- let table = [];
- measurements.forEach((measurement) => {
- let row = {};
- row['measurement'] = measurement;
- row['characteristic'] = this.store.peekRecord('characteristic', measurement.get('characteristic.id'));
- table.push(row);
- });
- 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(),
+ fetchCharacteristics: function() {
+ if (this.get('canEdit')) {
+ this.store.findAll('characteristic');
+ }
+ }.on('didInsertElement'),
+
+ sortParams: ['characteristicTypeName', 'sortOrder', 'characteristicName'],
+ sortedMeasurements: Ember.computed.sort('model.measurements', 'sortParams'),
});
diff --git a/app/pods/protected/strains/show/measurements-table/template.hbs b/app/pods/protected/strains/show/measurements-table/template.hbs
index 188ac47..3f14ca7 100644
--- a/app/pods/protected/strains/show/measurements-table/template.hbs
+++ b/app/pods/protected/strains/show/measurements-table/template.hbs
@@ -1,27 +1,34 @@
{{#if measurementsPresent}}
+
+ {{#if canEdit}}
+
+
+
+
+ {{else}}
+
+
+
+ {{/if}}
+
| Characteristic |
Value |
Notes |
+ {{#if canEdit}}
+ Edit |
+ {{/if}}
- {{#each measurementsTable as |row|}}
-
- |
- {{#link-to 'protected.characteristics.show' row.characteristic.id}}
- {{{row.characteristic.characteristicName}}}
- {{/link-to}}
- |
-
- {{row.measurement.value}}
- |
-
- {{row.measurement.notes}}
- |
-
+ {{#each sortedMeasurements as |measurement|}}
+ {{
+ protected/strains/show/measurements-table-row
+ row=measurement
+ canEdit=canEdit
+ }}
{{/each}}
diff --git a/app/pods/protected/strains/show/template.hbs b/app/pods/protected/strains/show/template.hbs
index cf07781..dbe09fe 100644
--- a/app/pods/protected/strains/show/template.hbs
+++ b/app/pods/protected/strains/show/template.hbs
@@ -73,7 +73,11 @@
- Characteristics
-
- {{protected/strains/show/measurements-table model=model}}
+ {{
+ protected/strains/show/measurements-table
+ model=model
+ canEdit=false
+ }}
diff --git a/app/pods/protected/strains/strain-form/component.js b/app/pods/protected/strains/strain-form/component.js
index 3888156..0c96de3 100644
--- a/app/pods/protected/strains/strain-form/component.js
+++ b/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);
diff --git a/app/pods/protected/strains/strain-form/template.hbs b/app/pods/protected/strains/strain-form/template.hbs
index 79acd02..8260411 100644
--- a/app/pods/protected/strains/strain-form/template.hbs
+++ b/app/pods/protected/strains/strain-form/template.hbs
@@ -49,6 +49,13 @@
+
+ {{
+ protected/strains/show/measurements-table
+ model=strain
+ canEdit=strain.canEdit
+ }}
+
Cancel
diff --git a/app/styles/app.css b/app/styles/app.css
index 332f3c8..4116537 100644
--- a/app/styles/app.css
+++ b/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;
}