ENH: Collection environment measurement (#65)

2018-01-14 18:01:12 -07:00 · 2018-01-14 18:01:12 -07:00 · 39f4789a61
commit 39f4789a61
parent 56f8796eaf
10 changed files with 103 additions and 4 deletions
--- a/app/components/collection/detail-container.js
+++ b/app/components/collection/detail-container.js
@ -26,4 +26,11 @@ export default Component.extend({
    { label: 'Count Estimated?', valuePath: 'countEstimated' },
    { label: 'Sex', valuePath: 'sex' },
  ],
+
+  envMeasColumns: [
+    { label: 'Date Measured', valuePath: 'dateMeasured', },
+    { label: 'Time Measured', valuePath: 'timeMeasured', },
+    { label: 'Water Temp (deg C)', valuePath: 'waterTempC', },
+    { label: 'Air Temp (deg C)', valuePath: 'airTempC', },
+  ],
 });
--- a/app/controllers/collections/create.js
+++ b/app/controllers/collections/create.js
@ -1,6 +1,7 @@
 import Ember from 'ember';
 import CollectionValidations from 'ccdb-web/validations/collection';
 import CollectionSpeciesValidations from 'ccdb-web/validations/collection-species';
+import CollectionMeasurementValidations from 'ccdb-web/validations/collection-measurement';
 import DatasheetValidations from 'ccdb-web/validations/datasheet';
 import ValidationMixin from 'ccdb-web/mixins/validation';

@ -10,8 +11,9 @@ export default Controller.extend(ValidationMixin, {
  CollectionValidations,
  CollectionSpeciesValidations,
  DatasheetValidations,
+  CollectionMeasurementValidations,

-  hasMany: ['collectionSpecies', 'datasheets'],
+  hasMany: ['collectionSpecies', 'datasheets', 'envMeasurements'],

  options: computed('projectOptions', 'studyLocationOptions',
                    'collectionTypeOptions', 'collectionMethodOptions',
--- a/app/controllers/collections/detail/edit.js
+++ b/app/controllers/collections/detail/edit.js
@ -1,6 +1,7 @@
 import Ember from 'ember';
 import CollectionValidations from 'ccdb-web/validations/collection';
 import CollectionSpeciesValidations from 'ccdb-web/validations/collection-species';
+import CollectionMeasurementValidations from 'ccdb-web/validations/collection-measurement';
 import DatasheetValidations from 'ccdb-web/validations/datasheet';
 import ValidationMixin from 'ccdb-web/mixins/validation';

@ -10,8 +11,9 @@ export default Controller.extend(ValidationMixin, {
  CollectionValidations,
  CollectionSpeciesValidations,
  DatasheetValidations,
+  CollectionMeasurementValidations,

-  hasMany: ['collectionSpecies', 'datasheets'],
+  hasMany: ['collectionSpecies', 'datasheets', 'envMeasurements'],

  options: computed('projectOptions', 'studyLocationOptions',
                    'collectionTypeOptions', 'collectionMethodOptions',
--- a/app/models/collection-measurement.js
+++ b/app/models/collection-measurement.js
@ -0,0 +1,12 @@
+import DS from 'ember-data';
+
+const { Model, attr, belongsTo } = DS;
+
+export default Model.extend({
+  dateMeasured: attr('string'),
+  timeMeasured: attr('string'),
+  waterTempC:   attr('number'),
+  airTempC:     attr('number'),
+
+  collection: belongsTo('collection'),
+});
--- a/app/models/collection.js
+++ b/app/models/collection.js
@ -21,6 +21,7 @@ export default Model.extend({

  collectionSpecies: hasMany('collection-species'),
  datasheets:        hasMany('datasheet-attachment'),
+  envMeasurements:   hasMany('collection-measurement'),

  // computed
  species: computed.mapBy('collectionSpecies', 'species'),
--- a/app/routes/collections/detail.js
+++ b/app/routes/collections/detail.js
@ -6,7 +6,7 @@ export default Route.extend({
  model(params) {
    return RSVP.all([
      this.get('store').findRecord('collection', params.collection_id, {
-        include: 'collection-species,datasheets',
+        include: 'collection-species,datasheets,env-measurements',
      })
    ]);
  },
--- a/app/templates/collections/detail/edit.hbs
+++ b/app/templates/collections/detail/edit.hbs
@ -4,7 +4,8 @@
  validations=(hash
    collection=CollectionValidations
    collectionSpecies=CollectionSpeciesValidations
-    datasheet=DatasheetValidations)
+    datasheet=DatasheetValidations
+    envMeasurements=CollectionMeasurementValidations)
  options=options
  hasMany=hasMany
  onSave=(action 'onSave')
--- a/app/templates/components/collection/create-container.hbs
+++ b/app/templates/components/collection/create-container.hbs
@ -155,6 +155,54 @@
          </table>
        </div>
      </div>
+      <div class="row">
+        <div class="col-md-12">
+          <table class="table">
+            <caption>
+              Environmental Measurements
+              {{action-button isSuccess=true isXSmall=true label='+' onClick=(action 'addHasMany' 'collection-measurement' 'envMeasurements')}}
+            </caption>
+            <thead>
+              <tr>
+                <th class="col-md-3">Date Measured</th>
+                <th class="col-md-3">Time Measured</th>
+                <th class="col-md-3">Water Temperature (deg C)</th>
+                <th class="col-md-3">Air Temperature (deg C)</th>
+                <th class="col-md-1">Delete</th>
+              </tr>
+            </thead>
+            <tbody>
+              {{#each changesets.hasMany.envMeasurements as |cm|}}
+                <tr class="form">
+                  <td class="col-md-3">
+                    {{#validated-field property='dateMeasured' changeset=cm.changeset}}
+                      {{input value=cm.changeset.dateMeasured type='date' class='form-control'}}
+                    {{/validated-field}}
+                  </td>
+                  <td class="col-md-3">
+                    {{#validated-field property='timeMeasured' changeset=cm.changeset}}
+                      {{input value=cm.changeset.timeMeasured type='time' class='form-control'}}
+                    {{/validated-field}}
+                  </td>
+                  <td class="col-md-3">
+                    {{#validated-field property='waterTempC' changeset=cm.changeset}}
+                      {{input value=cm.changeset.waterTempC class='form-control'}}
+                    {{/validated-field}}
+                  </td>
+                  <td class="col-md-3">
+                    {{#validated-field property='airTempC' changeset=cm.changeset}}
+                      {{input value=cm.changeset.airTempC class='form-control'}}
+                    {{/validated-field}}
+                  </td>
+                  <td class="col-md-2">
+                    {{action-button isDanger=true isXSmall=true label='X' onClick=(action 'deleteHasMany' cm 'envMeasurements')}}
+                  </td>
+                </tr>
+              {{/each}}
+            </tbody>
+          </table>
+        </div>
+      </div>
      <div class="row">
        <div class="col-md-12">
          <form enctype="multipart/form-data">
--- a/app/templates/components/collection/detail-container.hbs
+++ b/app/templates/components/collection/detail-container.hbs
@ -33,6 +33,20 @@

 <hr>

+<h3>Environmental Measurements</h3>
+<div class="row">
+  <div class="col-md-12">
+    {{#ccdb-table model=model.[0].envMeasurements columns=envMeasColumns 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">
--- a/app/validations/collection-measurement.js
+++ b/app/validations/collection-measurement.js
@ -0,0 +1,12 @@
+import {
+  validatePresence,
+  validateNumber,
+} from 'ember-changeset-validations/validators';
+
+export default {
+  dateMeasured: validatePresence(true),
+  timeMeasured: validatePresence(true),
+  waterTemp:    validateNumber({ allowBlank: true, integer: false, positive: false }),
+  airTemp:      validateNumber({ allowBlank: true, integer: false, positive: false }),
+  collection:   validatePresence(true),
+}