prettifying the incident report page a bit

3 files changed, 14 insertions, 27 deletions

diff --git a/ctrack/organisations/templates/organisations/incidentreport_form.html b/ctrack/organisations/templates/organisations/incidentreport_form.html
index 4a0f632..2683302 100644
--- a/ctrack/organisations/templates/organisations/incidentreport_form.html
+++ b/ctrack/organisations/templates/organisations/incidentreport_form.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base_stakeholder.html" %}
 
 {% block title %}
   Submit a new NIS Incident Report to DfT
@@ -10,14 +10,23 @@
   <div class="container mt-3">
     <div class="row">
       <div class="col-md-12 pl-0 my-2">
-        <h4>Submit an Incident Report</h4>
+        <h4>NIS Incident Report - for DfT</h4>
+        <div class="row">
+            <div class="col-8 my-2">
+                <div class="border border-danger rounded p-2">
+                <h5>IMPORTANT:</h5>
+                <p>Please ensure full details are provided. Incident reports MUST be submitted 
+                within 72 of an incident being detected. Your lead inspector will follow-up with 
+                you in due course. Thank you.</p></div>
+            </div>
+        </div>
       </div>
     </div>
     <div class="row">
-      <div class="col-md-7 pt-2 border bg-light">
+      <div class="col-md-8 pt-2 border bg-light">
         {% crispy form %}
       </div>
-      <div class="col-sm-5">
+      <div class="col-sm-4">
         <div class="card" style="width: 18rem;">
           <div class="card-body">
             <h5 class="card-title">Help submitting an incident form</h5>
diff --git a/ctrack/templates/pages/stakeholder_home.html b/ctrack/templates/pages/stakeholder_home.html
index 3cbba15..209a063 100644
--- a/ctrack/templates/pages/stakeholder_home.html
+++ b/ctrack/templates/pages/stakeholder_home.html
@@ -60,7 +60,7 @@
                                         {% elif ir.dft_handle_status == "WAITING"%}
                                             <td><span class="badge badge-secondary">{{ ir.dft_handle_status }}</span></td>
                                         {% else %}
-                                            <td><span class="badge badge-success">{{ ir.dft_handle_status }}</span></td>
+                                            <td><span class="badge badge-secondary">{{ ir.dft_handle_status }}</span></td>
                                         {% endif %}
                                     </tr>
                                 {% endfor %}
diff --git a/ctrack/users/tests/test_functional.py b/ctrack/users/tests/test_functional.py
index 55f8de3..7c7a742 100644
--- a/ctrack/users/tests/test_functional.py
+++ b/ctrack/users/tests/test_functional.py
@@ -144,25 +144,3 @@ def test_stakeholder_logs_into_system_and_submits_incident_form(
 
     # Gets to the correct page
     assert "Submit a new NIS Incident Report to DfT" in browser.title
-
-    # The name of her organisation is already there in the first field
-    assert (
-        browser.find_element_by_id("id_org_field").text
-        == user.stakeholder.person.get_organisation_name()
-    )
-
-    # Her name is already in the "Name of person reporting field"
-    assert (
-        browser.find_element_by_id("id_person_reporting_field").text
-        == user.stakeholder.person
-    )
-
-    # Her role is already in the "Role" field
-    assert browser.find_element_by_id("id_role_field").text == user.stakeholder.role
-
-    # Her phone number is already in the "Phone Number" field
-    assert (
-        browser.find_element_by_id("id_phone_number_field").text
-        == user.stakeholder.mobile
-    )
-    assert pytest.fail("WE GO NO FURTHER")