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

ENH: Add collection notes (#60)

Browse source 
Fixes #32
This commit is contained in:
Matthew Ryan Dillon 2017-12-04 21:21:19 -07:00 • committed by GitHub
parent 4dbfcfa98b
commit a4264ac16c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 101 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/collection.js
View file

@ -11,6 +11,7 @@ export default Model.extend({
collectionStartTime: attr('string-null-to-empty'),
collectionEndDate: attr('string-null-to-empty'),
collectionEndTime: attr('string-null-to-empty'),
notes: attr('string'),
project: belongsTo('project'),
studyLocation: belongsTo('study-location'),

188
app/templates/components/collection/create-container.hbs
View file

@ -92,95 +92,105 @@
</div>
</div>
<div class="col-md-8">
<table class="table">
<caption>
Species / Count Info
{{action-button isSuccess=true isXSmall=true label='+' onClick=(action 'addHasMany' 'collection-species' 'collectionSpecies')}}
</caption>
<thead>
<tr>
<th class="col-md-3">Species</th>
<th class="col-md-3">Count</th>
<th class="col-md-3">Count Estimated</th>
<th class="col-md-3">Sex</th>
<th class="col-md-1">Delete</th>
</tr>
</thead>
<tbody>
{{#each changesets.hasMany.collectionSpecies as |cs|}}
<tr class="form">
<td class="col-md-3">
{{#validated-field property='species' changeset=cs.changeset}}
{{#power-select
options=options.species
selected=cs.changeset.species
onchange=(action (mut cs.changeset.species))
searchField='commonName'
as |species|
}}
{{species.commonName}}
{{/power-select}}
{{/validated-field}}
</td>
<td class="col-md-3">
{{#validated-field property='count' changeset=cs.changeset}}
{{input value=cs.changeset.count}}
{{/validated-field}}
</td>
<td class="col-md-3">
{{#validated-field property='countEstimated' changeset=cs.changeset}}
{{input checked=cs.changeset.countEstimated type='checkbox'}}
{{/validated-field}}
</td>
<td class="col-md-3">
{{#validated-field property='sex' changeset=cs.changeset}}
{{input value=cs.changeset.sex}}
{{/validated-field}}
</td>
<td class="col-md-2">
{{action-button isDanger=true isXSmall=true label='X' onClick=(action 'deleteHasMany' cs 'collectionSpecies')}}
</td>
</tr>
{{/each}}
</tbody>
</table>
</div>
</div>
<div class="row">
<div class="col-md-12">
<form enctype="multipart/form-data">
<table class="table">
<caption>
Attachments
{{action-button isSuccess=true isXSmall=true label='+' onClick=(action 'addHasMany' 'datasheet-attachment' 'datasheets')}}
</caption>
<thead>
<tr>
<th>File</th>
<th>Delete</th>
</tr>
</thead>
<tbody>
{{#each changesets.hasMany.datasheets as |d|}}
<tr class="form">
<td>
{{#if d.model.isNew}}
{{#validated-field property='datasheet' changeset=d.changeset}}
<input type="file" onchange={{action 'updateDatasheet' d.changeset}} accept="image/png,image/jpeg,application/pdf">
{{/validated-field}}
{{else}}
<a href="{{ d.model.datasheet }}">{{ d.model.datasheet }}</a>
{{/if}}
</td>
<td>
{{action-button isDanger=true isXSmall=true label='X' onClick=(action 'deleteHasMany' d 'datasheets')}}
</td>
</tr>
{{/each}}
</tbody>
</table>
</form>
<div class="row">
<div class="col-md-12">
{{#validated-field property='notes' label='Notes' changeset=changesets.model}}
{{textarea value=changesets.model.notes class='form-control'}}
{{/validated-field}}
</div>
</div>
<div class="row">
<div class="col-md-12">
<table class="table">
<caption>
Species / Count Info
{{action-button isSuccess=true isXSmall=true label='+' onClick=(action 'addHasMany' 'collection-species' 'collectionSpecies')}}
</caption>
<thead>
<tr>
<th class="col-md-3">Species</th>
<th class="col-md-3">Count</th>
<th class="col-md-3">Count Estimated</th>
<th class="col-md-3">Sex</th>
<th class="col-md-1">Delete</th>
</tr>
</thead>
<tbody>
{{#each changesets.hasMany.collectionSpecies as |cs|}}
<tr class="form">
<td class="col-md-3">
{{#validated-field property='species' changeset=cs.changeset}}
{{#power-select
options=options.species
selected=cs.changeset.species
onchange=(action (mut cs.changeset.species))
searchField='commonName'
as |species|
}}
{{species.commonName}}
{{/power-select}}
{{/validated-field}}
</td>
<td class="col-md-3">
{{#validated-field property='count' changeset=cs.changeset}}
{{input value=cs.changeset.count}}
{{/validated-field}}
</td>
<td class="col-md-3">
{{#validated-field property='countEstimated' changeset=cs.changeset}}
{{input checked=cs.changeset.countEstimated type='checkbox'}}
{{/validated-field}}
</td>
<td class="col-md-3">
{{#validated-field property='sex' changeset=cs.changeset}}
{{input value=cs.changeset.sex}}
{{/validated-field}}
</td>
<td class="col-md-2">
{{action-button isDanger=true isXSmall=true label='X' onClick=(action 'deleteHasMany' cs 'collectionSpecies')}}
</td>
</tr>
{{/each}}
</tbody>
</table>
</div>
</div>
<div class="row">
<div class="col-md-12">
<form enctype="multipart/form-data">
<table class="table">
<caption>
Attachments
{{action-button isSuccess=true isXSmall=true label='+' onClick=(action 'addHasMany' 'datasheet-attachment' 'datasheets')}}
</caption>
<thead>
<tr>
<th>File</th>
<th>Delete</th>
</tr>
</thead>
<tbody>
{{#each changesets.hasMany.datasheets as |d|}}
<tr class="form">
<td>
{{#if d.model.isNew}}
{{#validated-field property='datasheet' changeset=d.changeset}}
<input type="file" onchange={{action 'updateDatasheet' d.changeset}} accept="image/png,image/jpeg,application/pdf">
{{/validated-field}}
{{else}}
<a href="{{ d.model.datasheet }}">{{ d.model.datasheet }}</a>
{{/if}}
</td>
<td>
{{action-button isDanger=true isXSmall=true label='X' onClick=(action 'deleteHasMany' d 'datasheets')}}
</td>
</tr>
{{/each}}
</tbody>
</table>
</form>
</div>
</div>
</div>
</div>
{{f.save}} {{f.cancel}}

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

@ -36,11 +36,7 @@
<h3>Notes</h3>
<div class="row">
<div class="col-md-12">
<ul>
<li>PLACEHOLDER</li>
<li>PLACEHOLDER</li>
<li>PLACEHOLDER</li>
</ul>
{{model.[0].notes}}
</div>
</div>