thermokarst/ccdb-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ENH: Create collections (#38)

Browse source 
Fixes #35
This commit is contained in:
Matthew Ryan Dillon 2017-10-01 16:49:43 -07:00 • committed by GitHub
parent 09a62cf165
commit e1abc5e4cb
20 changed files with 260 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/collection.js
View file

@ -4,7 +4,7 @@ import DS from 'ember-data';
const { computed } = Ember;
const { Model, attr, belongsTo } = DS;
export default Model.extend({
export const schema = {
displayName: attr('string'),
numberOfTraps: attr('number'),
collectionStartDate: attr('string-null-to-empty'),
@ -16,7 +16,9 @@ export default Model.extend({
studyLocation: belongsTo('study-location'),
collectionMethod: belongsTo('collection-method'),
collectionType: belongsTo('collection-type'),
};
export default Model.extend(Object.assign({}, schema, {
startDateTime: computed('collectionStartDate', 'collectionStartTime',
function() { return this._mergeDateTime('Start'); }),
@ -28,4 +30,4 @@ export default Model.extend({
const time = this.get(`collection${timepoint}Time`);
return `${date} ${time}`.trim();
},
});
}));