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'), collectionStartTime: attr('string-null-to-empty'),
collectionEndDate: attr('string-null-to-empty'), collectionEndDate: attr('string-null-to-empty'),
collectionEndTime: attr('string-null-to-empty'), collectionEndTime: attr('string-null-to-empty'),
notes: attr('string'),
project: belongsTo('project'), project: belongsTo('project'),
studyLocation: belongsTo('study-location'), studyLocation: belongsTo('study-location'),

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

@ -92,6 +92,15 @@
</div> </div>
</div> </div>
<div class="col-md-8"> <div class="col-md-8">
<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"> <table class="table">
<caption> <caption>
Species / Count Info Species / Count Info
@ -180,7 +189,8 @@
</tbody> </tbody>
</table> </table>
</form> </form>
</div>
</div>
</div> </div>
</div> </div>
{{f.save}} {{f.cancel}} {{f.save}} {{f.cancel}}

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

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