From cf4ee94db89e697d625106e78831b7e219cd8c03 Mon Sep 17 00:00:00 2001
From: Matthew Lemon <lemon@matthewlemon.com>
Date: Tue, 29 Sep 2020 12:02:36 +0100
Subject: OES engagements on org detail page improved with dates

---
 .../organisations/organisation_detail.html         | 43 +++++++++++++++++-----
 1 file changed, 34 insertions(+), 9 deletions(-)

(limited to 'ctrack/organisations/templates')

diff --git a/ctrack/organisations/templates/organisations/organisation_detail.html b/ctrack/organisations/templates/organisations/organisation_detail.html
index c02f0ee..4af5d6f 100644
--- a/ctrack/organisations/templates/organisations/organisation_detail.html
+++ b/ctrack/organisations/templates/organisations/organisation_detail.html
@@ -19,7 +19,7 @@
           </div>
         </div>
 
-      <div class="row" id="top-row">
+        <div class="row" id="top-row">
 
           <div class="col-md-6">
             <div class="card bg-light">
@@ -91,7 +91,7 @@
                     </table>
                   </div>
                 </div>
-            </div>
+              </div>
             </div>
 
             <div class="row pb-2">
@@ -130,7 +130,6 @@
         </div>
 
 
-
         <div class="row">
           <div class="col-md-12 my-2">
             <div class="card bg-light">
@@ -205,12 +204,38 @@
                                                                                      class="btn btn-outline-primary btn-sm float-right">Add
                   new...</a></div>
                 <div class="table table-responsive">
-                  <table class="table table-bordered">
-                    {% if engagement_events|length > 0 %}{% for event in engagement_events %}
-                      <tr>
-                        <td><a href="#">{{ event.type }}</a></td>
-                        <td>{{ event.short_description }}</td>
-                      </tr> {% endfor %}
+                  <table class="table table-sm table-bordered">
+                    <thead>
+                    <tr>
+                      <th>Date</th>
+                      <th>Type</th>
+                      <th>Description</th>
+                      <th>Response Requested</th>
+                      <th>Response Due</th>
+                    </tr>
+                    </thead>
+                    {% if engagement_events|length > 0 %}
+                      {% for event in engagement_events %}
+                        <tr>
+                          <td>{{ event.date |date:"D d M Y H:i" }}</td>
+                          <td><a href="#">{{ event.type }}</a></td>
+                          <td>{{ event.short_description }}</td>
+                          {% if event.response_date_requested %}
+                            <td style="color: {{ event.days_to_response_due.descriptor }}">{{ event.response_date_requested |date:"D d M Y" }}</td>
+                          {% else %}
+                            <td>NA</td>
+                          {% endif %}
+                          {% if event.response_received %}
+                            <td>{{ event.response_received | date:"D d M Y" }}</td>
+                          {% else %}
+                            {% if event.response_date_requested %}
+                              <td style="color: {{ event.days_to_response_due.descriptor }};">{{ event.days_to_response_due.days}} {{ event.days_to_response_due.day_str }}</td>
+                            {% else %}
+                              <td>NA</td>
+                            {% endif %}
+                          {% endif %}
+                        </tr>
+                      {% endfor %}
                     {% else %}
                       <a class="btn btn-outline-primary btn-sm" href="{% url "register:create" %}" role="button">Add
                         new...</a>
-- 
cgit v1.2.3