Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OOC-3753 Updates #203

Merged
merged 1 commit into from
Jul 1, 2024
Merged

OOC-3753 Updates #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 40 additions & 9 deletions runner/src/server/forms/ReportAnOutbreak.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@
"components": [
{
"name": "S0Q4",
"options": { "customValidationMessage": "Enter a full UK postcode" },
"options": {
"customValidationMessages": {
"string.regex.base": "Enter a full UK postcode",
"string.pattern.base": "Enter a full UK postcode"
}
},
"type": "TextField",
"title": "Please enter your setting Postcode",
"schema": {
Expand Down Expand Up @@ -63,7 +68,11 @@
{
"name": "S0Q3",
"options": {
"required": true
"required": true,
"customValidationMessages": {
"string.base": "Please enter your local HPT here is required",
"string.empty": "Please enter your local HPT here is required"
}
},
"type": "SelectField",
"title": "Please enter your local HPT here",
Expand Down Expand Up @@ -161,7 +170,11 @@
{
"name": "S1Q5",
"options": {
"required": true
"required": true,
"customValidationMessages": {
"string.base": "S1Q5. Name of Key Contact Person is required",
"string.empty": "S1Q5. Name of Key Contact Person is required"
}
},
"type": "TextField",
"title": "S1Q5. Name of Key Contact Person",
Expand Down Expand Up @@ -763,7 +776,10 @@
{
"name": "S5Q17",
"options": {
"required": true
"required": true,
"customValidationMessages": {
"any.required": "S5Q17. During this outbreak, how many cases have died due to Flu (confirmed or suspected) or chest infection? is required"
}
},
"type": "RadiosField",
"title": "S5Q17. During this outbreak, how many cases have died due to Flu (confirmed or suspected) or chest infection?",
Expand Down Expand Up @@ -1154,7 +1170,10 @@
{
"name": "S8Q1",
"options": {
"required": true
"required": true,
"customValidationMessages": {
"any.required": "S8Q1. How often are you monitoring staff Infection Prevention and Control practices e.g. hand hygiene and PPE compliance, environmental cleanliness? is required"
}
},
"type": "RadiosField",
"title": "S8Q1. How often are you monitoring staff Infection Prevention and Control practices e.g. hand hygiene and PPE compliance, environmental cleanliness?",
Expand All @@ -1168,7 +1187,10 @@
{
"name": "S8Q2",
"options": {
"required": true
"required": true,
"customValidationMessage": {
"any.required": "S8Q2. What issues are you currently experiencing and require support on? is required"
}
},
"type": "CheckboxesField",
"title": "S8Q2. What issues are you currently experiencing and require support on?",
Expand All @@ -1180,7 +1202,10 @@
{
"name": "S8Q3",
"options": {
"required": true
"required": true,
"customValidationMessages": {
"any.required": "S8Q3. Does your setting undertake Aerosol Generating Procedures (AGPs)? is required"
}
},
"type": "YesNoField",
"title": "S8Q3. Does your setting undertake Aerosol Generating Procedures (AGPs)?",
Expand Down Expand Up @@ -1255,7 +1280,10 @@
{
"name": "S9Q1",
"options": {
"required": true
"required": true,
"customValidationMessages": {
"any.required": "S9Q1. Do you use agency staff or share staff with other care settings? is required"
}
},
"type": "YesNoField",
"title": "S9Q1. Do you use agency staff or share staff with other care settings?",
Expand Down Expand Up @@ -1497,7 +1525,10 @@
{
"name": "S10Q1",
"options": {
"required": true
"required": true,
"customValidationMessages": {
"any.required": "S10Q1. How would you describe this risk assessment tool? is required"
}
},
"type": "CheckboxesField",
"title": "S10Q1. How would you describe this risk assessment tool?",
Expand Down
2 changes: 1 addition & 1 deletion runner/src/server/plugins/engine/components/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const optionalText = " (optional)";
export const optionalText = " (Optional)";
8 changes: 1 addition & 7 deletions runner/src/server/plugins/engine/pageControllers/validationOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ const messageTemplate = {
maxWords: "{{#label}} must be {{#limit}} words or fewer",
dateRequired: "{{#label}} must be a real date",
dateFormat: "{{#label}} must be a real date",
dateMin: "{{#label}} must be the same as or after {{#limit}}",
dateMax: "{{#label}} must be the same as or before {{#limit}}",
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed these because they are duplicated

};

export const messages: ValidationOptions["messages"] = {
Expand All @@ -37,6 +35,7 @@ export const messages: ValidationOptions["messages"] = {
"date.required": messageTemplate.required,
"date.min": messageTemplate.dateMin,
"date.max": messageTemplate.dateMax,
"date.format": messageTemplate.dateFormat,
"number.base": messageTemplate.number,
"number.empty": messageTemplate.required,
"number.required": messageTemplate.required,
Expand All @@ -45,11 +44,6 @@ export const messages: ValidationOptions["messages"] = {

"any.required": messageTemplate.selectRequired,
"any.empty": messageTemplate.required,

"date.base": messageTemplate.dateRequired,
"date.format": messageTemplate.dateFormat,
"date.min": messageTemplate.dateMin,
"date.max": messageTemplate.dateMax,
};

export const validationOptions: ValidationOptions = {
Expand Down