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

ENH: Revised collection details (#54)

Browse source
This commit is contained in:
Matthew Ryan Dillon 2017-12-01 11:55:35 -07:00 • committed by GitHub
parent 4903a204e4
commit 60eadf517f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/components/collection/detail-container.js
View file

@ -6,10 +6,9 @@ export default Component.extend({
// ARGS // ARGS
model: null, model: null,
columns: [ mainColumns: [
{ label: 'Project', valuePath: 'project.name', }, { label: 'Project', valuePath: 'project.name', },
{ label: 'IACUC', valuePath: 'project.iacucNumber', }, { label: 'IACUC', valuePath: 'project.iacucNumber', },
{ label: 'Species', valuePath: 'speciesAndCounts', },
{ label: 'Region', valuePath: 'studyLocation.site.region.name', }, { label: 'Region', valuePath: 'studyLocation.site.region.name', },
{ label: 'Site', valuePath: 'studyLocation.site.name', }, { label: 'Site', valuePath: 'studyLocation.site.name', },
{ label: 'Study Location', valuePath: 'studyLocation.code', }, { label: 'Study Location', valuePath: 'studyLocation.code', },
@ -20,4 +19,11 @@ export default Component.extend({
{ label: 'End', valuePath: 'endDateTime', }, { label: 'End', valuePath: 'endDateTime', },
{ label: 'ADFG Permit', valuePath: 'adfgPermit.name', }, { label: 'ADFG Permit', valuePath: 'adfgPermit.name', },
], ],
collectionSpeciesColumns: [
{ label: 'Species', valuePath: 'species.commonName' },
{ label: 'Count', valuePath: 'count' },
{ label: 'Count Estimated?', valuePath: 'countEstimated' },
{ label: 'Sex', valuePath: 'sex' },
],
}); });

47
app/templates/components/collection/detail-container.hbs
View file

@ -5,9 +5,54 @@
onClick=(action editCollection) onClick=(action editCollection)
}} }}
{{#ccdb-table model=model columns=columns as |c|}} <h3>Main Detail</h3>
<div class="row">
<div class="col-md-12">
{{#ccdb-table model=model columns=mainColumns as |c|}}
{{#c.grid as |g|}} {{#c.grid as |g|}}
{{g.head}} {{g.head}}
{{g.body}} {{g.body}}
{{/c.grid}} {{/c.grid}}
{{/ccdb-table}} {{/ccdb-table}}
</div>
</div>
<hr>
<h3>Species/Counts</h3>
<div class="row">
<div class="col-md-12">
{{#ccdb-table model=model.[0].collectionSpecies columns=collectionSpeciesColumns as |c|}}
{{#c.grid as |g|}}
{{g.head}}
{{g.body}}
{{/c.grid}}
{{/ccdb-table}}
</div>
</div>
<hr>
<h3>Notes</h3>
<div class="row">
<div class="col-md-12">
<ul>
<li>PLACEHOLDER</li>
<li>PLACEHOLDER</li>
<li>PLACEHOLDER</li>
</ul>
</div>
</div>
<hr>
<h3>Attachments</h3>
<div class="row">
<div class="col-md-12">
<ul>
{{#each model.[0].datasheets as |d|}}
<li><a href="{{ d.datasheet }}">{{ d.datasheet }}</a></li>
{{/each}}
</ul>
</div>
</div>