From 0b1c397af82abd41e4379bd1f1eab490fe22db38 Mon Sep 17 00:00:00 2001
From: Matthew Lemon <matt@matthewlemon.com>
Date: Thu, 27 Aug 2020 15:24:15 +0100
Subject: further work trying to get user views working

---
 .../templates/organisations/organisation_detail.html         | 12 +-----------
 1 file changed, 1 insertion(+), 11 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 8c9ac3b..0e981b9 100644
--- a/ctrack/organisations/templates/organisations/organisation_detail.html
+++ b/ctrack/organisations/templates/organisations/organisation_detail.html
@@ -99,17 +99,7 @@
         <div class="col-md-12 my-2">
             <div class="card bg-light">
               <div class="card-body">
-                <div class="card-title">OES Engagements<a href="{% url "register:create" %}" class="btn btn-primary btn-sm float-right">Add
-            new...</a></div>
-                  <div class="table table-responsive">
-                    <table class="table">
-                      {% 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 %}
+                <div class="card-title">OES Engagements<a href="{% url "register:create" %}" class="btn btn-primary btn-sm float-right">Add new...</a></div> <div class="table table-responsive"> <table class="table"> {% 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 %}
                       {% else %}
                         <a class="btn btn-primary" href="{% url "register:create" %}" role="button">Add
                           new...</a>
-- 
cgit v1.2.3


From 3913f7ead10b6f98c3f9b4e5882336f75b6f1576 Mon Sep 17 00:00:00 2001
From: Matthew Lemon <matt@matthewlemon.com>
Date: Fri, 28 Aug 2020 11:25:10 +0100
Subject: fixed some more view bugs related to db redesign

---
 ctrack/organisations/templates/organisations/organisation_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ctrack/organisations/templates')

diff --git a/ctrack/organisations/templates/organisations/organisation_detail.html b/ctrack/organisations/templates/organisations/organisation_detail.html
index 0e981b9..9ece192 100644
--- a/ctrack/organisations/templates/organisations/organisation_detail.html
+++ b/ctrack/organisations/templates/organisations/organisation_detail.html
@@ -79,7 +79,7 @@
                           <tr>
                             <td><a href="{% url "caf:ass_detail" ass.id %}">{{ ass.name }}</a></td>
                             <td>{{ ass.function }}<br>
-                              <a href="{% url "caf:detail" ass.caf.pk %}" class="small">
+                              <a href="{% url "caf:detail" ass.pk %}" class="small">
                                 {{ ass.caf }}
                               </a> <span class="text-muted"> | <a href="#" class="small">Edit System</a></span>
                             </td>
-- 
cgit v1.2.3


From 9e9f4b37c3efd969d6d9f73dad19b78e4c62d134 Mon Sep 17 00:00:00 2001
From: Matthew Lemon <matt@matthewlemon.com>
Date: Fri, 28 Aug 2020 12:20:44 +0100
Subject: started adding new content to org detail page - ess service

---
 .../organisations/organisation_detail.html         | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'ctrack/organisations/templates')

diff --git a/ctrack/organisations/templates/organisations/organisation_detail.html b/ctrack/organisations/templates/organisations/organisation_detail.html
index 9ece192..ac73c20 100644
--- a/ctrack/organisations/templates/organisations/organisation_detail.html
+++ b/ctrack/organisations/templates/organisations/organisation_detail.html
@@ -95,6 +95,33 @@
             </div>
           </div>
       </div>
+
+      <div class="row">
+        <div class="col-md-12 my-2">
+            <div class="card bg-light">
+              <div class="card-body">
+                <div class="card-title">Essential Services</div>
+                  <div class="table table-responsive">
+                    <table class="table">
+                      {% if applicable_systems|length > 0 %}
+                        {% for es in essential_services %}
+                          <tr>
+                            <td style="width: 18%">{{ es.name }}</td>
+                            <td>{{ es.description }}<br>
+                               <span class="text-muted"> | <a href="#" class="small">Edit System</a></span>
+                            </td>
+                          </tr>
+                        {% endfor %}
+                      {% else %}
+                        <p>button to create new one here</p> 
+                      {% endif %}
+                    </table>
+                  </div>
+              </div>
+            </div>
+          </div>
+      </div>
+
       <div class="row">
         <div class="col-md-12 my-2">
             <div class="card bg-light">
-- 
cgit v1.2.3


From 055b50d7675505d60c0faa8bea900c9e553b7f2b Mon Sep 17 00:00:00 2001
From: Matthew Lemon <matt@matthewlemon.com>
Date: Fri, 28 Aug 2020 12:22:05 +0100
Subject: reordered cards

---
 .../organisations/organisation_detail.html         | 36 ++++++++++++----------
 1 file changed, 19 insertions(+), 17 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 ac73c20..a86adf1 100644
--- a/ctrack/organisations/templates/organisations/organisation_detail.html
+++ b/ctrack/organisations/templates/organisations/organisation_detail.html
@@ -65,29 +65,25 @@
             </div>
           </div>
         </div>
+
       <div class="row">
         <div class="col-md-12 my-2">
             <div class="card bg-light">
               <div class="card-body">
-                <div class="card-title">NIS Systems <a
-                  href="{% url "caf:as_create_from_org" object.slug %}" class="btn btn-primary btn-sm float-right">Add
-            new...</a></div>
+                <div class="card-title">Essential Services</div>
                   <div class="table table-responsive">
                     <table class="table">
                       {% if applicable_systems|length > 0 %}
-                        {% for ass in applicable_systems %}
+                        {% for es in essential_services %}
                           <tr>
-                            <td><a href="{% url "caf:ass_detail" ass.id %}">{{ ass.name }}</a></td>
-                            <td>{{ ass.function }}<br>
-                              <a href="{% url "caf:detail" ass.pk %}" class="small">
-                                {{ ass.caf }}
-                              </a> <span class="text-muted"> | <a href="#" class="small">Edit System</a></span>
+                            <td style="width: 18%">{{ es.name }}</td>
+                            <td>{{ es.description }}<br>
+                               <span class="text-muted"> | <a href="#" class="small">Edit System</a></span>
                             </td>
                           </tr>
                         {% endfor %}
                       {% else %}
-                        <a class="btn btn-primary" href="{% url "caf:as_create_from_org" object.slug %}" role="button">Add
-                          new...</a>
+                        <p>button to create new one here</p> 
                       {% endif %}
                     </table>
                   </div>
@@ -100,20 +96,25 @@
         <div class="col-md-12 my-2">
             <div class="card bg-light">
               <div class="card-body">
-                <div class="card-title">Essential Services</div>
+                <div class="card-title">NIS Systems <a
+                  href="{% url "caf:as_create_from_org" object.slug %}" class="btn btn-primary btn-sm float-right">Add
+            new...</a></div>
                   <div class="table table-responsive">
                     <table class="table">
                       {% if applicable_systems|length > 0 %}
-                        {% for es in essential_services %}
+                        {% for ass in applicable_systems %}
                           <tr>
-                            <td style="width: 18%">{{ es.name }}</td>
-                            <td>{{ es.description }}<br>
-                               <span class="text-muted"> | <a href="#" class="small">Edit System</a></span>
+                            <td><a href="{% url "caf:ass_detail" ass.id %}">{{ ass.name }}</a></td>
+                            <td>{{ ass.function }}<br>
+                              <a href="{% url "caf:detail" ass.pk %}" class="small">
+                                {{ ass.caf }}
+                              </a> <span class="text-muted"> | <a href="#" class="small">Edit System</a></span>
                             </td>
                           </tr>
                         {% endfor %}
                       {% else %}
-                        <p>button to create new one here</p> 
+                        <a class="btn btn-primary" href="{% url "caf:as_create_from_org" object.slug %}" role="button">Add
+                          new...</a>
                       {% endif %}
                     </table>
                   </div>
@@ -122,6 +123,7 @@
           </div>
       </div>
 
+
       <div class="row">
         <div class="col-md-12 my-2">
             <div class="card bg-light">
-- 
cgit v1.2.3