Man 219 correct no risk score and dates (#242)

* MAN-219: Fixed updated dates and tidy up
ministryofjustice · Dec 20, 2024 · 5ed99eb · 5ed99eb
1 parent bb5c9ea
commit 5ed99eb
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 68 deletions.
diff --git a/server/views/_components/mappa-widget/template.njk b/server/views/_components/mappa-widget/template.njk
@@ -4,7 +4,7 @@
             <strong>{% if isNotNull(params.mappa.category) %}Cat {{ params.mappa.category }}/{% endif %}{% if isNotNull(params.mappa.level) %}Level {{ params.mappa.level }}{% else %}No{% endif %}</strong> MAPPA</h2>
         <p class="govuk-body-m govuk-!-margin-bottom-2">Multi-agency public protection arrangements</p>
         {% if params.mappa.level and params.lastUpdatedDate %}
-            <p class="text-secondary govuk-body-s govuk-!-margin-bottom-0">Last updated: {{ params.lastUpdatedDate }}</p>
+            <p class="text-secondary govuk-!-margin-bottom-0 govuk-hint">Last updated (NDelius): {{ params.lastUpdatedDate }}</p>
         {% endif %}
     {% else %}
         <h2 class="govuk-heading-m text-uppercase"><strong>Unknown</strong> MAPPA</h2>

diff --git a/server/views/_components/risk-flag-widget/screenshots/risk_flags_widget.png b/server/views/_components/risk-flag-widget/screenshots/risk_flags_widget.png
diff --git a/.../views/_components/risk-flag-widget/screenshots/risk_flags_widget_not_found.png b/.../views/_components/risk-flag-widget/screenshots/risk_flags_widget_not_found.png
diff --git a/...ews/_components/risk-flag-widget/screenshots/risk_flags_widget_server_error.png b/...ews/_components/risk-flag-widget/screenshots/risk_flags_widget_server_error.png
diff --git a/server/views/_components/rosh-widget/screenshots/rosh_not_found.png b/server/views/_components/rosh-widget/screenshots/rosh_not_found.png
diff --git a/server/views/_components/rosh-widget/screenshots/rosh_server_error.png b/server/views/_components/rosh-widget/screenshots/rosh_server_error.png
diff --git a/server/views/_components/rosh-widget/screenshots/rosh_widget.png b/server/views/_components/rosh-widget/screenshots/rosh_widget.png
diff --git a/server/views/_components/rosh-widget/template.njk b/server/views/_components/rosh-widget/template.njk
@@ -57,7 +57,7 @@
 {% else %}
     <div class="rosh-widget {{ getOverallRiskLevelClass(roshSummary.overallRisk) }}">
         <h3 class="govuk-heading-m" data-qa="overallRiskValue"><strong>{{ getRiskLevelText(roshSummary.overallRisk) }}</strong> RoSH</h3>
-        <p class="govuk-body-m">Risk of serious harm<br><span class="govuk-body-s govuk-hint">Last updated: {{ roshSummary.assessedOn | dateWithYear | default("Not known") }}</span></p>
+        <p class="govuk-body-m">Risk of serious harm<br><span class="govuk-body-s govuk-hint">Last updated (OASys): {{ roshSummary.assessedOn | dateWithYearShortMonth | default("Not known") }}</span></p>
         <table class="govuk-table rosh-widget__table">
             <caption class="govuk-visually-hidden">Risk of serious harm in Community</caption>
             <thead class="govuk-table__head">

diff --git a/server/views/pages/risk.njk b/server/views/pages/risk.njk
@@ -17,7 +17,9 @@
 {% set highScoring = groupNeeds("SEVERE", needs.identifiedNeeds) %}
 {% set lowScoring = groupNeeds("STANDARD", needs.identifiedNeeds) %}
 {% set withoutScore = needs.notIdentifiedNeeds %}
-
+  {% if risks.assessedOn %}
+      {% set lastUpdatedDate = 'Last updated (OASys):' + risks.assessedOn | dateWithYear %}
+  {% endif %}
 
 {% set highScoringNeeds %}
   {% if highScoring.length > 0 %}
@@ -87,10 +89,6 @@
       <h2 class="govuk-heading-m score-header govuk-!-margin-bottom-0" data-analytics-event-scroll="RSR score">
         Criminogenic needs
       </h2>
-      <div class="text-secondary govuk-body govuk-!-margin-bottom-2 govuk-hint">
-        Last updated (OASys): {{ risks.assessedOn | dateWithYear }}
-      </div>
-
       {{ govukSummaryList({
         rows: [
           {
@@ -115,9 +113,6 @@
         <h2 class="govuk-heading-m score-header govuk-!-margin-bottom-0" data-analytics-event-scroll="RSR score">
           RSR (risk of serious recidivism)
         </h2>
-        <div class="text-secondary govuk-body govuk-!-margin-bottom-2 govuk-hint">
-          Last updated (OASys): {{ predictorScores.date }}
-        </div>
         <div aria-hidden="true">
           {{ predictorScore(predictorScores.scores.RSR) }}
         </div>
@@ -127,30 +122,24 @@
         <h2 class="govuk-heading-m score-header govuk-!-margin-bottom-1" data-analytics-event-scroll="OGRS score">
           OGRS (offender group reconviction scale)
         </h2>
-        <div class="text-secondary govuk-body govuk-!-margin-bottom-6 govuk-hint">
-          Last updated (OASys): {{ predictorScores.date }}
-        </div>
-      {% endif %}
-
-      {% if predictorScores.scores.OGRS %}
-      <div class="govuk-grid-row  govuk-!-margin-bottom-4">
-        <div class="govuk-grid-column-three-quarters-from-desktop">
-            <div class="flex-mobile">
-              <div class='flex__item-one-third-mobile'>
-                <h3 class='govuk-heading-s govuk-!-margin-bottom-1'>1 year</h3>
-                <div class='govuk-body' data-qa='ogrs-1yr'>{{ predictorScores.scores.OGRS.oneYear }}%</div>
-              </div>
-              <div class='flex__item-one-third-mobile'>
-                <h3 class='govuk-heading-s govuk-!-margin-bottom-1'>2 year</h3>
-                <div class='govuk-body' data-qa='ogrs-2yr'>{{ predictorScores.scores.OGRS.twoYears }}%</div>
-              </div>
-              <div class='flex__item-one-third-mobile'>
-                <h3 class='govuk-heading-s govuk-!-margin-bottom-1'>Level</h3>
-                <div class='govuk-body' data-qa='ogrs-level'>{{ riskLevelLabel(predictorScores.scores.OGRS.level) }}</div>
+        <div class="govuk-grid-row  govuk-!-margin-bottom-4">
+          <div class="govuk-grid-column-three-quarters-from-desktop">
+              <div class="flex-mobile">
+                <div class='flex__item-one-third-mobile'>
+                  <h3 class='govuk-heading-s govuk-!-margin-bottom-1'>1 year</h3>
+                  <div class='govuk-body' data-qa='ogrs-1yr'>{{ predictorScores.scores.OGRS.oneYear }}%</div>
+                </div>
+                <div class='flex__item-one-third-mobile'>
+                  <h3 class='govuk-heading-s govuk-!-margin-bottom-1'>2 year</h3>
+                  <div class='govuk-body' data-qa='ogrs-2yr'>{{ predictorScores.scores.OGRS.twoYears }}%</div>
+                </div>
+                <div class='flex__item-one-third-mobile'>
+                  <h3 class='govuk-heading-s govuk-!-margin-bottom-1'>Level</h3>
+                  <div class='govuk-body' data-qa='ogrs-level'>{{ riskLevelLabel(predictorScores.scores.OGRS.level) }}</div>
+                </div>
               </div>
-            </div>
+          </div>
         </div>
-      </div>
       {% endif %}
 
       {% if predictorScores.scores.OSPI.score or predictorScores.scores.OSPC.score %}
@@ -163,9 +152,6 @@
         <h3 class="govuk-heading-s score-header govuk-!-margin-bottom-0" data-analytics-event-scroll="OSP/I score">
           OSP/I (internet-related offences) or OSP/IIC (internet-involved child offences)
         </h3>
-        <div class="text-secondary govuk-body govuk-!-margin-bottom-2 govuk-hint">
-          Last updated (OASys): {{ predictorScores.date }}
-        </div>
         <div aria-hidden="true">
           {{ predictorScore(predictorScores.scores.OSPI) }}
         </div>
@@ -176,9 +162,6 @@
         <h3 class="govuk-heading-s score-header govuk-!-margin-bottom-0" data-analytics-event-scroll="OSP/C score">
           OSP/C (contact-related sexual reoffending) or OSP/DC (direct contact)
         </h3>
-        <div class="text-secondary govuk-body govuk-!-margin-bottom-2 govuk-hint">
-          Last updated (OASys): {{ predictorScores.date }}
-        </div>
         <div aria-hidden="true">
           {{ predictorScore(predictorScores.scores.OSPC) }}
         </div>
@@ -189,9 +172,6 @@
         <h2 class="govuk-heading-m score-header govuk-!-margin-bottom-1" data-analytics-event-scroll="OVP score">
           OVP (OASys violent predictor score)
         </h2>
-        <div class="text-secondary govuk-body govuk-!-margin-bottom-6 govuk-hint">
-          Last updated (OASys): {{ predictorScores.date }}
-        </div>
         <div class="govuk-grid-row  govuk-!-margin-bottom-4">
           <div class="govuk-grid-column-three-quarters-from-desktop">
               <div class="flex-mobile">
@@ -216,34 +196,29 @@
         <h2 class="govuk-heading-m score-header govuk-!-margin-bottom-0" data-analytics-event-scroll="OGP score">
           OGP (OASys general predictor score)
         </h2>
-        <div class="text-secondary govuk-body govuk-!-margin-bottom-6">
-          Last updated (OASys): {{ predictorScores.date }}
-        </div>
-      <div class="govuk-grid-row  govuk-!-margin-bottom-4">
-        <div class="govuk-grid-column-three-quarters-from-desktop">
-            <div class="flex-mobile">
-              <div class='flex__item-one-third-mobile'>
-                <h3 class='govuk-heading-s govuk-!-margin-bottom-1'>1 year</h3>
-                <div class='govuk-body' data-qa='ogp-1yr'>{{ predictorScores.scores.OGP.oneYear }}%</div>
-              </div>
-              <div class='flex__item-one-third-mobile'>
-                <h3 class='govuk-heading-s govuk-!-margin-bottom-1'>2 year</h3>
-                <div class='govuk-body' data-qa='ogp-2yr'>{{ predictorScores.scores.OGP.twoYears }}%</div>
-              </div>
-              <div class='flex__item-one-third-mobile'>
-                <h3 class='govuk-heading-s govuk-!-margin-bottom-1'>Level</h3>
-                <div class='govuk-body' data-qa='ogp-level'>{{ riskLevelLabel(predictorScores.scores.OGP.level) }}</div>
+        <div class="govuk-grid-row  govuk-!-margin-bottom-4">
+          <div class="govuk-grid-column-three-quarters-from-desktop">
+              <div class="flex-mobile">
+                <div class='flex__item-one-third-mobile'>
+                  <h3 class='govuk-heading-s govuk-!-margin-bottom-1'>1 year</h3>
+                  <div class='govuk-body' data-qa='ogp-1yr'>{{ predictorScores.scores.OGP.oneYear }}%</div>
+                </div>
+                <div class='flex__item-one-third-mobile'>
+                  <h3 class='govuk-heading-s govuk-!-margin-bottom-1'>2 year</h3>
+                  <div class='govuk-body' data-qa='ogp-2yr'>{{ predictorScores.scores.OGP.twoYears }}%</div>
+                </div>
+                <div class='flex__item-one-third-mobile'>
+                  <h3 class='govuk-heading-s govuk-!-margin-bottom-1'>Level</h3>
+                  <div class='govuk-body' data-qa='ogp-level'>{{ riskLevelLabel(predictorScores.scores.OGP.level) }}</div>
+                </div>
               </div>
-            </div>
+          </div>
         </div>
       </div>
-        </div>
       {% endif %}
-
       {% else %}
-        <p>Some data is unavailable because {{ personRisk.personSummary.name.forename }} has a level one risk assessment in OASys.</p>
         {% set html %}
-          <h2 class="govuk-heading-m">There is no OASys risk assessment for {{ personRisk.personSummary.name | fullName }}</h2>
+          <h2 class="govuk-heading-m">There is no OASys Layer 3 risk assessment for {{ personRisk.personSummary.name | fullName }}</h2>
           {% include './risk/_no-oasys-risk-assessment.njk' %}
         {% endset %}
         {{ govukNotificationBanner({ html: html }) }}
@@ -257,7 +232,7 @@
       </h2>
       {% if personRisk.opd.eligible === true %}
       <div class="text-secondary govuk-body govuk-!-margin-bottom-2 govuk-hint">
-        Last updated (OASys): {{ personRisk.opd.date | dateWithYear }}
+        Last updated (NDelius): {{ personRisk.opd.date | dateWithYear }}
       </div>
       <p class='govuk-body' data-qa='ogp-missing'>Eligible</p>
       {% else %}
@@ -266,9 +241,9 @@
   </div>
   <div class="govuk-grid-column-one-third">
       {{ roshWidget(risksWidget) }}
-      {{ mappaWidget({ mappa: personRisk.mappa, lastUpdatedDate: personRisk.mappa.startDate | dateWithYear }) }}
+      {{ mappaWidget({ mappa: personRisk.mappa, lastUpdatedDate: personRisk.mappa.startDate | dateWithYearShortMonth }) }}
     <div class="govuk-body predictor-timeline__heading">
-        <h2 class="govuk-heading-m govuk-!-margin-bottom-2">Scores history</h2>
+        <h2 class="govuk-heading-m govuk-!-margin-bottom-2">OASys score history</h2>
         {% if predictorScores.error and caseSummary.roshHistory.error %}
           <p class='govuk-body' data-qa='timeline-missing'>RoSH levels and predictor scores cannot be retrieved from NDelius or OASys. Double-check NDelius and OASys.</p>
         {% elseif predictorScores.error %}

diff --git a/server/views/pages/risk/_risk-flags.njk b/server/views/pages/risk/_risk-flags.njk
@@ -13,7 +13,7 @@
       <thead class="govuk-table__head">
         <tr class="govuk-table__row">
           <th class="govuk-table__header">Flag</th>
-          <th class="govuk-table__header" >Notes</th>
+          <th class="govuk-table__header">Notes</th>
           <th class="govuk-table__header">Date added</th>
           <th class="govuk-table__header">Next review</th>
         </tr>

diff --git a/server/views/partials/case.njk b/server/views/partials/case.njk
@@ -62,9 +62,15 @@
     </div>
 {% include "../partials/case-nav.njk" %}
 {% if currentSectionName %}
-    <h1 class="govuk-heading-l govuk-!-margin-bottom-7" data-qa="pageHeading">{{ currentSectionName }}</h1>
+    {% if lastUpdatedDate %}
+        <h1 class="govuk-heading-l govuk-!-margin-bottom-3" data-qa="pageHeading">{{ currentSectionName }}</h1>
+        <div class="govuk-inset-text govuk-!-margin-top-0">{{ lastUpdatedDate }}</div>
+    {% else %}
+        <h1 class="govuk-heading-l govuk-!-margin-bottom-7" data-qa="pageHeading">{{ currentSectionName }}</h1>
+    {% endif %}
 {% endif %}
 
+
 {% set errors = [] %}
 {% if risks.errors.length > 0 %}
     {% set errors = errors.concat(risks.errors) %}