From 60eadf517f8d2e69d0391183f466f76aa0df23b3 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <matthewrdillon@gmail.com>
Date: Fri, 1 Dec 2017 11:55:35 -0700
Subject: [PATCH] ENH: Revised collection details (#54)

---
 app/components/collection/detail-container.js | 10 +++-
 .../collection/detail-container.hbs           | 57 +++++++++++++++++--
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/app/components/collection/detail-container.js b/app/components/collection/detail-container.js
index cc64a09..84afb77 100644
--- a/app/components/collection/detail-container.js
+++ b/app/components/collection/detail-container.js
@@ -6,10 +6,9 @@ export default Component.extend({
   // ARGS
   model: null,
 
-  columns: [
+  mainColumns: [
     { label: 'Project', valuePath: 'project.name', },
     { label: 'IACUC', valuePath: 'project.iacucNumber', },
-    { label: 'Species', valuePath: 'speciesAndCounts', },
     { label: 'Region', valuePath: 'studyLocation.site.region.name', },
     { label: 'Site', valuePath: 'studyLocation.site.name', },
     { label: 'Study Location', valuePath: 'studyLocation.code', },
@@ -20,4 +19,11 @@ export default Component.extend({
     { label: 'End', valuePath: 'endDateTime', },
     { label: 'ADFG Permit', valuePath: 'adfgPermit.name', },
   ],
+
+  collectionSpeciesColumns: [
+    { label: 'Species', valuePath: 'species.commonName' },
+    { label: 'Count', valuePath: 'count' },
+    { label: 'Count Estimated?', valuePath: 'countEstimated' },
+    { label: 'Sex', valuePath: 'sex' },
+  ],
 });
diff --git a/app/templates/components/collection/detail-container.hbs b/app/templates/components/collection/detail-container.hbs
index 7161918..5556e18 100644
--- a/app/templates/components/collection/detail-container.hbs
+++ b/app/templates/components/collection/detail-container.hbs
@@ -5,9 +5,54 @@
   onClick=(action editCollection)
 }}
 
-{{#ccdb-table model=model columns=columns as |c|}}
-  {{#c.grid as |g|}}
-    {{g.head}}
-    {{g.body}}
-  {{/c.grid}}
-{{/ccdb-table}}
+<h3>Main Detail</h3>
+<div class="row">
+  <div class="col-md-12">
+    {{#ccdb-table model=model columns=mainColumns as |c|}}
+      {{#c.grid as |g|}}
+        {{g.head}}
+        {{g.body}}
+      {{/c.grid}}
+    {{/ccdb-table}}
+  </div>
+</div>
+
+<hr>
+
+<h3>Species/Counts</h3>
+<div class="row">
+  <div class="col-md-12">
+    {{#ccdb-table model=model.[0].collectionSpecies columns=collectionSpeciesColumns 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">
+    <ul>
+      <li>PLACEHOLDER</li>
+      <li>PLACEHOLDER</li>
+      <li>PLACEHOLDER</li>
+    </ul>
+  </div>
+</div>
+
+<hr>
+
+<h3>Attachments</h3>
+<div class="row">
+  <div class="col-md-12">
+    <ul>
+      {{#each model.[0].datasheets as |d|}}
+        <li><a href="{{ d.datasheet }}">{{ d.datasheet }}</a></li>
+      {{/each}}
+    </ul>
+  </div>
+</div>