Skip to content

Commit

Permalink
update to test
Browse files Browse the repository at this point in the history
  • Loading branch information
@cb-cs
cb-cs committed Aug 22, 2023
1 parent 769f360 commit 15f8d8f
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 39 deletions.
2 changes: 1 addition & 1 deletion src/main/java/uk/gov/dvsa/enums/DocumentsConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()}),
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/uk/gov/dvsa/model/cvs/CvsHgvPassBilingual.java
View file
Original file line number Diff line number Diff line change
@@ -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";
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/uk/gov/dvsa/model/cvs/VTG5W.java
View file
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/uk/gov/dvsa/model/cvs/certificateData/CvsMotCertificateDataWelsh.java
View file
Original file line number Diff line number Diff line change
@@ -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<String> advisoryDefectsWelsh;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/uk/gov/dvsa/model/cvs/certificateData/CvsMotFailCertificateData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public class CvsMotFailCertificateData extends CvsMotCertificateData {
@JsonProperty("PRSDefects")
private List<String> prsDefects;


public CvsMotFailCertificateData setDangerousDefects(List<String> dangerousDefects) {
this.dangerousDefects = dangerousDefects;
return this;
Expand Down
55 changes: 28 additions & 27 deletions src/main/resources/views/CommercialVehicles/passNoSeatbeltFieldsWelsh.hbs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<title>MOT certificate Welsh ({{testType}})</title>
<title>Tystysgrif prawf MOT ({{testType}})</title>
<style type="text/css" media="print, screen">
{{~> assets/stylesheets/cvs-version-1 this}}
</style>
Expand All @@ -19,16 +19,16 @@
<div class="footer__bottom-two">
<div class="footer__bottom-page-counter">
<span class="footer__bottom-page-counter-text">
Page
Tudalen
</span>
<span class="footer__bottom-page-counter-text footer__bottom-page-counter-text--page-number"></span>
<span class="footer__bottom-page-counter-text">of</span>
<span class="footer__bottom-page-counter-text">o</span>
<span class="footer__bottom-page-counter-text footer__bottom-page-counter-text--pages-count"></span>
</div>
</div>
<div class="footer__bottom-three">
<div class="footer__top-signature-line"></div>
<div class="issuer-signature-text">Issuer signature</div>
<div class="issuer-signature-text">Llofnod y cyhoeddwr</div>
</div>
</div>
<div class="footer__certificate-tag">
Expand All @@ -54,18 +54,18 @@
<div class="footer__bottom-two">
<div class="footer__bottom-page-counter">
<span class="footer__bottom-page-counter-text">
Page
Tudalen
</span>
<span class="footer__bottom-page-counter-text footer__bottom-page-counter-text--page-number"></span>
<span class="footer__bottom-page-counter-text">
of
o
</span>
<span class="footer__bottom-page-counter-text footer__bottom-page-counter-text--pages-count"></span>
</div>
</div>
<div class="footer__bottom-three">
<div class="footer__top-signature-line"></div>
<div class="issuer-signature-text">Issuer signature</div>
<div class="issuer-signature-text">Llofnod y cyhoeddwr</div>
</div>
</div>
<div class="footer__certificate-tag">
Expand All @@ -86,7 +86,7 @@
{{#if reissue}}
<p class="heading-info--no-margin">{{reissue.reason}}</p>
{{/if}}
MOT test certificate ({{testType}})
Tystysgrif prawf MOT ({{testType}})
</h1>
<!-- heading-info -->
<div class="heading-info">
Expand All @@ -98,7 +98,7 @@
</span>
<span class="heading-info__title-right">
<span class="heading-info__title-message">
Vehicle identification number
Rhif adnabod cerbyd
</span>
</span>
</h2>
Expand Down Expand Up @@ -141,7 +141,7 @@
</span>
<span class="heading-info__title-right">
<span class="heading-info__title-message">
Country of registration
Gwlad cofrestru
</span>
</span>
</h2>
Expand All @@ -163,7 +163,7 @@
</span>
<span class="heading-info__title-right">
<span class="heading-info__title-message">
Registration Number
Rhif cofrestru
</span>
</span>
</h2>
Expand All @@ -180,7 +180,7 @@
<div class="heading-info">
<h2 class="heading-info__title">
<span class="heading-info__title-message">
Make and model
Math a model
</span>
</h2>
<span class="heading-info__content" id="make-model">
Expand All @@ -206,7 +206,7 @@
</span>
<span class="heading-info__title-right">
<span class="heading-info__title-message">
Vehicle category
Categori cerbyd
</span>
</span>
</h2>
Expand All @@ -228,7 +228,7 @@
</span>
<span class="heading-info__title-right">
<span class="heading-info__title-message">
Odometer
Odomedr
</span>
</span>
</h2>
Expand All @@ -244,7 +244,7 @@
<div class="heading-info">
<h2 class="heading-info__title">
<span class="heading-info__title-message">
Odometer history
Hanes odomedr
</span>
</h2>
<div class="heading-info__content" id="mileage-history">
Expand Down Expand Up @@ -309,7 +309,7 @@
</span>
<span class="heading-info__title-right">
<span class="heading-info__title-message">
Date of the test
Dyddiad y prawf
</span>
</span>
</h2>
Expand All @@ -330,7 +330,7 @@
</span>
<span class="heading-info__title-right">
<span class="heading-info__title-message">
Expiry date
Dyddiad dod i ben
</span>
</span>
</h2>
Expand All @@ -343,8 +343,8 @@
</div>
<!-- /test-information__two-columns -->
<p class="test-information__message test-information__message--margin-top heading-info util-avoid-page-break-inside">
To preserve the anniversary of the expiry date, the earliest you can present your vehicle for test
is <span id="earliest-preserve-date">{{data.earliestDateOfTheNextTest}}</span>.
Er mwyn cadw pen-blwydd y dyddiad dod i ben, y cynharaf y gallwch chi gyflwyno'ch cerbyd ar gyfer prawf
yw <span id="earliest-preserve-date">{{data.earliestDateOfTheNextTest}}</span>.
</p>
<!-- heading-info -->
<div class="heading-info util-avoid-page-break-inside">
Expand All @@ -356,7 +356,7 @@
</span>
<span class="heading-info__title-right">
<span class="heading-info__title-message">
Location of the test
Lleoliad y prawf
</span>
</span>
</h2>
Expand All @@ -375,7 +375,7 @@
</span>
<span class="heading-info__title-right">
<span class="heading-info__title-message">
Testing organisation and inspector
Sefydliad ac arolygydd y prawf
</span>
</span>
</h2>
Expand All @@ -391,7 +391,7 @@
<div class="heading-info util-avoid-page-break-inside">
<h2 class="heading-info__title">
<span class="heading-info__title-message">
Test number
Rhif prawf
</span>
</h2>
<span class="heading-info__content" id="mot-test-number">
Expand All @@ -408,18 +408,19 @@
<!-- /heading-info -->
<div class="util-avoid-page-break-inside">
<p class="test-information__message">
Check that this document is genuine by visiting <a class="test-information__message-link"
Gwiriwch fod y ddogfen hon yn ddilys drwy fynd i wefan <a class="test-information__message-link"
href="www.gov.uk/check-mot-history">www.gov.uk/check-mot-history</a>
</p>
<p class="test-information__message">
If any of the details are not correct, please contact DVSA by email at <br/><a
Os nad yw unrhyw fanylion yn gywir, cysylltwch â DVSA drwy e-bost ar <br/><a
class="test-information__message-link"
href="mailto:[email protected]">[email protected]</a> or by telephone on 0300 1239000.
href="mailto:[email protected]">[email protected]</a> neu drwy ffonio 0300 1239000.
</p>
<p class="test-information__message">
Receive a free annual MOT reminder by subscribing<br/> at <a class="test-information__message-link"
Derbynnwch nodyn atgoffa MOT blynyddol am ddim trwy danysgrifio
<br/> ar wefan <a class="test-information__message-link"
href="www.gov.uk/mot-reminder">www.gov.uk/mot-reminder</a>
or by telephone on 0300 1239000.
neu drwy ffôn ar 0300 1239000.
</p>
</div>
</div>
Expand Down

0 comments on commit 15f8d8f

Please sign in to comment.