Merge Prod Release into Master

src/main/java/uk/gov/dvsa/enums/CertificateTypes.java

@@ -30,6 +30,7 @@ public enum CertificateTypes {
     CVS_FAIL_WELSH("CVS/VTP30W"),
     CVS_FAIL_BILINGUAL("CVS/VTP30_BILINGUAL"),
     CVS_PSV_PRS("CVS/PSV_PRS"),
+    CVS_PSV_PRS_BILINGUAL("CVS/PSV_PRS_BILINGUAL"),
 
     CVS_HGV_PASS("CVS/VTG5"),
     CVS_HGV_PASS_WELSH("CVS/VTG5W"),
@@ -41,7 +42,9 @@ public enum CertificateTypes {
     CVS_HGV_TRL_FAIL_WELSH("CVS/VTG30W"),
     CVS_HGV_TRL_FAIL_BILINGUAL("CVS/VTG30_BILINGUAL"),
     CVS_HGV_PRS("CVS/HGV_PRS"),
+    CVS_HGV_PRS_BILINGUAL("CVS/HGV_PRS_BILINGUAL"),
     CVS_TRL_PRS("CVS/TRL_PRS"),
+    CVS_TRL_PRS_BILINGUAL("CVS/TRL_PRS_BILINGUAL"),
     RWT_DATA("CVS/RWT"),
     ADR_PASS("CVS/ADR_PASS"),
     VTG6_VTG7("CVS/VTG6_VTG7"),

src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java

@@ -44,6 +44,9 @@ public enum DocumentsConfig {
 
     CVS_PSV_PRS(CertificateTypes.CVS_PSV_PRS.getCertificateType(), CvsPsvPRS.class,
             new String[]{CertificateTemplates.VTP20.getCertificateTemplateName(), CertificateTemplates.VTP30.getCertificateTemplateName()}),
+    CVS_PSV_PRS_BILINGUAL(CertificateTypes.CVS_PSV_PRS_BILINGUAL.getCertificateType(), CvsPsvPRSBilingual.class,
+            new String[]{CertificateTemplates.VTP20.getCertificateTemplateName(), CertificateTemplates.VTP30.getCertificateTemplateName(),
+                    CertificateTemplates.VTP20W.getCertificateTemplateName(), CertificateTemplates.VTP30W.getCertificateTemplateName()}),
     VTP20(CertificateTypes.CVS_PASS.getCertificateType(), uk.gov.dvsa.model.cvs.VTP20.class,
             new String[]{CertificateTemplates.VTP20.getCertificateTemplateName()}),
     VTP20W(CertificateTypes.CVS_PASS_WELSH.getCertificateType(), uk.gov.dvsa.model.cvs.VTP20W.class,
@@ -80,6 +83,9 @@ public enum DocumentsConfig {
             new String[]{CertificateTemplates.RWT_DATA.getCertificateTemplateName()}),
     CVS_HGV_PRS(CertificateTypes.CVS_HGV_PRS.getCertificateType(), uk.gov.dvsa.model.cvs.CvsHgvPRS.class,
             new String[]{CertificateTemplates.VTG5.getCertificateTemplateName(), CertificateTemplates.VTG30.getCertificateTemplateName()}),
+    CVS_HGV_PRS_BILINGUAL(CertificateTypes.CVS_HGV_PRS_BILINGUAL.getCertificateType(), uk.gov.dvsa.model.cvs.CvsHgvPRSBilingual.class,
+            new String[]{CertificateTemplates.VTG5.getCertificateTemplateName(), CertificateTemplates.VTG30.getCertificateTemplateName(),
+            CertificateTemplates.VTG5W.getCertificateTemplateName(), CertificateTemplates.VTG30W.getCertificateTemplateName()}),
     CVS_PASS_BILINGUAL(CertificateTypes.CVS_PASS_BILINGUAL.getCertificateType(), uk.gov.dvsa.model.cvs.CvsPsvPassBilingual.class,
             new String[]{CertificateTemplates.VTP20.getCertificateTemplateName(), CertificateTemplates.VTP20W.getCertificateTemplateName()}),
     CVS_HGV_PASS_BILINGUAL(CertificateTypes.CVS_HGV_PASS_BILINGUAL.getCertificateType(), uk.gov.dvsa.model.cvs.CvsHgvPassBilingual.class,
@@ -91,6 +97,10 @@ public enum DocumentsConfig {
     CVS_TRL_PRS(CertificateTypes.CVS_TRL_PRS.getCertificateType(), uk.gov.dvsa.model.cvs.CvsTrlPRS.class,
             new String[]{CertificateTemplates.VTG5A.getCertificateTemplateName(), CertificateTemplates.VTG30.getCertificateTemplateName()}),
 
+    CVS_TRL_PRS_BILINGUAL(CertificateTypes.CVS_TRL_PRS_BILINGUAL.getCertificateType(), uk.gov.dvsa.model.cvs.CvsTrlPRSBilingual.class,
+            new String[]{CertificateTemplates.VTG5A.getCertificateTemplateName(), CertificateTemplates.VTG30.getCertificateTemplateName(),
+                    CertificateTemplates.VTG5AW.getCertificateTemplateName(), CertificateTemplates.VTG30W.getCertificateTemplateName()}),
+
     INSPECTION_CHECKLIST(CertificateTypes.INSPECTION_CHECKLIST.getCertificateType(), InspectionChecklist.class,
             new String[]{CertificateTemplates.INSPECTION_CHECKLIST.getCertificateTemplateName()}),
 

src/main/java/uk/gov/dvsa/model/cvs/CvsHgvPRSBilingual.java

@@ -0,0 +1,32 @@
+package uk.gov.dvsa.model.cvs;
+
+import uk.gov.dvsa.model.Document;
+import uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateDataWelsh;
+
+public class CvsHgvPRSBilingual extends CvsHgvTrlFailBilingual {
+
+    public String getTestType() {
+        return "HGV";
+    }
+
+    public String getPresentedDocumentNamePass() {
+        return "VTG5";
+    }
+
+    public String getPresentedDocumentNamePassWelsh() {
+        return "VTG5W";
+    }
+
+    public String getVersionNumberPass() {
+        return "1.0";
+    }
+
+    public String getVersionNumberPassWelsh() {
+        return "1.0";
+    }
+
+    public Document setData(CvsMotCertificateDataWelsh data) {
+        this.data = data;
+        return this;
+    }
+}

src/main/java/uk/gov/dvsa/model/cvs/CvsPsvPRSBilingual.java

@@ -0,0 +1,27 @@
+package uk.gov.dvsa.model.cvs;
+
+import uk.gov.dvsa.model.Document;
+import uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateDataWelsh;
+
+public class CvsPsvPRSBilingual extends VTP30Bilingual {
+    public String getPresentedDocumentNamePass() {
+        return "VTP20";
+    }
+
+    public String getPresentedDocumentNamePassWelsh() {
+        return "VTP20W";
+    }
+
+    public String getVersionNumberPass() {
+        return "1.0";
+    }
+
+    public String getVersionNumberPassWelsh() {
+        return "1.0";
+    }
+
+    public Document setData(CvsMotCertificateDataWelsh data) {
+        this.data = data;
+        return this;
+    }
+}

src/main/java/uk/gov/dvsa/model/cvs/CvsTrlPRSBilingual.java

@@ -0,0 +1,31 @@
+package uk.gov.dvsa.model.cvs;
+
+import uk.gov.dvsa.model.Document;
+import uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateDataWelsh;
+
+public class CvsTrlPRSBilingual extends CvsHgvTrlFailBilingual {
+    public String getTestType() {
+        return "TRL";
+    }
+
+    public String getPresentedDocumentNamePass() {
+        return "VTG5A";
+    }
+
+    public String getPresentedDocumentNamePassWelsh() {
+        return "VTG5AW";
+    }
+
+    public String getVersionNumberPass() {
+        return "1.0";
+    }
+
+    public String getVersionNumberPassWelsh() {
+        return "1.0";
+    }
+
+    public Document setData(CvsMotCertificateDataWelsh data) {
+        this.data = data;
+        return this;
+    }
+}

src/main/resources/views/CommercialVehicles/ADR_PASS.hbs

@@ -21,11 +21,16 @@
                 {{#if adrData.isApplicantDetailsNull}}
                     <br/>
                 {{else}}
-                    <p>{{#if adrData.applicantDetails.name}}<span id="applicantDetailsName">{{adrData.applicantDetails.name}}</span>{{/if}} </p>
-                    <p>{{#if adrData.applicantDetails.address1}}<span id="applicantDetailsStreet">{{adrData.applicantDetails.address1}}, </span>{{/if}}
-                    {{#if adrData.applicantDetails.address2}}<span id="applicantDetailsTown">{{adrData.applicantDetails.address2}}, </span>{{/if}}
-                    {{#if adrData.applicantDetails.city}}<span id="applicantDetailsCity">{{adrData.applicantDetails.city}}, </span>{{/if}}
-                    {{#if adrData.applicantDetails.postCode}}<span id="applicantDetailsPostCode">{{adrData.applicantDetails.postCode}}</span>{{/if}} </p>
+                    <p>{{#if adrData.applicantDetails.name}}
+                        <span id="applicantDetailsName">{{adrData.applicantDetails.name}}</span>{{/if}} </p>
+                    <p>{{#if adrData.applicantDetails.address1}}
+                        <span id="applicantDetailsStreet">{{adrData.applicantDetails.address1}}, </span>{{/if}}
+                        {{#if adrData.applicantDetails.postTown}}
+                            <span id="applicantDetailsTown">{{adrData.applicantDetails.postTown}}, </span>{{/if}}
+                        {{#if adrData.applicantDetails.address2}}
+                            <span id="applicantDetailsCity">{{adrData.applicantDetails.address2}}, </span>{{/if}}
+                        {{#if adrData.applicantDetails.postCode}}
+                            <span id="applicantDetailsPostCode">{{adrData.applicantDetails.postCode}}</span>{{/if}} </p>
                 {{/if}}
             </div>
             <div class="adrVehicleType">

src/main/resources/views/CommercialVehicles/IVA30.hbs

@@ -34,7 +34,7 @@
     <span class="footer-total-page-count"></span>
 </div>
 <div class = "footer-right">
-    <p><b>Version 1.0 Apr 2024</b></p>
+    <p><b>Version 1.1 June 2024</b></p>
 </div>
 
 
@@ -112,7 +112,7 @@
                         <img id="signature-first-page" class="signature-image" src="{{signature.formattedImageData}}" alt="signature"/>                    </div>
                 </div>
             </td>
-            <td class="table-row-cell" id="re-app-date"> <b>Reapplication required by: </b> {{ivaData.reapplicationDate}} </td>
+            <td class="table-row-cell" id="re-app-date"> <b>Reapplication required by: </b> </td>
         </tr>
         <tr>
             <td class="table-row-cell" id="date"> <b>Date: </b>  {{ivaData.date}} </td>
@@ -171,7 +171,7 @@
         <div class="section-text-wrapper">
             <p> This notification indicates the items of non-compliance being the reason(s)
                 why an Individual Approval Certificate (IAC) has not been issued. An application
-                for re-examination can be made up to 6 calendar months following the issue date
+                for re-examination must be made no later than 6 months following the issue date
                 of the first "Notification of Refusal" in respect of the original application.
                 In any other case, a new application and a full fee must be submitted.</p>
             <p> When modification/rectification has been completed, or additional evidence of

src/main/resources/views/CommercialVehicles/MSVA30.hbs

@@ -34,7 +34,7 @@
     <span class="footer-total-page-count"></span>
 </div>
 <div class = "footer-right">
-    <p><b>Version 1.0 May 2024</b></p>
+    <p><b>Version 1.1 June 2024</b></p>
 </div>
 
 
@@ -107,7 +107,7 @@
                         <img id="signature-first-page" class="signature-image" src="{{signature.formattedImageData}}" alt="signature"/>                    </div>
                 </div>
             </td>
-            <td class="table-row-cell" id="re-app-date"> <b>Retest required by: </b> {{msvaData.retestDate}} </td>
+            <td class="table-row-cell" id="re-app-date"> <b>Reapplication required by: </b> </td>
         </tr>
         <tr>
             <td class="table-row-cell" id="date"> <b>Date: </b> {{msvaData.date}} </td>
@@ -166,7 +166,7 @@
         <div class="section-text-wrapper">
             <p> This notification indicates the items of non-compliance being the reason(s)
                 why a Minister's Approval Certificate (MAC) has not been issued. An application
-                for re-examination can be made up to 6 calendar months following the issue date
+                for re-examination must be made no later than 6 months following the issue date
                 of the first "Notification of Refusal" in respect of the original application.
                 In any other case, a new application and a full fee must be submitted.</p>
             <p> When modification/rectification, etc. has been completed an application for a re-examination (verbally or in writing)

src/test/java/htmlverification/framework/component/DefectSummaryComponent.java

@@ -19,9 +19,8 @@ public class DefectSummaryComponent {
     public static final String MAJOR_DEFECTS_HEADER_TEXT_WELSH_CVS = "Atgyweirio ar unwaith (diffygion mawr)";
     public static final String  DANGEROUS_DEFECTS_HEADER_PARTIAL_TEXT_WELSH = "Peidiwch â gyrru nes iddo gael ei drwsio (diffygion peryglus)";
     public static final String DANGEROUS_DEFECTS_HEADER_PARTIAL_TEXT_WELSH_CVS = "Peidiwch â gyrru nes ei fod wedi cael ei atgyweirio (diffygion peryglus)";
-
     public static final String DANGEROUS_DEFECTS_HEADER_TEXT_WELSH_CVS = "Peidiwch â gyrru nes ei fod wedi cael ei atgyweirio";
-
+    public static final String PRS_DEFECTS_HEADER_TEXT_WELSH_CVS = "Diffygion wedi'u cywiro ar adeg y prawf";
     //CVS only
     public static final String  PRS_DEFECTS_HEADER_TEXT = "Monitor and repair if necessary (advisories)";