From a4264ac16c321a904ddbd660660baeb8ecec9a46 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <matthewrdillon@gmail.com>
Date: Mon, 4 Dec 2017 21:21:19 -0700
Subject: [PATCH] ENH: Add collection notes (#60)

Fixes #32
---
 app/models/collection.js                      |   1 +
 .../collection/create-container.hbs           | 188 +++++++++---------
 .../collection/detail-container.hbs           |   6 +-
 3 files changed, 101 insertions(+), 94 deletions(-)

diff --git a/app/models/collection.js b/app/models/collection.js
index 4056cd3..e8cc45a 100644
--- a/app/models/collection.js
+++ b/app/models/collection.js
@@ -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'),
diff --git a/app/templates/components/collection/create-container.hbs b/app/templates/components/collection/create-container.hbs
index 48d4f3c..9933bfe 100644
--- a/app/templates/components/collection/create-container.hbs
+++ b/app/templates/components/collection/create-container.hbs
@@ -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}}
diff --git a/app/templates/components/collection/detail-container.hbs b/app/templates/components/collection/detail-container.hbs
index 5556e18..23f66aa 100644
--- a/app/templates/components/collection/detail-container.hbs
+++ b/app/templates/components/collection/detail-container.hbs
@@ -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>