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

BUG: collection measurement date/time field issues (#83)

Browse source
This commit is contained in:
Matthew Ryan Dillon 2018-04-10 06:23:25 -07:00 • committed by GitHub
parent d2c485af88
commit 234dc3a34c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/collection-measurement.js
View file

@ -3,7 +3,7 @@ import DS from 'ember-data';
const { Model, attr, belongsTo } = DS; const { Model, attr, belongsTo } = DS;
export default Model.extend({ export default Model.extend({
dateMeasured: attr('string'), dateMeasured: attr('ccdb-date'),
timeMeasured: attr('string'), timeMeasured: attr('string'),
waterTempC: attr('number'), waterTempC: attr('number'),
airTempC: attr('number'), airTempC: attr('number'),

2
app/models/collection.js
View file

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

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

@ -206,7 +206,15 @@
<tr class="form"> <tr class="form">
<td class="col-md-3"> <td class="col-md-3">
{{#validated-field property='dateMeasured' changeset=cm.changeset}} {{#validated-field property='dateMeasured' changeset=cm.changeset}}
{{input value=cm.changeset.dateMeasured type='date' class='form-control'}} {{
pikaday-input
onSelection=(action (mut cm.changeset.dateMeasured))
value=cm.changeset.dateMeasured
useUTC=true
placeholder='MM/DD/YYYY'
format='MM/DD/YYYY'
class='form-control'
}}
{{/validated-field}} {{/validated-field}}
</td> </td>
<td class="col-md-3"> <td class="col-md-3">