From 08f0eec88576ee6940666fded3154a0dfad58d05 Mon Sep 17 00:00:00 2001
From: Jonathan Snook <jonathan@snook.ca>
Date: Mon, 8 Jun 2020 20:59:58 -0400
Subject: [PATCH] Rearranged visits list to display multiple

---
 .../reporting/encampment_detail.html          | 90 +++++++++++++++++--
 templates/base.html                           |  8 +-
 2 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/apps/reporting/templates/reporting/encampment_detail.html b/apps/reporting/templates/reporting/encampment_detail.html
index f2c601c..87bdbd3 100644
--- a/apps/reporting/templates/reporting/encampment_detail.html
+++ b/apps/reporting/templates/reporting/encampment_detail.html
@@ -33,12 +33,16 @@ <h2>{{ encampment.name }}</h2>
 
 <div class="main-panel">
     <div class="visit-panel">
+      {% if not visits %}
+      This encampment has never been visited
+      {% else %}
         {% with visits|first as most_recent %}
         {% if most_recent %}
         <div class="most-recent visits">
             <div class="visits-header">
                 Most Recent Visit
             </div>
+            <div class="visits-container">
             <div class="visits-content">
                 <div class="date-bar">
                     <div>{{ most_recent.date }}</div>
@@ -120,20 +124,21 @@ <h3>Notes / next steps</h3>
                 </div>
                 {% endif %}
             </div>
+            </div>
         </div>
         {% else %}
-        This encampment has never been visited
-        {% endif %}
+               {% endif %}
         {% endwith %}
         <br/>
         <div class="previous visits">
-            {% for visit in visits|slice:"1:" %}
-            {% if forloop.first %}
             <div class="visits-header">
                 Previous Visits
             </div>
-            {% endif %}
+            <div class="visits-container">
+            {% for visit in visits|slice:"1:" %}
             <div class="visits-content">
+              <details>
+                <summary>
                 <div class="previous-visit">
                     <div class="date">{{ visit.date }}</div>
                     <div class="spacer"></div>
@@ -141,9 +146,84 @@ <h3>Notes / next steps</h3>
                     <div class="spacer"></div>
                     <div class="performed-by">{{ visit.performed_by }}</div>
                 </div>
+                </summary>
+                <div>
+                  <div class="visit-info">
+                    <h2>Status</h2>
+                    <div class="spacer"></div>
+                    <div class="visit-detail">
+                        <h3>Type of setup</h3>
+                        <p>{{ visit.type_of_setup }}</p>
+                    </div>
+                    <div class="visit-detail">
+                        <h3>Living here</h3>
+                        <p>{{ visit.get_occupancy_display }}</p>
+                    </div>
+                    <div class="visit-detail">
+                        <h3>Talked to</h3>
+                        <p>{{ visit.talked_to }}</p>
+                    </div>
+                </div>
+                {% if visit.supplies_delivered or visit.food_delivered %}
+                <div class="visit-info">
+                    <h2>Deliveries</h2>
+                    <div class="spacer"></div>
+                    {% if visit.supplies_delivered %}
+                    <div class="visit-detail">
+                        <h3>Supplies Delivered</h3>
+                        <p>{{ visit.supplies_delivered }}</p>
+                    </div>
+                    {% endif %}
+                    {% if visit.food_delivered %}
+                    <div class="visit-detail">
+                        <h3>Food Delivered</h3>
+                        <p>{{ visit.food_delivered }}</p>
+                    </div>
+                    {% endif %}
+                </div>
+                {% endif %}
+                <div class="visit-info">
+                    <h2>Covid</h2>
+                    <div class="spacer"></div>
+                    <div class="visit-detail">
+                        <h3>Education</h3>
+                        <p>{{ visit.education_provided }}</p>
+                    </div>
+                    <div class="visit-detail">
+                        <h3>Assessed</h3>
+                        <p>{{ visit.assessed }}</p>
+                    </div>
+                    <div class="visit-detail">
+                        <h3>Asymptomatic</h3>
+                        <p>{{ visit.assessed_asymptomatic }}</p>
+                    </div>
+                </div>
+                {% if visit.needs or visit.notes %}
+                <div class="visit-info">
+                    <h2>Actions</h2>
+                    <div class="spacer"></div>
+                    {% if visit.needs %}
+                    <div class="visit-detail">
+                        <h3>Outstanding Needs</h3>
+                        <p>{{ visit.needs }}</p>
+                    </div>
+                    {% endif %}
+                    {% if visit.notes %}
+                    <div class="visit-detail">
+                        <h3>Notes / next steps</h3>
+                        <p>{{ visit.notes }}</p>
+                    </div>
+                    {% endif %}
+                </div>
+                {% endif %}
+
+                </div>
             </div>
+              </details>
             {% endfor %}
+            </div>
         </div>
+  {% endif %}
     </div>
     <!-- end visits panel -->
 
diff --git a/templates/base.html b/templates/base.html
index da28573..3f5ecf9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -695,9 +695,15 @@
   }
 
   .previous-visit {
-    display: flex;
+    display: inline-flex;
   }
 
+  summary:focus {
+    outline: none;
+    color: #063;
+  }
+
+
   .visits-content {
     width: 100%;
   }