Check your answers before confirming meeting arrange
{% if data['interpreterNeeded'] == "yes" and data['interpreterDetails'] %} {{ data['interpreterDetails'] }}{% endif %}
Check your answers before confirming meeting arrange
{% if data['supportPersonNeeded'] == "yes" and data['supportPersonDetails'] %} {{ data['supportPersonDetails'] }}{% endif %}
diff --git a/app/views/bfs/meetings-2/confirm-arrangements/meeting-format.html b/app/views/bfs/meetings-2/confirm-arrangements/meeting-format.html
index 54cd5de0..f7513c45 100644
--- a/app/views/bfs/meetings-2/confirm-arrangements/meeting-format.html
+++ b/app/views/bfs/meetings-2/confirm-arrangements/meeting-format.html
@@ -42,17 +42,17 @@
{
value: "in-person",
text: "In person",
- checked: checked("meetingFormat", "in-person")
+ checked: checked("meetingFormat", "in-person") if data['changeMode'] == 'true' else false
},
{
value: "virtual",
text: "Virtual call",
- checked: checked("meetingFormat", "virtual")
+ checked: checked("meetingFormat", "virtual") if data['changeMode'] == 'true' else false
},
{
value: "hybrid",
text: "Hybrid",
- checked: checked("meetingFormat", "hybrid"),
+ checked: checked("meetingFormat", "hybrid") if data['changeMode'] == 'true' else false,
hint: {
text: "Some people will attend in person and others will join virtually"
}
diff --git a/app/views/bfs/meetings-2/confirm-arrangements/meeting-lead.html b/app/views/bfs/meetings-2/confirm-arrangements/meeting-lead.html
index d71dcfd8..4744853e 100644
--- a/app/views/bfs/meetings-2/confirm-arrangements/meeting-lead.html
+++ b/app/views/bfs/meetings-2/confirm-arrangements/meeting-lead.html
@@ -46,7 +46,7 @@
{% if attendee != '_unchecked' %}
{% set radioIndex = radioIndex + 1 %}
-
+
diff --git a/app/views/bfs/meetings-2/confirm-arrangements/meeting-location.html b/app/views/bfs/meetings-2/confirm-arrangements/meeting-location.html
index 451f82b7..6729ff9d 100644
--- a/app/views/bfs/meetings-2/confirm-arrangements/meeting-location.html
+++ b/app/views/bfs/meetings-2/confirm-arrangements/meeting-location.html
@@ -41,7 +41,7 @@
name: "cpsLocation",
type: "text",
classes: "govuk-input--width-20",
- value: data['cpsLocation'],
+ value: data['cpsLocation'] if data['changeMode'] == 'true',
errorMessage: { text: "Enter which CPS location the meeting will be held" } if (detailError and selectedType == "cps") else undefined,
label: {
text: "Which CPS location will the meeting be held?"
@@ -55,7 +55,7 @@
name: "magistratesLocation",
type: "text",
classes: "govuk-input--width-20",
- value: data['magistratesLocation'],
+ value: data['magistratesLocation'] if data['changeMode'] == 'true',
errorMessage: { text: "Enter which magistrates' court the meeting will be held" } if (detailError and selectedType == "magistrates") else undefined,
label: {
text: "Which magistrates' court will the meeting be held?"
@@ -69,7 +69,7 @@
name: "crownLocation",
type: "text",
classes: "govuk-input--width-20",
- value: data['crownLocation'],
+ value: data['crownLocation'] if data['changeMode'] == 'true',
errorMessage: { text: "Enter which crown court the meeting will be held" } if (detailError and selectedType == "crown") else undefined,
label: {
text: "Which crown court will the meeting be held?"
@@ -83,7 +83,7 @@
name: "policeStationLocation",
type: "text",
classes: "govuk-input--width-20",
- value: data['policeStationLocation'],
+ value: data['policeStationLocation'] if data['changeMode'] == 'true',
errorMessage: { text: "Enter which police station the meeting will be held" } if (detailError and selectedType == "police") else undefined,
label: {
text: "Which police station will the meeting be held?"
@@ -96,7 +96,7 @@
id: "other-location",
name: "otherLocation",
classes: "govuk-input--width-20",
- value: data['otherLocation'],
+ value: data['otherLocation'] if data['changeMode'] == 'true',
errorMessage: { text: "Enter where the meeting will be held" } if (detailError and selectedType == "other") else undefined,
label: {
text: "Where will the meeting be held?"
@@ -118,31 +118,31 @@
{
value: "cps",
text: "CPS location",
- checked: checked("meetingLocationType", "cps"),
+ checked: checked("meetingLocationType", "cps") if data['changeMode'] == 'true' else false,
conditional: { html: cpsHtml }
},
{
value: "magistrates",
text: "Magistrates' court",
- checked: checked("meetingLocationType", "magistrates"),
+ checked: checked("meetingLocationType", "magistrates") if data['changeMode'] == 'true' else false,
conditional: { html: magistratesHtml }
},
{
value: "crown",
text: "Crown court",
- checked: checked("meetingLocationType", "crown"),
+ checked: checked("meetingLocationType", "crown") if data['changeMode'] == 'true' else false,
conditional: { html: crownHtml }
},
{
value: "police",
text: "Police station",
- checked: checked("meetingLocationType", "police"),
+ checked: checked("meetingLocationType", "police") if data['changeMode'] == 'true' else false,
conditional: { html: policeHtml }
},
{
value: "other",
text: "Other",
- checked: checked("meetingLocationType", "other"),
+ checked: checked("meetingLocationType", "other") if data['changeMode'] == 'true' else false,
conditional: { html: otherHtml }
}
]
diff --git a/app/views/bfs/meetings-2/confirm-arrangements/support-needs.html b/app/views/bfs/meetings-2/confirm-arrangements/support-needs.html
index cf2006d8..c7cd99bc 100644
--- a/app/views/bfs/meetings-2/confirm-arrangements/support-needs.html
+++ b/app/views/bfs/meetings-2/confirm-arrangements/support-needs.html
@@ -46,7 +46,7 @@
{% endif %}
-
+
@@ -60,7 +60,7 @@
-
+
@@ -81,7 +81,7 @@
{% endif %}
-
+
@@ -95,7 +95,7 @@
-
+
diff --git a/app/views/bfs/meetings-2/confirm-arrangements/who-requested-meeting.html b/app/views/bfs/meetings-2/confirm-arrangements/who-requested-meeting.html
index 23056b9a..7db4d2e0 100644
--- a/app/views/bfs/meetings-2/confirm-arrangements/who-requested-meeting.html
+++ b/app/views/bfs/meetings-2/confirm-arrangements/who-requested-meeting.html
@@ -42,17 +42,17 @@
{
value: "family",
text: "A bereaved family member requested it",
- checked: checked("meetingRequestedBy", "family")
+ checked: checked("meetingRequestedBy", "family") if data['changeMode'] == 'true' else false
},
{
value: "cps",
text: "CPS offered and the bereaved family accepted",
- checked: checked("meetingRequestedBy", "cps")
+ checked: checked("meetingRequestedBy", "cps") if data['changeMode'] == 'true' else false
},
{
value: "third-party",
text: "Requested by a third party",
- checked: checked("meetingRequestedBy", "third-party"),
+ checked: checked("meetingRequestedBy", "third-party") if data['changeMode'] == 'true' else false,
hint: {
"text": "For example, a family liaison officer or another representative"
}
diff --git a/app/views/bfs/meetings-2/cps-offer/has-victim-accepted.html b/app/views/bfs/meetings-2/cps-offer/has-victim-accepted.html
index a6ca3107..c60bd514 100644
--- a/app/views/bfs/meetings-2/cps-offer/has-victim-accepted.html
+++ b/app/views/bfs/meetings-2/cps-offer/has-victim-accepted.html
@@ -15,7 +15,7 @@
You have sent one meeting offer to Sarah Phillips's
{{ govukRadios({
name: "meeting4",
- value: data['meeting4'],
+ value: data['meeting4'] if data['changeMode'] == 'true',
fieldset: {
legend: {
text: "Do you want to log an acceptance?",
diff --git a/app/views/bfs/meetings-2/cps-offer/how-when-accepted.html b/app/views/bfs/meetings-2/cps-offer/how-when-accepted.html
index 26b43e76..ad7211b3 100644
--- a/app/views/bfs/meetings-2/cps-offer/how-when-accepted.html
+++ b/app/views/bfs/meetings-2/cps-offer/how-when-accepted.html
@@ -46,7 +46,7 @@
{% for recipient in recipients %}
{% if not data['recordaccepted' + loop.index] and not data['recorddeclined' + loop.index] and not data['recordnoresponse' + loop.index] %}
{% for recipient in recipients %}
{% if not data['recordaccepted' + loop.index] and not data['recorddeclined' + loop.index] and not data['recordnoresponse' + loop.index] %}
{% for recipient in recipients %}
{% if not data['recordaccepted' + loop.index] and not data['recorddeclined' + loop.index] and not data['recordnoresponse' + loop.index] %}
-
+
diff --git a/app/views/bfs/victim/pre-trial/meetings-panel.html b/app/views/bfs/victim/pre-trial/meetings-panel.html
index 773fb2bc..fbeee818 100644
--- a/app/views/bfs/victim/pre-trial/meetings-panel.html
+++ b/app/views/bfs/victim/pre-trial/meetings-panel.html
@@ -2,14 +2,11 @@
{% set meetingState = data['meetingState'] %}
{% set knownMeetingStates = ['arranged', 'offered', 'offered-multi', 'no-response', 'not-offered', 'responses', 'outcome', 'outcome-no', 'rescheduled', 'cancelled'] %}
-{# Summary card title = purpose of this meeting (set in the onboarding / task creation journey via meetingPurpose). #}
-{% if data['meetingPurpose'] == "pre-trial" %}{% set meetingPurposeTitle = "CPS pre-trial meeting" %}
-{% elif data['meetingPurpose'] == "charging-decision" %}{% set meetingPurposeTitle = "Inform victim about charging decision" %}
-{% elif data['meetingPurpose'] == "stopped-altered" %}{% set meetingPurposeTitle = "Stopped or substantially altered charge (VCL Scheme)" %}
-{% elif data['meetingPurpose'] == "vrr" %}{% set meetingPurposeTitle = "Victims' Right to Review (VRR)" %}
-{% elif data['meetingPurpose'] == "complaint" %}{% set meetingPurposeTitle = "Victim complaint" %}
-{% elif data['meetingPurpose'] == "other" %}{% set meetingPurposeTitle = data['meetingPurposeDetails'] %}
-{% else %}{% set meetingPurposeTitle = "CPS pre-trial meeting" %}{% endif %}
+{# A meeting task created during onboarding / task creation that has not been logged yet. #}
+{% set hasPendingMeetingTask = data['existingTask'] in ['meeting-offer', 'meeting-arranged', 'meeting-outcome'] %}
+
+{# Summary card title = purpose of this meeting (set in the onboarding / task creation journey via data['meetingPurpose']). #}
+{% set meetingPurpose = data['meetingPurpose'] | meetingPurposeLabel(data['meetingPurposeDetails']) %}
{% if data['meetingSuccess'] == 'yes' and meetingState in knownMeetingStates %}
@@ -21,27 +18,27 @@
{% if meetingState == 'arranged' %}
- CPS pre-trial meeting arranged.
+ {{ meetingPurpose }} arranged.
{% elif meetingState == 'offered' or meetingState == 'offered-multi' %}
- CPS pre-trial meeting offer logged.
+ {{ meetingPurpose }} offer logged.
{% elif meetingState == 'no-response' %}
- No response was logged for the CPS pre-trial meeting offer.
+ No response was logged for the {{ meetingPurpose }} offer.
{% elif meetingState == 'not-offered' %}
- CPS pre-trial meeting not offered.
+ {{ meetingPurpose }} not offered.
{% elif meetingState == 'responses' %}
{% if data['lastResponseType'] == 'declined' %}
- CPS pre-trial meeting offer declined.
+ {{ meetingPurpose }} offer declined.
{% elif data['lastResponseType'] == 'no-response' %}
- No response to the CPS pre-trial meeting offer was logged.
+ No response to the {{ meetingPurpose }} offer was logged.
{% else %}
- CPS pre-trial meeting offer accepted.
+ {{ meetingPurpose }} offer accepted.
{% endif %}
{% elif meetingState == 'outcome' or meetingState == 'outcome-no' %}
- CPS pre-trial meeting outcome logged.
+ {{ meetingPurpose }} outcome logged.
{% elif meetingState == 'rescheduled' %}
- CPS pre-trial meeting details changed.
+ {{ meetingPurpose }} details changed.
{% elif meetingState == 'cancelled' %}
- CPS pre-trial meeting cancelled.
+ {{ meetingPurpose }} cancelled.
{% endif %}
@@ -70,6 +67,8 @@
{% include "/bfs/victim/pre-trial/states/rescheduled.html" %}
{% elif meetingState == 'cancelled' %}
{% include "/bfs/victim/pre-trial/states/cancelled.html" %}
+{% elif hasPendingMeetingTask %}
+ {% include "/bfs/victim/pre-trial/states/pending.html" %}
{% else %}
{% include "/bfs/victim/pre-trial/states/none.html" %}
{% endif %}
diff --git a/app/views/bfs/victim/pre-trial/states/no-response.html b/app/views/bfs/victim/pre-trial/states/no-response.html
index 69f07853..44f48626 100644
--- a/app/views/bfs/victim/pre-trial/states/no-response.html
+++ b/app/views/bfs/victim/pre-trial/states/no-response.html
@@ -12,7 +12,7 @@
- No response to the CPS pre-trial meeting offer has been received.
+ No response to the {{ meetingPurpose or "CPS pre-trial meeting" }} offer has been received.
{% include "/bfs/meetings-2/cps-offer/partials/no-response-offers.html" %}
diff --git a/app/views/bfs/victim/pre-trial/states/pending.html b/app/views/bfs/victim/pre-trial/states/pending.html
new file mode 100644
index 00000000..78f2d461
--- /dev/null
+++ b/app/views/bfs/victim/pre-trial/states/pending.html
@@ -0,0 +1,35 @@
+
+
+
+ {{ meetingPurpose or "CPS pre-trial meeting" }}
+