Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Sep 7, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
519b1f1
ADJUST1-163 Time and Prison added to frontend.
ldlharper Sep 7, 2023
a50ca9f
ADJUST1-163 fixed npm version.
ldlharper Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions server/views/macros/hubAdjustmentCard.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions server/views/pages/adjustments/view.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down