Enhance meetings-2 workflow with validation and case-locked checks

app/assets/javascripts/shared/meetings-2/due-date.js

@@ -0,0 +1,75 @@
+// Validation for the not guilty plea date field on the meetings-2 due-date page.
+// Two scenarios: mandatory field, and the date must be in the past.
+function validateForm() {
+    // Clear previous errors
+    $('#error-form-group').removeClass('govuk-form-group--error');
+    $('#error-message-1').remove();
+    $('#ngp-date').removeClass('govuk-input--error');
+    $('#error-summary').remove();
+
+    var dateValue = document.getElementById('ngp-date').value;
+    var dateDatePicker = $('#ngp-date-picker');
+    var errorMessage = validateDate(dateValue);
+
+    if (errorMessage) {
+        // Error form group styling
+        $('#error-form-group').addClass('govuk-form-group--error');
+
+        // Error message below the label, before the date picker
+        dateDatePicker.before('<p id="error-message-1" class="govuk-error-message"><span class="govuk-visually-hidden">Error:</span> ' + errorMessage + '</p>');
+
+        // Error input field styling
+        $('#ngp-date').addClass('govuk-input--error');
+
+        // Error summary at the top
+        $('form').before(
+            '<div id="error-summary" class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary"><h2 class="govuk-error-summary__title" id="error-summary-title">There is a problem</h2><div class="govuk-error-summary__body"><ul class="govuk-list govuk-error-summary__list"><li><a href="#ngp-date">' + errorMessage + '</a></li></ul></div></div>'
+        );
+        $('#error-summary').focus();
+
+        return false;
+    }
+
+    return true;
+}
+
+function validateDate(dateString) {
+    // Mandatory field
+    if (!dateString || dateString.trim() === '') {
+        return 'Enter the date the defendant pleaded not guilty';
+    }
+
+    // Check format (DD/MM/YYYY)
+    var datePattern = /^(\d{1,2})\/(\d{1,2})\/(\d{4})$/;
+    var match = dateString.match(datePattern);
+
+    if (!match) {
+        return 'Enter the date in the correct format, like 20/08/2026';
+    }
+
+    var day = parseInt(match[1], 10);
+    var month = parseInt(match[2], 10);
+    var year = parseInt(match[3], 10);
+
+    // Check valid month
+    if (month < 1 || month > 12) {
+        return 'Enter a real date';
+    }
+
+    // Check valid day for month
+    var daysInMonth = new Date(year, month, 0).getDate();
+    if (day < 1 || day > daysInMonth) {
+        return 'Enter a real date';
+    }
+
+    // Must be today or in the past
+    var inputDate = new Date(year, month - 1, day);
+    var today = new Date();
+    today.setHours(0, 0, 0, 0);
+
+    if (inputDate > today) {
+        return 'The date the defendant pleaded not guilty must be today or in the past';
+    }
+
+    return null; // No error
+}

app/assets/javascripts/shared/meetings-2/meeting-due-date.js

@@ -0,0 +1,59 @@
+// Validation for the meetings-2 meeting-due-date page.
+// The radio question is mandatory. If "By another date" is selected, the
+// conditional date field is also mandatory.
+function validateForm() {
+    // Clear previous errors
+    $('#error-form-group-1').removeClass('govuk-form-group--error');
+    $('#error-form-group-2').removeClass('govuk-form-group--error');
+    $('#error-message-1').remove();
+    $('#error-message-2').remove();
+    $('#meeting-due-date').removeClass('govuk-input--error');
+    $('#error-summary').remove();
+
+    var selectedOption = $('[name=meetingDueOption]:checked').val();
+    var dueDateValue = document.getElementById('meeting-due-date').value;
+
+    var optionError = null;
+    var dateError = null;
+
+    // The radio question is mandatory
+    if (!selectedOption) {
+        optionError = 'Select when the offer is due for the CPS pre-trial meeting';
+    } else if (selectedOption === 'other-date' && dueDateValue.trim() === '') {
+        // Conditional date field is mandatory when "By another date" is chosen
+        dateError = 'Enter the meeting offer due date';
+    }
+
+    if (optionError || dateError) {
+        // Error summary at the top
+        var summaryItems = '';
+        if (optionError) {
+            summaryItems += '<li><a href="#meeting-due-plea">' + optionError + '</a></li>';
+        }
+        if (dateError) {
+            summaryItems += '<li><a href="#meeting-due-date">' + dateError + '</a></li>';
+        }
+
+        $('form').before(
+            '<div id="error-summary" class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary"><h2 class="govuk-error-summary__title" id="error-summary-title">There is a problem</h2><div class="govuk-error-summary__body"><ul class="govuk-list govuk-error-summary__list">' + summaryItems + '</ul></div></div>'
+        );
+        $('#error-summary').focus();
+
+        // Radio question error
+        if (optionError) {
+            $('#error-form-group-1').addClass('govuk-form-group--error');
+            $('#ngp-date-hint1').after('<p id="error-message-1" class="govuk-error-message"><span class="govuk-visually-hidden">Error:</span> ' + optionError + '</p>');
+        }
+
+        // Conditional date field error
+        if (dateError) {
+            $('#error-form-group-2').addClass('govuk-form-group--error');
+            $('#meeting-due-date').addClass('govuk-input--error');
+            $('#meeting-due-date-picker').before('<p id="error-message-2" class="govuk-error-message"><span class="govuk-visually-hidden">Error:</span> ' + dateError + '</p>');
+        }
+
+        return false;
+    }
+
+    return true;
+}

app/filters.js

@@ -65,6 +65,23 @@
   return `${dayOfWeek}, ${dayOfMonth} ${month} ${year}`
 })
 
+// Add N days to a dd/mm/yyyy date and return dd/mm/yyyy. Pipe to formatDate for display.
+addFilter('addDays', (dateString, days) => {
+  if (!dateString || !dateString.includes('/')) return dateString
+  const parts = dateString.split('/')
+  if (parts.length !== 3) return dateString
+  const day = parseInt(parts[0], 10)
+  const month = parseInt(parts[1], 10) - 1
+  const year = parseInt(parts[2], 10)
+  const date = new Date(year, month, day)
+  if (isNaN(date.getTime())) return dateString
+  date.setDate(date.getDate() + Number(days || 0))
+  const dd = String(date.getDate()).padStart(2, '0')
+  const mm = String(date.getMonth() + 1).padStart(2, '0')
+  const yyyy = date.getFullYear()
+  return `${dd}/${mm}/${yyyy}`
+})
+
 addFilter('ageFromDob', dobString => {
   if (!dobString) return ''
   const parts = dobString.split('/')

app/routes/meetings.js

@@ -728,7 +728,7 @@
 
     router.post('/log-outcome/did-meeting-happen2-answer', function(request, response) {
 
-        var meeting3 = request.session.data['meeting3']
+        var meeting3 = request.session.data['logMeetingHappened']
         if (meeting3 == "yes"){
             response.redirect("/v50/meetings-2/log-outcome/duration")
         } else {
@@ -1049,11 +1049,11 @@
     router.post('/log-outcome/any-actions-agreed2-answer', function(request, response) {
 
         var actionsAgreed2 = request.session.data['actionsAgreed2']
         if (actionsAgreed2 == "yes"){
             response.redirect("/v50/meetings-2/log-outcome/check-answers")
         } else {
-            response.redirect("/v50/meetings-2/log-outcome/check-answers-no")
+            response.redirect("/v50/meetings-2/log-outcome/check-answers")
         }
     })
 
 

app/routes/v50.js

@@ -37,6 +37,16 @@ module.exports = router => {
         response.redirect("/v50/tasks")
     })
 
+    router.post('/v50/meetings-2/due-date-answer', function(request, response) {
+
+        response.redirect("/v50/meetings-2/meeting-due-date")
+    })
+
+    router.post('/v50/meetings-2/meeting-due-date-answer', function(request, response) {
+
+        response.redirect("/v50/meetings-2/meeting-offered-date")
+    })
+
     router.post('/v50/onb/service-lead-answer', function(request, response) {
 
         response.redirect("/v50/onb/check-details?successNotification=yes&onboardedStatus=Yes")

app/views/v50/case-locked/by-someone-else.html

@@ -2,6 +2,10 @@
 
 {% set pageName="Case locked" %}
 
+{% block header %}
+{% include "/v50/partials/header/none-selected.html" %}
+{% endblock %}
+
 {% set mainClasses = "govuk-main-wrapper-extra-padding-top" %}
 
 {% block content %}
@@ -16,11 +20,11 @@
         <p class="govuk-body">
             We could not save the information you entered. To make an update, contact Gerald Kingsley-Smyth and ask them to exit the case.
         </p>
-        <p class="govuk-body">
+        <!-- <p class="govuk-body">
             To view the victim's information, search for the URN and select the victim's name again.
-        </p>
-        <a href="/v50/pcd/victim" class="govuk-button" data-module="govuk-button">
-            Continue
+        </p> -->
+        <a href="javascript:window.history.back()" class="govuk-button" data-module="govuk-button">
+            Go back
         </a>
     </div>
 </div>

app/views/v50/case-locked/self-locked.html

@@ -2,6 +2,10 @@
 
 {% set pageName="Case locked" %}
 
+{% block header %}
+{% include "/v50/partials/header/none-selected.html" %}
+{% endblock %}
+
 {% set mainClasses = "govuk-main-wrapper-extra-padding-top" %}
 
 {% block content %}
@@ -13,11 +17,11 @@
         <p class="govuk-body">
             We could not save the information you entered. To make an update, exit the case on CMS.
         </p>
-        <p class="govuk-body">
+        <!-- <p class="govuk-body">
             To view the victim's information, search for the URN and select the victim's name again.
-        </p>
-        <a href="/v50/pcd/victim" class="govuk-button" data-module="govuk-button">
-            Continue
+        </p> -->
+        <a href="javascript:window.history.back()" class="govuk-button" data-module="govuk-button">
+            Go back
         </a>
     </div>
 </div>