From 15f8d8f2dea854ca92d431f7d0bacbb727f615ea Mon Sep 17 00:00:00 2001 From: Craig Broady Date: Tue, 22 Aug 2023 11:54:55 +0100 Subject: [PATCH] update to test --- .../uk/gov/dvsa/enums/DocumentsConfig.java | 2 +- .../dvsa/model/cvs/CvsHgvPassBilingual.java | 2 +- .../java/uk/gov/dvsa/model/cvs/VTG5W.java | 4 +- .../CvsMotCertificateDataWelsh.java | 13 ++--- .../CvsMotFailCertificateData.java | 1 - .../passNoSeatbeltFieldsWelsh.hbs | 55 ++++++++++--------- 6 files changed, 38 insertions(+), 39 deletions(-) diff --git a/src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java b/src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java index 2306f704..4d25f780 100644 --- a/src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java +++ b/src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java @@ -70,7 +70,7 @@ 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_PASS_B(CertificateTypes.CVS_HGV_PASS_BILINGUAL.getCertificateType(), uk.gov.dvsa.model.cvs.CvsHgvPassBilingual.class, + CVS_HGV_PASS_BILINGUAL(CertificateTypes.CVS_HGV_PASS_BILINGUAL.getCertificateType(), uk.gov.dvsa.model.cvs.CvsHgvPassBilingual.class, new String[]{CertificateTemplates.VTG5.getCertificateTemplateName(), CertificateTemplates.VTG5W.getCertificateTemplateName()}), CVS_TRL_PRS(CertificateTypes.CVS_TRL_PRS.getCertificateType(), uk.gov.dvsa.model.cvs.CvsTrlPRS.class, new String[]{CertificateTemplates.VTG5A.getCertificateTemplateName(), CertificateTemplates.VTG30.getCertificateTemplateName()}), diff --git a/src/main/java/uk/gov/dvsa/model/cvs/CvsHgvPassBilingual.java b/src/main/java/uk/gov/dvsa/model/cvs/CvsHgvPassBilingual.java index 80c0c013..37237732 100644 --- a/src/main/java/uk/gov/dvsa/model/cvs/CvsHgvPassBilingual.java +++ b/src/main/java/uk/gov/dvsa/model/cvs/CvsHgvPassBilingual.java @@ -1,6 +1,6 @@ package uk.gov.dvsa.model.cvs; -public class CvsHgvPassBilingual extends CvsMotCertificate { +public class CvsHgvPassBilingual extends VTG5W { public String getTestType() { return "HGV"; } diff --git a/src/main/java/uk/gov/dvsa/model/cvs/VTG5W.java b/src/main/java/uk/gov/dvsa/model/cvs/VTG5W.java index a59e6418..f6133c42 100644 --- a/src/main/java/uk/gov/dvsa/model/cvs/VTG5W.java +++ b/src/main/java/uk/gov/dvsa/model/cvs/VTG5W.java @@ -1,11 +1,11 @@ package uk.gov.dvsa.model.cvs; import uk.gov.dvsa.model.Document; -import uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateData; +import uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateDataWelsh; public class VTG5W extends CvsMotCertificate { - public Document setData(CvsMotCertificateData data) { + public Document setData(CvsMotCertificateDataWelsh data) { this.data = data; return this; } diff --git a/src/main/java/uk/gov/dvsa/model/cvs/certificateData/CvsMotCertificateDataWelsh.java b/src/main/java/uk/gov/dvsa/model/cvs/certificateData/CvsMotCertificateDataWelsh.java index f67e417b..2f28e6d2 100644 --- a/src/main/java/uk/gov/dvsa/model/cvs/certificateData/CvsMotCertificateDataWelsh.java +++ b/src/main/java/uk/gov/dvsa/model/cvs/certificateData/CvsMotCertificateDataWelsh.java @@ -1,18 +1,17 @@ package uk.gov.dvsa.model.cvs.certificateData; import com.fasterxml.jackson.annotation.JsonProperty; -import uk.gov.dvsa.model.mot.certificateData.MotCertificateData; import uk.gov.dvsa.model.mot.results.DefectsList; import java.util.List; -public class CvsMotCertificateDataWelsh extends MotCertificateData { +public class CvsMotCertificateDataWelsh extends CvsMotCertificateData { - public static final String ADVISORIES_HEADER_WELSH = ""; - public static final String MINOR_DEFECTS_HEADER_WELSH = ""; - public static final String PASS_SUMMARY_HEADER_WELSH = ""; - public static final String PASS_WITH_DEFECTS_HEADER_WELSH = ""; - public static final String TESTING_ORGANISATION_WELSH = ""; + public static final String ADVISORIES_HEADER_WELSH = "advisories welsh"; + public static final String MINOR_DEFECTS_HEADER_WELSH = "minors welsh"; + public static final String PASS_SUMMARY_HEADER_WELSH = "passio"; + public static final String PASS_WITH_DEFECTS_HEADER_WELSH = "pass with defects welsh"; + public static final String TESTING_ORGANISATION_WELSH = "dvsa welsh org"; @JsonProperty("AdvisoryDefectsWelsh") private List advisoryDefectsWelsh; diff --git a/src/main/java/uk/gov/dvsa/model/cvs/certificateData/CvsMotFailCertificateData.java b/src/main/java/uk/gov/dvsa/model/cvs/certificateData/CvsMotFailCertificateData.java index bca53dfe..a29a3a36 100644 --- a/src/main/java/uk/gov/dvsa/model/cvs/certificateData/CvsMotFailCertificateData.java +++ b/src/main/java/uk/gov/dvsa/model/cvs/certificateData/CvsMotFailCertificateData.java @@ -28,7 +28,6 @@ public class CvsMotFailCertificateData extends CvsMotCertificateData { @JsonProperty("PRSDefects") private List prsDefects; - public CvsMotFailCertificateData setDangerousDefects(List dangerousDefects) { this.dangerousDefects = dangerousDefects; return this; diff --git a/src/main/resources/views/CommercialVehicles/passNoSeatbeltFieldsWelsh.hbs b/src/main/resources/views/CommercialVehicles/passNoSeatbeltFieldsWelsh.hbs index 11d7efb9..2774e109 100644 --- a/src/main/resources/views/CommercialVehicles/passNoSeatbeltFieldsWelsh.hbs +++ b/src/main/resources/views/CommercialVehicles/passNoSeatbeltFieldsWelsh.hbs @@ -1,7 +1,7 @@ - MOT certificate Welsh ({{testType}}) + Tystysgrif prawf MOT ({{testType}}) @@ -19,16 +19,16 @@
- Page + Tudalen - of + o
-
Issuer signature
+
Llofnod y cyhoeddwr
@@ -54,18 +54,18 @@
- Page + Tudalen - of + o
-
Issuer signature
+
Llofnod y cyhoeddwr
@@ -86,7 +86,7 @@ {{#if reissue}}

{{reissue.reason}}

{{/if}} - MOT test certificate ({{testType}}) + Tystysgrif prawf MOT ({{testType}})
@@ -98,7 +98,7 @@ - Vehicle identification number + Rhif adnabod cerbyd @@ -141,7 +141,7 @@ - Country of registration + Gwlad cofrestru @@ -163,7 +163,7 @@ - Registration Number + Rhif cofrestru @@ -180,7 +180,7 @@

- Make and model + Math a model

@@ -206,7 +206,7 @@ - Vehicle category + Categori cerbyd @@ -228,7 +228,7 @@ - Odometer + Odomedr @@ -244,7 +244,7 @@

- Odometer history + Hanes odomedr

@@ -309,7 +309,7 @@ - Date of the test + Dyddiad y prawf @@ -330,7 +330,7 @@ - Expiry date + Dyddiad dod i ben @@ -343,8 +343,8 @@

- To preserve the anniversary of the expiry date, the earliest you can present your vehicle for test - is {{data.earliestDateOfTheNextTest}}. + Er mwyn cadw pen-blwydd y dyddiad dod i ben, y cynharaf y gallwch chi gyflwyno'ch cerbyd ar gyfer prawf + yw {{data.earliestDateOfTheNextTest}}.

@@ -356,7 +356,7 @@ - Location of the test + Lleoliad y prawf @@ -375,7 +375,7 @@ - Testing organisation and inspector + Sefydliad ac arolygydd y prawf @@ -391,7 +391,7 @@

- Test number + Rhif prawf

@@ -408,18 +408,19 @@

- Check that this document is genuine by visiting www.gov.uk/check-mot-history

- If any of the details are not correct, please contact DVSA by email at
test.errors@dvsa.gov.uk or by telephone on 0300 1239000. + href="mailto:test.errors@dvsa.gov.uk">test.errors@dvsa.gov.uk neu drwy ffonio 0300 1239000.

- Receive a free annual MOT reminder by subscribing
at ar wefan www.gov.uk/mot-reminder - or by telephone on 0300 1239000. + neu drwy ffôn ar 0300 1239000.