Merge branch 'main' into serimabemain

informed-governance-project · Nov 27, 2024 · 1ac7a24 · 1ac7a24
2 parents 9f80c94 + bbc86bf
commit 1ac7a24
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 10 deletions.
diff --git a/static/css/incidents.css b/static/css/incidents.css
@@ -33,4 +33,8 @@
     border-width: 3px !important;
     border-style: solid !important;
     border-color: var(--bs-secondary) !important;
+}
+
+.no-opacity {
+    opacity: 1 !important;
 }
diff --git a/templates/incidents_base.html b/templates/incidents_base.html
@@ -75,7 +75,7 @@ <h3>{% translate "Reported incidents" %}</h3>
 <table id="incidents-table" class="table align-middle table-sm small">
     <thead>
         <tr>
-            <th class="text-start">{% translate "Incident notification date" %}</th>
+            <th class="text-start">{% translate "Incident creation date" %}</th>
             <th>{% translate "Reference" %}</th>
             <th>
                 {% if is_observer %}

diff --git a/templates/operator/incidents.html b/templates/operator/incidents.html
@@ -82,9 +82,11 @@ <h3>{% translate "My incidents" %}</h3>
 {% endblock %}
 
 {% block content_table_significative_impact %}
-{% if incident.is_significative_impact %}
-<span class="bi bi-check-lg d-flex align-items-center justify-content-center"></span>
-{% endif %}
+    <div class="form-check d-flex align-items-center justify-content-center">
+        <input class="form-check-input large-checkbox no-opacity" type="checkbox"
+            {% if incident.is_significative_impact %}checked{% endif %} 
+            disabled>
+    </div>
 {% endblock %}
 
 {% block content_table_actions %}

diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html
@@ -14,6 +14,7 @@ <h1>{% translate "Change password" %}</h1>
 <div class="col-12 col-md-8 col-lg-6 col-xl-5">
     <form method="post">
         {% csrf_token %}
+        {% bootstrap_form_errors form %}
         {% bootstrap_field form.old_password show_label=False %}
         {% bootstrap_field form.new_password1 show_label=False %}
         {% bootstrap_field form.new_password2 show_label=False %}

diff --git a/templates/report/cover.html b/templates/report/cover.html
@@ -8,7 +8,11 @@
 
     </div>
 
-    <h1 class="mt-5 mb-2 text-center fw-bold">{% translate "Incident notification report" %}</h1>
+    <h1 class="mt-5 mb-2 text-center fw-bold">{% translate "Incident notification report" %}
+        {% if report_name %}
+            <br>{{report_name}}
+        {% endif %}
+    </h1>
     <div class="mt-5 p-4 pb-2 border border-secondary border-1 rounded">
         <p>
             <span class="fw-bold">

diff --git a/templates/report/reports.html b/templates/report/reports.html
@@ -12,10 +12,10 @@ <h6 class="border bg-light m-0 p-2 fw-bold">{{ category_label }}</h6>
     <tbody>
         {% for question_label, answers in questions_answers.items %}
         <tr>
-            <th class="col-7 fw-normal">
+            <th class="col-5 fw-normal">
                 {{ question_label }}
             </th>
-            <td class="col-5">
+            <td class="col-7">
                 {% for answer_label in answers %}
                 <p style="word-break:break-all">
                     {{ answer_label|linebreaksbr }}

diff --git a/templates/report/timeline.html b/templates/report/timeline.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<h2 id="incident_timeline" class="fw-bold">{% translate "Timeline" %}</h2>
+<h2 id="incident_timeline" class="fw-bold">{% translate "Incident Timeline" %}</h2>
 
 <table class="table table-sm table-bordered">
     <tbody>
@@ -8,7 +8,7 @@ <h2 id="incident_timeline" class="fw-bold">{% translate "Timeline" %}</h2>
             <td>{{ incident.incident_timezone }}</td>
         </tr>
         <tr>
-            <th>{% translate "Notification date" %}</th>
+            <th>{% translate "Creation date" %}</th>
             <td>{{ incident.incident_notification_date|date:"d M Y, H:i" }}</td>
         </tr>
         <tr>
@@ -20,4 +20,19 @@ <h2 id="incident_timeline" class="fw-bold">{% translate "Timeline" %}</h2>
             <td>{{ incident.incident_starting_date|date:"d M Y, H:i" }}</td>
         </tr>
     </tbody>
-</table>
+</table>
+
+{% if report_list %}
+<h2 id="incident_timeline" class="fw-bold">{% translate "Report Timeline" %}</h2>
+
+<table class="table table-sm table-bordered">
+    <tbody>
+        {% for report in report_list %}
+        <tr>
+            <th>{{ report.workflow.name }}</th>
+            <td>{{ report.timestamp|date:"d M Y, H:i" }}</td>
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>
+{% endif %}