ADJUST1-163 Time and Prison added to frontend. (#50)

* ADJUST1-163 Time and Prison added to frontend. * ADJUST1-163 fixed npm version.
ministryofjustice · Sep 7, 2023 · 63df4d2 · 63df4d2
1 parent 9d2c18e
commit 63df4d2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -26,7 +26,8 @@ jobs:
       - checkout
       - run:
           name: Update npm
-          command: 'sudo npm install -g npm@latest'
+          # temporary hard code version until we move to v10
+          command: 'sudo npm install -g npm@9.8.1'
       - restore_cache:
           key: dependency-cache-{{ checksum "package-lock.json" }}
       - run:

diff --git a/server/views/macros/hubAdjustmentCard.njk b/server/views/macros/hubAdjustmentCard.njk
@@ -26,8 +26,8 @@
       {% if adjustmentType.value == 'REMAND' and model.remandDecision %}
         <p class="govuk-body">{{ model.remandDecision.days }} days of suggested remand was
           {{ "accepted" if model.remandDecision.accepted else "rejected" }}
-          on {{ model.remandDecision.decisionOn | date("DD MMMM YYYY") }}
-          by {{ model.remandDecision.decisionBy }}.
+          on {{ model.remandDecision.decisionOn | date("DD MMMM YYYY HH:mm") }}
+          by {{ model.remandDecision.decisionByPrisonDescription }}.
           {% if not model.remandDecision.accepted %}
             <br/>
             Reason for rejection: {{ model.remandDecision.rejectComment }}

diff --git a/server/views/pages/adjustments/view.njk b/server/views/pages/adjustments/view.njk
@@ -30,8 +30,8 @@
       {% if model.adjustmentType.value == 'REMAND' and model.remandDecision %}
         <p class="govuk-body">{{model.remandDecision.days}} days of suggested remand was 
                     {{ "accepted" if model.remandDecision.accepted else "rejected" }}
-                     on {{model.remandDecision.decisionOn | date("DD MMMM YYYY")}}
-                      by {{model.remandDecision.decisionBy}}</p>
+                     on {{model.remandDecision.decisionOn | date("DD MMMM YYYY HH:mm")}}
+                      by {{model.remandDecision.decisionByPrisonDescription}}</p>
       {% endif %}
       {{ govukTable(
         model.table()