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

ENH: IACUC and ADFG Permits (and search reset) (#43)

Browse source 
Fixes #30
This commit is contained in:
Matthew Ryan Dillon 2017-11-14 08:30:12 -07:00 • committed by GitHub
parent 17651e071e
commit 93d70d3c95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 85 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/routes/collections/index.js
View file

@ -14,12 +14,13 @@ export default Route.extend({
number_of_traps: { refreshModel: true },
collection_start_date: { refreshModel: true },
collection_end_date: { refreshModel: true },
adfg_permit: { refreshModel: true },
},
model(params) {
const store = this.get('store');
const opts = {
include: 'project,study-location,study-location.site,site,collection-method',
include: 'project,study-location,study-location.site,site,collection-method,adfg-permit',
};
return RSVP.hash({
@ -28,6 +29,7 @@ export default Route.extend({
siteOptions: store.findAll('site'),
studyLocationOptions: store.findAll('study-location'),
collectionMethodOptions: store.findAll('collection-method'),
adfgPermitOptions: store.findAll('adfg-permit'),
model: store.query('collection', Object.assign(params, opts)),
});
},
@ -53,6 +55,9 @@ export default Route.extend({
let collectionMethod = controller.get('collection_method');
collectionMethod = collectionMethod.map(id => store.peekRecord('collection-method', id));
let adfgPermit = controller.get('adfg_permit');
adfgPermit = adfgPermit.map(id => store.peekRecord('adfg-permit', id));
const numberOfTraps = controller.get('number_of_traps');
const collectionStartDate = controller.get('collection_start_date');
const collectionEndDate = controller.get('collection_end_date');
@ -66,6 +71,7 @@ export default Route.extend({
number_of_traps: numberOfTraps,
collection_start_date: collectionStartDate,
collection_end_date: collectionEndDate,
adfg_permit: adfgPermit,
}
controller.set('filters', filter);
},