diff --git a/app/models/characteristic.js b/app/models/characteristic.js new file mode 100644 index 0000000..b8ef634 --- /dev/null +++ b/app/models/characteristic.js @@ -0,0 +1,11 @@ +import DS from 'ember-data'; +import Ember from 'ember'; + +export default DS.Model.extend({ + characteristicName: DS.attr(), + characteristicTypeId: DS.attr(), + measurements: DS.hasMany('measurement', {async: true}), + createdAt: DS.attr('date'), + updatedAt: DS.attr('date'), + deletedAt: DS.attr('date') +}); diff --git a/app/models/measurement.js b/app/models/measurement.js index 05d8b90..00ef030 100644 --- a/app/models/measurement.js +++ b/app/models/measurement.js @@ -10,6 +10,7 @@ export default DS.Model.extend({ notes: DS.attr(), testMethodId: DS.attr(), strain: DS.belongsTo('strain', {async: true}), + characteristic: DS.belongsTo('characteristic', {async: true}), createdAt: DS.attr('date'), updatedAt: DS.attr('date') }); diff --git a/app/templates/strain.hbs b/app/templates/strain.hbs index ed914a4..c902592 100644 --- a/app/templates/strain.hbs +++ b/app/templates/strain.hbs @@ -55,17 +55,13 @@