From 9e9f4b37c3efd969d6d9f73dad19b78e4c62d134 Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Fri, 28 Aug 2020 12:20:44 +0100 Subject: started adding new content to org detail page - ess service --- .../caf/templates/caf/applicablesystem_detail.html | 39 +++++++++++++--------- .../organisations/organisation_detail.html | 27 +++++++++++++++ 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/ctrack/caf/templates/caf/applicablesystem_detail.html b/ctrack/caf/templates/caf/applicablesystem_detail.html index 9e12043..b8467b0 100644 --- a/ctrack/caf/templates/caf/applicablesystem_detail.html +++ b/ctrack/caf/templates/caf/applicablesystem_detail.html @@ -5,24 +5,31 @@ {% block title %}{{ object.name }}{% endblock %} {% block content %} -
-
-
+
-

{{ object.name }}

+
+
+

{{ object.name }}

+
+
+
{{ object.caf.organisation }}
+
+
+
Function
+
+
+

{{ object.function }}

+

Supports Essential Services:

+
+
+
    + {% for s in object.essentialservice_set.all %} +
  • {{ s.name }}
  • + {% endfor %} +
+
+
-
-
{{ object.caf.organisation }}
-
-
-
Function
-
-
-

{{ object.function }}

-

Contained within CAF: {{ object.caf }}

-
-
-
{% endblock %} 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 @@
+ +
+
+
+
+
Essential Services
+
+ + {% if applicable_systems|length > 0 %} + {% for es in essential_services %} + + + + + {% endfor %} + {% else %} +

button to create new one here

+ {% endif %} +
{{ es.name }}{{ es.description }}
+ | Edit System +
+
+
+
+
+
+
-- cgit v1.2.3