From 7aa8f20f389318003ea0008f02eada0782e2c20d Mon Sep 17 00:00:00 2001 From: MR Lemon Date: Sat, 25 Apr 2020 17:30:55 +0100 Subject: making good progress on organisation detail page --- .../organisations/organisation_detail.html | 404 ++++++++++----------- 1 file changed, 201 insertions(+), 203 deletions(-) (limited to 'ctrack') diff --git a/ctrack/organisations/templates/organisations/organisation_detail.html b/ctrack/organisations/templates/organisations/organisation_detail.html index bfbd07f..954b94e 100644 --- a/ctrack/organisations/templates/organisations/organisation_detail.html +++ b/ctrack/organisations/templates/organisations/organisation_detail.html @@ -1,145 +1,233 @@ {% extends "base.html" %} -{% block content %} -
- -
-

{{ object.name }}

-
- -
-

{{ object.submode }}

-
- -
-

Company Information

-
+{% block title %} + {{ object.name }} +{% endblock %} -
-
-
-
-
Key Information
-
-
- - - - - - - - {% if object.oes %} - - {% else %} - - {% endif %} - - - - - - - - - - - - - - - - - - - - - - -
Designation Type:{{ object.designation_type }}
OES:YesNo
Registered Company Name:{{ object.registered_company_name }}
Date Updated:{{ object.date_updated }}
Updated By:{{ object.updated_by }}
Active:{{ object.active }}
Comments:{{ object.comments }}
+{% block content %} +
+
+
+
+
+

{{ object.name }}

+
+
+
+
+
{{ object.submode }}
+
+
+
+
+
+
+
Company Information
+
+
+ + + + + + + + {% if object.oes %} + + {% else %} + + {% endif %} + + + + + + + + + + + + + + + + + + + + + +
Designation Type:{{ object.designation_type }}
OES:YesNo
Registered Company Name:{{ object.registered_company_name }}
Date Updated:{{ object.date_updated }}
Updated By:{{ object.updated_by }}
Active:{{ object.active }}
Comments:{{ object.comments }}
+
+
+
-
- -
-
- -
-

NIS Systems

-
- -
-
-
-
-
-
-
- - {% if applicable_systems|length > 1 %} - {% for ass in applicable_systems %} - - - - - {% endfor %} - {% else %} -

Add new...

- {% endif %} -
{{ ass.name }}{{ ass.description }}
- - {{ ass.caf }} - | System - Detail - | Edit System -
+
+
+
+
+
NIS Systems
+
+
+ + {% if applicable_systems|length > 1 %} + {% for ass in applicable_systems %} + + + + + {% endfor %} + {% else %} +

Add new...

+ {% endif %} +
{{ ass.name }}{{ ass.description }}
+ + {{ ass.caf }} + | System + Detail + | Edit System +
+
+
+
+
+
+

Addresses

+
+
+
+ {% if no_addr > 1 %} + {% for a in addr %} +
+
+
+
{{ a.type }}
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
{{ a.line1 }} {{ a.line2 }}
{{ a.line3 }}
{{ a.city }}
{{ a.county }}
{{ a.postcode }}
{{ a.country }}
+
Notes:
+ {{ a.other_details }} +
+
+
+
+
+
+ {% endfor %} + {% else %} +
+
+
+
{{ addr.type }}
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
{{ addr.line1 }} {{ addr.line2 }}
{{ addr.line3 }}
{{ addr.city }}
{{ addr.county }}
{{ addr.postcode }}
{{ addr.country }}
+
Notes:
+ {{ addr.other_details }} +
+
+
+
+
+
+ {% endif %} +
-
-
-

Addresses

-
+
+

People

+
-
- {% if no_addr > 1 %} - {% for a in addr %} +
+ {% for p in people %}
-
{{ a.type }}
+
{{ p.first_name }} {{ p.last_name }}
+
{{ p.job_title }}
- - - - +
{{ a.line1 }} {{ a.line2 }}
- + + {% if p.primary_nis_contact %} + + {% else %} + + {% endif %} - + + - + + - + + - + + - + +
{{ a.line3 }}Primary NIS Contact:YesNo
{{ a.city }}Email:{{ p.email }}
{{ a.county }}Mobile:{{ p.mobile }}
{{ a.postcode }}Landline:{{ p.landline }}
{{ a.country }}Clearance:{{ p.clearance }}
-
Notes:
- {{ a.other_details }} - 		Clearance Expiry:{{ p.clearance_expiry }}
@@ -148,96 +236,6 @@
{% endfor %} - {% else %} -
-
-
-
{{ addr.type }}
-
-
- - - - - - - - - - - - - - - - - - - - - - -
{{ addr.line1 }} {{ addr.line2 }}
{{ addr.line3 }}
{{ addr.city }}
{{ addr.county }}
{{ addr.postcode }}
{{ addr.country }}
-
Notes:
- {{ addr.other_details }} -
-
-
-
-
-
- {% endif %} -
- - -
-

People

-
- -
- {% for p in people %} -
-
-
-
{{ p.first_name }} {{ p.last_name }}
-
{{ p.job_title }}
-
-
- - - - {% if p.primary_nis_contact %} - - {% else %} - - {% endif %} - - - - - - - - - - - - - - - - - - - - - -
Primary NIS Contact:YesNo
Email:{{ p.email }}
Mobile:{{ p.mobile }}
Landline:{{ p.landline }}
Clearance:{{ p.clearance }}
Clearance Expiry:{{ p.clearance_expiry }}
-
-
-
-
-
- {% endfor %} +
{% endblock content %} -- cgit v1.2.3