From ab83194ae6b0aeadd57237d32eb08d7c09e703b3 Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Tue, 26 May 2020 20:57:57 +0100 Subject: when user logs in - now redirects to home page - func and unit tests passing --- ctrack/templates/pages/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ctrack/templates/pages') diff --git a/ctrack/templates/pages/home.html b/ctrack/templates/pages/home.html index fbce9ff..bc70c17 100644 --- a/ctrack/templates/pages/home.html +++ b/ctrack/templates/pages/home.html @@ -2,7 +2,7 @@ {% block content %} -

User profile page

+

Welcome to ctrack - Department for Transport

User: {{ object }}

-- cgit v1.2.3 From ca2272bca90fc1fb7dbd78a2458ae921d5ffa59e Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Tue, 26 May 2020 21:22:51 +0100 Subject: regular user goes to regular user home page template when logging in --- ctrack/templates/pages/home.html | 1 + 1 file changed, 1 insertion(+) (limited to 'ctrack/templates/pages') diff --git a/ctrack/templates/pages/home.html b/ctrack/templates/pages/home.html index bc70c17..36a3abf 100644 --- a/ctrack/templates/pages/home.html +++ b/ctrack/templates/pages/home.html @@ -5,5 +5,6 @@

Welcome to ctrack - Department for Transport

User: {{ object }}

+

THIS IS A TEMPLATE FOR A REGULAR USER

{% endblock content %} -- cgit v1.2.3 From 361718781e2ae4e65b38b55937788c18f314f715 Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Wed, 27 May 2020 14:28:49 +0100 Subject: stakeholder user redirected to stakeholder template page --- ctrack/templates/pages/stakeholder_home.html | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 ctrack/templates/pages/stakeholder_home.html (limited to 'ctrack/templates/pages') diff --git a/ctrack/templates/pages/stakeholder_home.html b/ctrack/templates/pages/stakeholder_home.html new file mode 100644 index 0000000..c281d40 --- /dev/null +++ b/ctrack/templates/pages/stakeholder_home.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} + +{% block content %} + +

Welcome to ctrack - Department for Transport

+ +

User: {{ object }}

+

THIS IS A TEMPLATE FOR A STAKEHOLDER USER

+ +{% endblock content %} -- cgit v1.2.3 From eceaeab4e1c4cb52e187e073c9dad858f0e0bcce Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Thu, 28 May 2020 14:11:31 +0100 Subject: started mocking up home page --- ctrack/templates/pages/stakeholder_home.html | 60 ++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 4 deletions(-) (limited to 'ctrack/templates/pages') diff --git a/ctrack/templates/pages/stakeholder_home.html b/ctrack/templates/pages/stakeholder_home.html index c281d40..9832d7d 100644 --- a/ctrack/templates/pages/stakeholder_home.html +++ b/ctrack/templates/pages/stakeholder_home.html @@ -1,10 +1,62 @@ {% extends "base.html" %} +{% load static %} + {% block content %} -

Welcome to ctrack - Department for Transport

+
+
+
+

Welcome to ctrack - Department for Transport

+ +

THIS IS A TEMPLATE FOR A STAKEHOLDER USER

+
+
+

Incident Reporting

+ + + + + + + + + + + + + + + + + + + + + +
IncidentDateDetailsStatus
Power failure at Random Site12 May 2020There was a problem with some wires inside the black box at the site. + There was very little we could do until someone switched the circuit breakers off, + then we had to switch off the server that supplies the TLS link to the estate management + system. We failed on this one, big time.RESOLVED
Corruption of main database8 December 2019Weather got to the night-watchperson, who typed in the command to seal + the compound incorrectly. This led to a deluge of sand into the minky processor + which eventually wiped all data tables.UNRESOLVED
+ +
+
+
+

Audits and Inspections

+

No recent audits or inspections
+ No audits or inspections currently scheduled

+
+ +

NIS systems

+

Table of NIS systems here...

+ +

DfT Engagement

+

No engagement with DfT currently scheduled

+ +
+
+
-

User: {{ object }}

-

THIS IS A TEMPLATE FOR A STAKEHOLDER USER

- {% endblock content %} -- cgit v1.2.3 From 8aab1bfc276d4abdb62145a6f8c60a8c077e9d6c Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Thu, 28 May 2020 15:27:46 +0100 Subject: done a lot of mocking up of the stakeholder home page --- ctrack/templates/pages/home.html | 3 - ctrack/templates/pages/stakeholder_home.html | 124 +++++++++++++++++++-------- 2 files changed, 87 insertions(+), 40 deletions(-) (limited to 'ctrack/templates/pages') diff --git a/ctrack/templates/pages/home.html b/ctrack/templates/pages/home.html index 36a3abf..324da8e 100644 --- a/ctrack/templates/pages/home.html +++ b/ctrack/templates/pages/home.html @@ -2,9 +2,6 @@ {% block content %} -

Welcome to ctrack - Department for Transport

- -

User: {{ object }}

THIS IS A TEMPLATE FOR A REGULAR USER

{% endblock content %} diff --git a/ctrack/templates/pages/stakeholder_home.html b/ctrack/templates/pages/stakeholder_home.html index 9832d7d..d7e1793 100644 --- a/ctrack/templates/pages/stakeholder_home.html +++ b/ctrack/templates/pages/stakeholder_home.html @@ -7,53 +7,103 @@
-

Welcome to ctrack - Department for Transport

+ +

{{ org }} {{ org.submode }}

+ +

{{ org.person_set.first }}

THIS IS A TEMPLATE FOR A STAKEHOLDER USER

+ +
+
+
+
INFORMATION NOTICE:
+

Please note that important notices go in here. This is the NIS Directive + portal for DfT. Etc.

+

Your lead inspector is Bob McKinnon.

+

Other important messages will appear here when we deem it necessary. + Please ensure you remain in touch with what appears in this box because it + WILL be updated periodically.

+
+
+
+
-
-

Incident Reporting

- - + +
+
+

Incident Reporting

+
+ + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - -
IncidentDateDetailsStatus
Power failure at Random Site12 May 2020There was a problem with some wires inside the black box at the site. + There was very little we could do until someone switched the circuit breakers off, + then we had to switch off the server that supplies the TLS link to the estate management + system. We failed on this one, big time.RESOLVED
IncidentDateDetailsStatusCorruption of main database8 December 2019Weather got to the night-watchperson, who typed in the command to seal + the compound incorrectly. This led to a deluge of sand into the minky processor + which eventually wiped all data tables.UNRESOLVED
Power failure at Random Site12 May 2020There was a problem with some wires inside the black box at the site. - There was very little we could do until someone switched the circuit breakers off, - then we had to switch off the server that supplies the TLS link to the estate management - system. We failed on this one, big time.RESOLVED
Corruption of main database8 December 2019Weather got to the night-watchperson, who typed in the command to seal - the compound incorrectly. This led to a deluge of sand into the minky processor - which eventually wiped all data tables.UNRESOLVED
- + + +
-
-

Audits and Inspections

-

No recent audits or inspections
- No audits or inspections currently scheduled

+
+
+

Audits and Inspections

+

No recent audits or inspections
+ No audits or inspections currently scheduled

+
-

NIS systems

-

Table of NIS systems here...

+
+ +
+
+

NIS systems

+ + + + + + + + + {% for system in systems %} + + + + + + {% endfor %} +
System NameDescriptionCAF
{{ system.name }}{{ system.description }}{{ system.caf }}
+
+
-

DfT Engagement

-

No engagement with DfT currently scheduled

+
+ +
+
+

DfT Engagement

+

No engagement with DfT currently scheduled

+
+
-- cgit v1.2.3 From c7413b7bd4a5b6d4b66aa453f82397137933f31f Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Thu, 28 May 2020 15:50:57 +0100 Subject: more progress on homepage --- ctrack/templates/pages/stakeholder_home.html | 46 +++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 5 deletions(-) (limited to 'ctrack/templates/pages') diff --git a/ctrack/templates/pages/stakeholder_home.html b/ctrack/templates/pages/stakeholder_home.html index d7e1793..0d292da 100644 --- a/ctrack/templates/pages/stakeholder_home.html +++ b/ctrack/templates/pages/stakeholder_home.html @@ -24,6 +24,10 @@

Other important messages will appear here when we deem it necessary. Please ensure you remain in touch with what appears in this box because it WILL be updated periodically.

+ Help | + NIS Regulations | + Improvement Plan Information | + Report a problem
@@ -49,7 +53,7 @@ There was very little we could do until someone switched the circuit breakers off, then we had to switch off the server that supplies the TLS link to the estate management system. We failed on this one, big time. - RESOLVED + UNRESOLVED Corruption of main database @@ -57,18 +61,50 @@ Weather got to the night-watchperson, who typed in the command to seal the compound incorrectly. This led to a deluge of sand into the minky processor which eventually wiped all data tables. - UNRESOLVED + RESOLVED - +

Audits and Inspections

-

No recent audits or inspections
- No audits or inspections currently scheduled

+ + + + + + + + + + + + + + + + + + + + + + + + + +
DateTypeLocationNotesCAF scopeStatus
23/10/2020InspectionHammersmith WarehouseFollow up to July telephone call + A2.c + B2.a + SCHEDULED
5/6/2020InspectionHammersmith WarehouseNA + A3.a + B5.c + B6 + B7 + RESOLVED
-- cgit v1.2.3 From 520a9deb13f93c689443c0339b1c96a67f0c15a1 Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Thu, 28 May 2020 16:11:39 +0100 Subject: added new base.html for stakeholders --- ctrack/templates/pages/stakeholder_home.html | 40 +++++++++++++++++++--------- 1 file changed, 27 insertions(+), 13 deletions(-) (limited to 'ctrack/templates/pages') diff --git a/ctrack/templates/pages/stakeholder_home.html b/ctrack/templates/pages/stakeholder_home.html index 0d292da..fd40c7a 100644 --- a/ctrack/templates/pages/stakeholder_home.html +++ b/ctrack/templates/pages/stakeholder_home.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "base_stakeholder.html" %} {% load static %} @@ -17,10 +17,10 @@
-
INFORMATION NOTICE:
+
KEY INFORMATION:

Please note that important notices go in here. This is the NIS Directive portal for DfT. Etc.

-

Your lead inspector is Bob McKinnon.

+

Your lead inspector is Bob McKinnon.

Other important messages will appear here when we deem it necessary. Please ensure you remain in touch with what appears in this box because it WILL be updated periodically.

@@ -70,7 +70,7 @@
-

Audits and Inspections

+

Compliance Events

@@ -79,31 +79,45 @@ + - + - - + + + - - - + + + - + + + + + + + + + + +
DateNotes CAF scope StatusReport
23/10/202023 October 2020 InspectionHammersmith WarehouseFollow up to July telephone callHammersmithFollow up to July call A2.c B2.a SCHEDULED
5/6/2020InspectionHammersmith Warehouse5 June 2020AuditHammersmith NA - A3.a + A2.c B5.c B6 B7 RESOLVEDDfT-NIS-2302A
19 January 2020MeetingVideoNA + Obj C + RESOLVED
@@ -125,7 +139,7 @@ {{ system.name }} {{ system.description }} - {{ system.caf }} + {{ system.caf }} | Update WebCAF {% endfor %} -- cgit v1.2.3