Roughing in measurements again

This commit is contained in:
Matthew Dillon 2015-06-05 15:48:15 -08:00
parent 6f50a381fc
commit 878e8d1b60
12 changed files with 127 additions and 20 deletions

View file

@ -3,8 +3,8 @@ import DS from 'ember-data';
export default DS.Model.extend({
characteristicName: DS.attr('string'),
characteristicType: DS.attr('string'),
strains: DS.hasMany('strain'),
measurements: DS.hasMany('measurements'),
strains: DS.hasMany('strain', { async: true }),
measurements: DS.hasMany('measurements', { async: true }),
createdAt: DS.attr('date'),
updatedAt: DS.attr('date'),
deletedAt: DS.attr('date'),

View file

@ -2,8 +2,8 @@ import DS from 'ember-data';
import Ember from 'ember';
export default DS.Model.extend({
strain: DS.belongsTo('strain'),
characteristic: DS.attr('string'),
strain: DS.belongsTo('strain', { async: true }),
characteristic: DS.belongsTo('characteristic', { async: true }),
textMeasurementType: DS.attr('string'),
txtValue: DS.attr('string'),
numValue: DS.attr('number'),