Skip to content

Commit 7a1d1c8

Browse files
authored
Merge pull request #634 from ukhsa-collaboration/rps-1219
RPS-1219 - Enquiry request submitted
2 parents ae9b433 + 4a57f64 commit 7a1d1c8

2 files changed

Lines changed: 75 additions & 25 deletions

File tree

runner/src/server/forms/kls-feedback.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
"outputConfiguration": {
118118
"url": "https://webhook.site/e87402d7-a93e-406c-bf13-ca72f3973bbc",
119119
"allowRetry": true
120-
}
120+
}
121121
}
122122
],
123123
"sections": [],

runner/src/server/forms/radon-enquiry.json

Lines changed: 74 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,21 @@
273273
"content": "<p class=\"govuk-body-m\">The <b>{{service}}</b> team will review your enquiry and aim to respond within 5 days. If your enquiry is urgent, please <a href=\"https://www.gov.uk/health-protection-team\" target=”_blank”>call us</a></p>"
274274
},
275275
{
276-
"name": "table",
276+
"name": "tableService",
277277
"type": "Para",
278-
"options": {},
278+
"options": {
279+
"condition": "ojQCvt"
280+
},
279281
"content": "<table class=\"govuk-table\"><caption class=\"govuk-table__caption govuk-table__caption--m\">Your enquiry details</caption><tbody class=\"govuk-table__body\"><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">First name</th><td class=\"govuk-table__cell\">{{ firstname }}</td></tr><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">Last Name</th><td class=\"govuk-table__cell\">{{ lastname }}</td></tr><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">Organisation</th><td class=\"govuk-table__cell\">{{ organisation }}</td></tr><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">Email</th><td class=\"govuk-table__cell\">{{ email }}</td></tr><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">Category</th><td class=\"govuk-table__cell\">{{ supportType }}</td></tr><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">Service</th><td class=\"govuk-table__cell\">{{ service }}</td></tr><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">Request information</th><td class=\"govuk-table__cell\">{{ requestInformation }}</td></tr></tbody></table>"
280282
},
283+
{
284+
"name": "tableNoService",
285+
"type": "Para",
286+
"options": {
287+
"condition": "tvCQjo"
288+
},
289+
"content": "<table class=\"govuk-table\"><caption class=\"govuk-table__caption govuk-table__caption--m\">Your enquiry details</caption><tbody class=\"govuk-table__body\"><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">First name</th><td class=\"govuk-table__cell\">{{ firstname }}</td></tr><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">Last Name</th><td class=\"govuk-table__cell\">{{ lastname }}</td></tr><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">Organisation</th><td class=\"govuk-table__cell\">{{ organisation }}</td></tr><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">Email</th><td class=\"govuk-table__cell\">{{ email }}</td></tr><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">Category</th><td class=\"govuk-table__cell\">{{ supportType }}</td></tr><tr class=\"govuk-table__row\"><th scope=\"row\" class=\"govuk-table__header\">Request information</th><td class=\"govuk-table__cell\">{{ requestInformation }}</td></tr></tbody></table>"
290+
},
281291
{
282292
"name": "final links",
283293
"type": "Para",
@@ -294,32 +304,32 @@
294304
"items": [
295305
{
296306
"text": "I need radiation measurements, testing, or dosimetry",
297-
"value": "testing",
307+
"value": "I need radiation measurements, testing, or dosimetry",
298308
"description": "Including personal dose monitoring, instrument calibration, dental X-ray equipment testing, laboratory analysis, radon measurement, chromosome dosimetry, or whole body monitoring"
299309
},
300310
{
301311
"text": "I work with radiation and need compliance or safety advice",
302-
"value": "compliance",
312+
"value": "I work with radiation and need compliance or safety advice",
303313
"description": "Including Radiation Protection Advisor support, dangerous goods, non-ionising radiation, medical exposures, dental or environmental radiological assessments"
304314
},
305315
{
306316
"text": "I want to enquire about training courses and facilities, or an existing course booking",
307-
"value": "training",
317+
"value": "I want to enquire about training courses and facilities, or an existing course booking",
308318
"description": "Including workplace radiation safety, specialist professional training, emergency preparedness, laser safety, non-ionising radiation courses, or hiring our training facilities"
309319
},
310320
{
311321
"text": "I need help with a software product or tool",
312-
"value": "software",
322+
"value": "I need help with a software product or tool",
313323
"description": "Including PACE, PC-CREAM, Taurus, IMBA, or other dosimetry and radiological impact assessment software"
314324
},
315325
{
316-
"text": "I'm interested in research, collaboration, or specialist consultancy",
317-
"value": "research",
326+
"text": "Im interested in research, collaboration, or specialist consultancy",
327+
"value": "I’m interested in research, collaboration, or specialist consultancy",
318328
"description": "Including radiation effects research, medical dosimetry, emergency preparedness, and working with UKHSA"
319329
},
320330
{
321-
"text": "I'm not sure, or my enquiry doesn't fit the above",
322-
"value": "General",
331+
"text": "Im not sure, or my enquiry doesnt fit the above",
332+
"value": "I’m not sure, or my enquiry doesn’t fit the above",
323333
"description": "If your enquiry does not fit any of the above, tell us in more detail in the next step"
324334
}
325335
]
@@ -552,8 +562,8 @@
552562
"operator": "is",
553563
"value": {
554564
"type": "Value",
555-
"value": "testing",
556-
"display": "testing"
565+
"value": "I need radiation measurements, testing, or dosimetry",
566+
"display": "I need radiation measurements, testing, or dosimetry"
557567
}
558568
}
559569
]
@@ -574,8 +584,8 @@
574584
"operator": "is",
575585
"value": {
576586
"type": "Value",
577-
"value": "compliance",
578-
"display": "compliance"
587+
"value": "I work with radiation and need compliance or safety advice",
588+
"display": "I work with radiation and need compliance or safety advice"
579589
}
580590
}
581591
]
@@ -596,8 +606,8 @@
596606
"operator": "is",
597607
"value": {
598608
"type": "Value",
599-
"value": "training",
600-
"display": "training"
609+
"value": "I want to enquire about training courses and facilities, or an existing course booking",
610+
"display": "I want to enquire about training courses and facilities, or an existing course booking"
601611
}
602612
}
603613
]
@@ -618,8 +628,8 @@
618628
"operator": "is",
619629
"value": {
620630
"type": "Value",
621-
"value": "software",
622-
"display": "software"
631+
"value": "I need help with a software product or tool",
632+
"display": "I need help with a software product or tool"
623633
}
624634
}
625635
]
@@ -640,8 +650,8 @@
640650
"operator": "is",
641651
"value": {
642652
"type": "Value",
643-
"value": "research",
644-
"display": "research"
653+
"value": "I’m interested in research, collaboration, or specialist consultancy",
654+
"display": "I’m interested in research, collaboration, or specialist consultancy"
645655
}
646656
}
647657
]
@@ -662,8 +672,8 @@
662672
"operator": "is",
663673
"value": {
664674
"type": "Value",
665-
"value": "General",
666-
"display": "General"
675+
"value": "I’m not sure, or my enquiry doesn’t fit the above",
676+
"display": "I’m not sure, or my enquiry doesn’t fit the above"
667677
}
668678
}
669679
]
@@ -682,7 +692,11 @@
682692
"display": "type"
683693
},
684694
"operator": "is not",
685-
"value": { "type": "Value", "value": "General", "display": "General" }
695+
"value": {
696+
"type": "Value",
697+
"value": "I’m not sure, or my enquiry doesn’t fit the above",
698+
"display": "I’m not sure, or my enquiry doesn’t fit the above"
699+
}
686700
},
687701
{
688702
"coordinator": "and",
@@ -700,6 +714,42 @@
700714
}
701715
]
702716
}
717+
},
718+
{
719+
"displayName": "noService",
720+
"name": "tvCQjo",
721+
"value": {
722+
"name": "noService",
723+
"conditions": [
724+
{
725+
"field": {
726+
"name": "supportType",
727+
"type": "RadiosField",
728+
"display": "type"
729+
},
730+
"operator": "is",
731+
"value": {
732+
"type": "Value",
733+
"value": "I’m not sure, or my enquiry doesn’t fit the above",
734+
"display": "I’m not sure, or my enquiry doesn’t fit the above"
735+
}
736+
},
737+
{
738+
"coordinator": "or",
739+
"field": {
740+
"name": "service",
741+
"type": "RadiosField",
742+
"display": "service"
743+
},
744+
"operator": "is",
745+
"value": {
746+
"type": "Value",
747+
"value": "General",
748+
"display": "General"
749+
}
750+
}
751+
]
752+
}
703753
}
704754
],
705755
"fees": [],
@@ -721,4 +771,4 @@
721771
"version": 2,
722772
"skipSummary": true,
723773
"feeOptions": {}
724-
}
774+
}

0 commit comments

Comments
 (0)