Drop characteristic types

This commit is contained in:
Matthew Dillon 2015-07-13 08:27:03 -08:00
parent 99c94e9c7b
commit ea77042b19
6 changed files with 16 additions and 34 deletions

View file

@ -1,13 +0,0 @@
import DS from 'ember-data';
export default DS.Model.extend({
characteristicTypeName: DS.attr('string'),
characteristics: DS.hasMany('characteristic', { async: true }),
createdAt: DS.attr('date'),
updatedAt: DS.attr('date'),
deletedAt: DS.attr('date'),
createdBy: DS.attr('number'),
updatedBy: DS.attr('number'),
deletedBy: DS.attr('number'),
sortOrder: DS.attr('number'),
});

View file

@ -1,15 +1,15 @@
import DS from 'ember-data';
export default DS.Model.extend({
characteristicName: DS.attr('string'),
characteristicType: DS.belongsTo('characteristicType', { async: true }),
strains : DS.hasMany('strain', { async: true }),
measurements : DS.hasMany('measurements', { async: true }),
createdAt : DS.attr('date'),
updatedAt : DS.attr('date'),
deletedAt : DS.attr('date'),
createdBy : DS.attr('number'),
updatedBy : DS.attr('number'),
deletedBy : DS.attr('number'),
sortOrder : DS.attr('number'),
characteristicName : DS.attr('string'),
characteristicTypeName: DS.attr('string'),
strains : DS.hasMany('strain', { async: true }),
measurements : DS.hasMany('measurements', { async: true }),
createdAt : DS.attr('date'),
updatedAt : DS.attr('date'),
deletedAt : DS.attr('date'),
createdBy : DS.attr('number'),
updatedBy : DS.attr('number'),
deletedBy : DS.attr('number'),
sortOrder : DS.attr('number'),
});