diff --git a/src/main/java/uk/gov/dvsa/enums/CertificateTemplates.java b/src/main/java/uk/gov/dvsa/enums/CertificateTemplates.java index b6d2054e..0064dbf8 100644 --- a/src/main/java/uk/gov/dvsa/enums/CertificateTemplates.java +++ b/src/main/java/uk/gov/dvsa/enums/CertificateTemplates.java @@ -25,6 +25,7 @@ public enum CertificateTemplates { VTG5("CommercialVehicles/passNoSeatbeltFields"), VTG5W("CommercialVehicles/passNoSeatbeltFieldsWelsh"), VTG5A("CommercialVehicles/passNoSeatbeltFields"), + VTG5AW("CommercialVehicles/passNoSeatbeltFieldsWelsh"), VTG30("CommercialVehicles/VTG30"), ADR_PASS("CommercialVehicles/ADR_PASS"), diff --git a/src/main/java/uk/gov/dvsa/enums/CertificateTypes.java b/src/main/java/uk/gov/dvsa/enums/CertificateTypes.java index 36dce0b1..b1ef81cc 100644 --- a/src/main/java/uk/gov/dvsa/enums/CertificateTypes.java +++ b/src/main/java/uk/gov/dvsa/enums/CertificateTypes.java @@ -32,6 +32,8 @@ public enum CertificateTypes { CVS_HGV_PASS_WELSH("CVS/VTG5W"), CVS_HGV_PASS_BILINGUAL("CVS/VTG5_BILINGUAL"), CVS_TRL_PASS("CVS/VTG5A"), + CVS_TRL_PASS_WELSH("CVS/VTG5AW"), + CVS_TRL_PASS_BILINGUAL("CVS/VTG5A_BILINGUAL"), CVS_HGV_TRL_FAIL("CVS/VTG30"), CVS_HGV_PRS("CVS/HGV_PRS"), CVS_TRL_PRS("CVS/TRL_PRS"), diff --git a/src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java b/src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java index 68ab3d64..85d4e65c 100644 --- a/src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java +++ b/src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java @@ -51,6 +51,8 @@ public enum DocumentsConfig { VTG5A(CertificateTypes.CVS_TRL_PASS.getCertificateType(), uk.gov.dvsa.model.cvs.VTG5A.class, new String[]{CertificateTemplates.VTG5A.getCertificateTemplateName()}), + VTG5AW(CertificateTypes.CVS_TRL_PASS_WELSH.getCertificateType(), uk.gov.dvsa.model.cvs.VTG5AW.class, + new String[]{CertificateTemplates.VTG5AW.getCertificateTemplateName()}), VTG5(CertificateTypes.CVS_HGV_PASS.getCertificateType(), uk.gov.dvsa.model.cvs.VTG5.class, new String[]{CertificateTemplates.VTG5.getCertificateTemplateName()}), VTG5W(CertificateTypes.CVS_HGV_PASS_WELSH.getCertificateType(), uk.gov.dvsa.model.cvs.VTG5W.class, @@ -72,6 +74,8 @@ public enum DocumentsConfig { new String[]{CertificateTemplates.VTG5.getCertificateTemplateName(), CertificateTemplates.VTG30.getCertificateTemplateName()}), 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_PASS_BILINGUAL(CertificateTypes.CVS_TRL_PASS_BILINGUAL.getCertificateType(), uk.gov.dvsa.model.cvs.CvsTrlPassBilingual.class, + new String[]{CertificateTemplates.VTG5A.getCertificateTemplateName(), CertificateTemplates.VTG5AW.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/CvsTrlPassBilingual.java b/src/main/java/uk/gov/dvsa/model/cvs/CvsTrlPassBilingual.java new file mode 100644 index 00000000..ad24146d --- /dev/null +++ b/src/main/java/uk/gov/dvsa/model/cvs/CvsTrlPassBilingual.java @@ -0,0 +1,28 @@ +package uk.gov.dvsa.model.cvs; + +public class CvsTrlPassBilingual extends VTG5AW { + + public String getTestType() { + return "Trailer"; + } + + public String getPresentedDocumentNamePass() { + return "VTG5A"; + } + + public String getPresentedDocumentNamePassWelsh() { + return "VTG5AW"; + } + + public String getVersionNumberPass() { + return "1.0"; + } + + public String getVersionNumberPassWelsh() { + return "1.0"; + } + + public String getRegOrIdHeading() { + return "Registration number"; + } +} diff --git a/src/main/java/uk/gov/dvsa/model/cvs/VTG5A.java b/src/main/java/uk/gov/dvsa/model/cvs/VTG5A.java index 62545843..25282fd5 100644 --- a/src/main/java/uk/gov/dvsa/model/cvs/VTG5A.java +++ b/src/main/java/uk/gov/dvsa/model/cvs/VTG5A.java @@ -23,6 +23,4 @@ public String getVersionNumberPass() { } public String getRegOrIdHeading() { return "Identification number"; } - - } diff --git a/src/main/java/uk/gov/dvsa/model/cvs/VTG5AW.java b/src/main/java/uk/gov/dvsa/model/cvs/VTG5AW.java new file mode 100644 index 00000000..ac47af4f --- /dev/null +++ b/src/main/java/uk/gov/dvsa/model/cvs/VTG5AW.java @@ -0,0 +1,26 @@ +package uk.gov.dvsa.model.cvs; + +import uk.gov.dvsa.model.Document; +import uk.gov.dvsa.model.cvs.certificateData.CvsMotCertificateData; + +public class VTG5AW extends CvsMotCertificate { + + public Document setData(CvsMotCertificateData data) { + this.data = data; + return this; + } + + public String getTestType() { + return "Trailer"; + } + + public String getPresentedDocumentNamePass() { + return "VTG5AW"; + } + + public String getVersionNumberPass() { + return "1.0"; + } + + public String getRegOrIdHeading() { return "Rhif cofrestru"; } +}