Skip to content
Snippets Groups Projects
Commit 980ff6cf authored by Remco Tukker's avatar Remco Tukker
Browse files

added url and email validators and added a clear button to the radiobutton groups

parent 1000c33f
Branches
Tags
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
compendium_v2/static/survey-bundle.js
+ 1
− 1
View file @ 980ff6cf
This diff is collapsed.
survey-frontend/src/survey_model.json
+ 186
− 49
View file @ 980ff6cf
...@@ -188,7 +188,8 @@ ...@@ -188,7 +188,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -204,7 +205,8 @@ ...@@ -204,7 +205,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "matrixdynamic", "type": "matrixdynamic",
...@@ -247,7 +249,8 @@ ...@@ -247,7 +249,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "matrixdynamic", "type": "matrixdynamic",
...@@ -328,13 +331,25 @@ ...@@ -328,13 +331,25 @@
"type": "text", "type": "text",
"name": "email_address", "name": "email_address",
"title": "General email address:", "title": "General email address:",
"inputType": "email" "inputType": "email",
"validators": [
{
"type": "email"
}
]
}, },
{ {
"type": "text", "type": "text",
"name": "website", "name": "website",
"title": "Website:", "title": "Website:",
"inputType": "url" "inputType": "url",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
} }
], ],
"title": "Basic Information" "title": "Basic Information"
...@@ -361,13 +376,21 @@ ...@@ -361,13 +376,21 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
"name": "corporate_strategy_url", "name": "corporate_strategy_url",
"title": "Please provide the URL for your latest corporate strategic plan?", "title": "Please provide the URL for your latest corporate strategic plan?",
"inputType": "url" "inputType": "url",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -376,7 +399,8 @@ ...@@ -376,7 +399,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -384,7 +408,14 @@ ...@@ -384,7 +408,14 @@
"visibleIf": "{environmental_policy} = 'yes'", "visibleIf": "{environmental_policy} = 'yes'",
"indent": 1, "indent": 1,
"title": "Please provide the URL", "title": "Please provide the URL",
"inputType": "url" "inputType": "url",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -393,7 +424,8 @@ ...@@ -393,7 +424,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -401,7 +433,14 @@ ...@@ -401,7 +433,14 @@
"visibleIf": "{equal_opportunity_policy} = 'yes'", "visibleIf": "{equal_opportunity_policy} = 'yes'",
"indent": 1, "indent": 1,
"title": "Please provide the URL", "title": "Please provide the URL",
"inputType": "url" "inputType": "url",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -410,7 +449,8 @@ ...@@ -410,7 +449,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -418,7 +458,14 @@ ...@@ -418,7 +458,14 @@
"visibleIf": "{gender_equality_policy} = 'yes'", "visibleIf": "{gender_equality_policy} = 'yes'",
"indent": 1, "indent": 1,
"title": "Please provide the URL", "title": "Please provide the URL",
"inputType": "url" "inputType": "url",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -427,7 +474,8 @@ ...@@ -427,7 +474,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -435,7 +483,14 @@ ...@@ -435,7 +483,14 @@
"visibleIf": "{connectivity_policy} = 'yes'", "visibleIf": "{connectivity_policy} = 'yes'",
"indent": 1, "indent": 1,
"title": "Please provide the URL", "title": "Please provide the URL",
"inputType": "url" "inputType": "url",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -444,7 +499,8 @@ ...@@ -444,7 +499,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -452,7 +508,14 @@ ...@@ -452,7 +508,14 @@
"visibleIf": "{acceptable_use_policy} = 'yes'", "visibleIf": "{acceptable_use_policy} = 'yes'",
"indent": 1, "indent": 1,
"title": "Please provide the URL", "title": "Please provide the URL",
"inputType": "url" "inputType": "url",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -461,7 +524,8 @@ ...@@ -461,7 +524,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -469,7 +533,14 @@ ...@@ -469,7 +533,14 @@
"visibleIf": "{privacy_notice} = 'yes'", "visibleIf": "{privacy_notice} = 'yes'",
"indent": 1, "indent": 1,
"title": "Please provide the URL", "title": "Please provide the URL",
"inputType": "url" "inputType": "url",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -478,7 +549,8 @@ ...@@ -478,7 +549,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -486,7 +558,14 @@ ...@@ -486,7 +558,14 @@
"visibleIf": "{data_protection_contact} = 'yes'", "visibleIf": "{data_protection_contact} = 'yes'",
"indent": 1, "indent": 1,
"title": "Please provide the URL", "title": "Please provide the URL",
"inputType": "url" "inputType": "url",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -495,7 +574,8 @@ ...@@ -495,7 +574,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -522,7 +602,8 @@ ...@@ -522,7 +602,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -531,7 +612,8 @@ ...@@ -531,7 +612,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -541,7 +623,8 @@ ...@@ -541,7 +623,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "matrixdropdown", "type": "matrixdropdown",
...@@ -638,7 +721,8 @@ ...@@ -638,7 +721,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "matrixdynamic", "type": "matrixdynamic",
...@@ -671,7 +755,8 @@ ...@@ -671,7 +755,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -687,7 +772,8 @@ ...@@ -687,7 +772,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -703,7 +789,8 @@ ...@@ -703,7 +789,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "checkbox", "type": "checkbox",
...@@ -807,7 +894,14 @@ ...@@ -807,7 +894,14 @@
"type": "text", "type": "text",
"name": "connected_sites_list", "name": "connected_sites_list",
"title": "Please provide a URL that lists the sites that are connected to the NREN, if available:", "title": "Please provide a URL that lists the sites that are connected to the NREN, if available:",
"inputType": "url" "inputType": "url",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
}, },
{ {
"type": "matrixdropdown", "type": "matrixdropdown",
...@@ -1451,7 +1545,8 @@ ...@@ -1451,7 +1545,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -1462,7 +1557,8 @@ ...@@ -1462,7 +1557,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "matrixdynamic", "type": "matrixdynamic",
...@@ -1512,7 +1608,8 @@ ...@@ -1512,7 +1608,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -1572,7 +1669,8 @@ ...@@ -1572,7 +1669,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -1611,7 +1709,8 @@ ...@@ -1611,7 +1709,8 @@
"text": "Ownership and management are out-sourced (turn-key model)" "text": "Ownership and management are out-sourced (turn-key model)"
} }
], ],
"showOtherItem": true "showOtherItem": true,
"showClearButton": true
}, },
{ {
"type": "multipletext", "type": "multipletext",
...@@ -1619,10 +1718,24 @@ ...@@ -1619,10 +1718,24 @@
"title": "Please provide a network map for layers 1, 2 and 3 of your network:", "title": "Please provide a network map for layers 1, 2 and 3 of your network:",
"items": [ "items": [
{ {
"name": "text1" "name": "text1",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
}, },
{ {
"name": "text2" "name": "text2",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
} }
] ]
} }
...@@ -1669,7 +1782,8 @@ ...@@ -1669,7 +1782,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -1690,7 +1804,8 @@ ...@@ -1690,7 +1804,8 @@
"value": "both", "value": "both",
"text": "Both" "text": "Both"
} }
] ],
"showClearButton": true
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -1699,7 +1814,8 @@ ...@@ -1699,7 +1814,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -1707,7 +1823,14 @@ ...@@ -1707,7 +1823,14 @@
"visibleIf": "{traffic_statistics} = 'Yes'", "visibleIf": "{traffic_statistics} = 'Yes'",
"indent": 1, "indent": 1,
"title": "Please give the URL(s):", "title": "Please give the URL(s):",
"inputType": "url" "inputType": "url",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
}, },
{ {
"type": "checkbox", "type": "checkbox",
...@@ -1747,7 +1870,8 @@ ...@@ -1747,7 +1870,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -1755,7 +1879,14 @@ ...@@ -1755,7 +1879,14 @@
"visibleIf": "{network_weather} = 'Yes'", "visibleIf": "{network_weather} = 'Yes'",
"indent": 1, "indent": 1,
"title": "Please give the URL:", "title": "Please give the URL:",
"inputType": "url" "inputType": "url",
"validators": [
{
"type": "regex",
"text": "Please provide a single valid url",
"regex": "^(https?:\\/\\/)?([\\da-zA-Z\\.-]+\\.[a-zA-Z\\.]{2,6}|[\\d\\.]+)([\\/:?=&#%]{1}[\\d_a-zA-Z\\.-]+)*[\\/\\?]?$"
}
]
}, },
{ {
"type": "radiogroup", "type": "radiogroup",
...@@ -1765,7 +1896,8 @@ ...@@ -1765,7 +1896,8 @@
"Yes", "Yes",
"No", "No",
"Planned" "Planned"
] ],
"showClearButton": true
} }
], ],
"title": "PERFORMANCE MONITORING AND MANAGEMENT" "title": "PERFORMANCE MONITORING AND MANAGEMENT"
...@@ -1783,7 +1915,8 @@ ...@@ -1783,7 +1915,8 @@
"Yes", "Yes",
"No", "No",
"Planned" "Planned"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -1811,7 +1944,8 @@ ...@@ -1811,7 +1944,8 @@
"choices": [ "choices": [
"Yes", "Yes",
"No" "No"
] ],
"showClearButton": true
} }
], ],
"title": "Alienwave", "title": "Alienwave",
...@@ -1994,7 +2128,8 @@ ...@@ -1994,7 +2128,8 @@
"Yes", "Yes",
"No", "No",
"Planned" "Planned"
] ],
"showClearButton": true
}, },
{ {
"type": "text", "type": "text",
...@@ -2011,7 +2146,8 @@ ...@@ -2011,7 +2146,8 @@
"Yes", "Yes",
"No", "No",
"Planned" "Planned"
] ],
"showClearButton": true
}, },
{ {
"type": "checkbox", "type": "checkbox",
...@@ -2047,7 +2183,8 @@ ...@@ -2047,7 +2183,8 @@
"Yes", "Yes",
"No", "No",
"Planned" "Planned"
] ],
"showClearButton": true
}, },
{ {
"type": "checkbox", "type": "checkbox",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment