From e627ee10c73b0662f97619d4cda289a90a1aed38 Mon Sep 17 00:00:00 2001 From: Matthew Lemon Date: Tue, 20 Oct 2020 11:08:41 +0100 Subject: more home page tweaking --- .../caf/templates/caf/applicablesystem_list.html | 8 ++--- ctrack/core/views.py | 17 +++++++-- ctrack/templates/pages/home.html | 40 +++++++++++++++------- 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/ctrack/caf/templates/caf/applicablesystem_list.html b/ctrack/caf/templates/caf/applicablesystem_list.html index 416f771..651d389 100644 --- a/ctrack/caf/templates/caf/applicablesystem_list.html +++ b/ctrack/caf/templates/caf/applicablesystem_list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load static %} -{% block title %}Systems in Scope{% endblock %} +{% block title %}Critical Systems{% endblock %} {% block content %} @@ -19,14 +19,14 @@
-

Systems in Scope

[Create new...] +

Critical Systems

[Create new...]
- + @@ -37,10 +37,10 @@ {% for sys in object_list %} + -
Organisation SystemOrganisation CAFs Sub Mode Confidence Grade
{{ sys.name }} {{ sys.get_organisation.name }} {{ sys.name }}
    {% for c in sys.caf_set.all %} diff --git a/ctrack/core/views.py b/ctrack/core/views.py index a40f945..6482662 100644 --- a/ctrack/core/views.py +++ b/ctrack/core/views.py @@ -1,7 +1,8 @@ from django.contrib.auth.decorators import login_required from django.shortcuts import render -from ctrack.organisations.models import IncidentReport, Organisation +from ctrack.caf.models import EssentialService, CAF, ApplicableSystem +from ctrack.organisations.models import IncidentReport, Organisation, Person from ctrack.register.models import EngagementEvent @@ -25,4 +26,16 @@ def home_page(request): }, ) else: - return render(request, "pages/home.html") + no_orgs = Organisation.objects.count() + no_people = Person.objects.count() + no_cafs = CAF.objects.count() + no_essential_services = EssentialService.objects.count() + no_systems = ApplicableSystem.objects.count() + context = { + "no_orgs": no_orgs, + "no_people": no_people, + "no_cafs": no_cafs, + "no_essential_services": no_essential_services, + "no_systems": no_systems, + } + return render(request, "pages/home.html", context) diff --git a/ctrack/templates/pages/home.html b/ctrack/templates/pages/home.html index 3c563db..a8fa58e 100644 --- a/ctrack/templates/pages/home.html +++ b/ctrack/templates/pages/home.html @@ -6,20 +6,20 @@

    ctrack

    -

    DfT's Cyber Compliance Team's information management system, used to track all core +

    DfT's Cyber Compliance Team's proof of concept information management system, used to track + all core components of the NIS regime.

    -

    ctrack is a proof-of-concept web application developed in-house by the Cyber Compliance +

    ctrack is developed in-house by the Cyber Compliance Team at the UK Department for Transport that aims to demonstrate the improvements in workflow possible by storing data associated with OES and its associated CAF data in a relational database. It focuses on the absolute basics of managing any business data: Create, Read, Update, Delete (CRUD) functionality and demonstrates how collection and analysis of ongoing assessment data - using the CAF as the foundation (the framework, not the spreadsheet) - can be exponentially improved using the simplest of form-based web application.

    -
    -

    +

    OES/Organisations

    -

    There are currently 53 There are currently {{ no_orgs }} organisations on ctrack, comprising 124 people.

    + class="lead font-weight-bold">{{ no_people }} people. + OES are responsible for {{ no_essential_services }} NIS essential services. There have been a total of X interactions with OES by inspectors, + including X emails, X + phone calls, X video conferences, and X + meetings.

    You can filter these lists to view things by lead inspector, sub-mode and other things.

    -

    +

    There are 93 CAFs on - ctrack.

    + ctrack, providing data on {{ no_systems }} critical systems. Of these, 12 have been validated. X + are currently undergoing validation and X are currently being updated by OES.

    -

    Of these - 12 have been validated.

    -- cgit v1.2.3