diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ef1d6c3..3e012062 100644 --- 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 index b3153539..fcf8551e 100644 --- a/server/views/macros/hubAdjustmentCard.njk +++ b/server/views/macros/hubAdjustmentCard.njk @@ -26,8 +26,8 @@ {% if adjustmentType.value == 'REMAND' and model.remandDecision %}
{{ 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 %}
Reason for rejection: {{ model.remandDecision.rejectComment }}
diff --git a/server/views/pages/adjustments/view.njk b/server/views/pages/adjustments/view.njk
index 4c80078c..8487377e 100644
--- 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 %}
{{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}} {% endif %} {{ govukTable( model.table()