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

Merge branch 'feature/COMP-256_minor_survey_tweaks' into 'develop' 

small survey text and appearance changes

See merge request !68
parents 90d3a187 01264d75
Branches
Tags
1 merge request!68small survey text and appearance changes
Expand all Hide whitespace changes
Inline Side-by-side
compendium_v2/conversion/mapping.py
+ 2
− 2
View file @ 5408c560
......@@ -10,7 +10,7 @@ WHERE nren_id = {}
16426,16429,16430,16432,16433,16434,16435,16438,16439,16446,16448,16449,16450,16451,16452,
16453,16455,16456,16457,16458,16459,16460,16461,16462,16463,16464,16465,16468,16469,16470,
16471,16472,16473,16474,16475,16476,16477,16478,16479,16480,16481,16482,16483,16484,16485,
16486,16488,16489,16490,16491,16492,16493,16494,16495,16496,16497,16499,16500,16501,16502,
16488,16489,16490,16491,16492,16493,16494,16495,16496,16497,16499,16500,16501,16502,
16503,16504,16760,16761,16762,16763,16507,16509,16510,16511,16512,16513,16514,16515,16516,
16517,16518,16519,16520,16521,16522,16523,16524,16525,16526,16527,16528,16529,16530,16531,
16532,16533,16534,16535,16536,16537,16538,16539,16540,16541,16542,16543,16544,16545,16546,
......@@ -175,7 +175,7 @@ ID_TO_NAME = {
16483: "central_procurement_amount",
16484: "formal_service_management_framework", # "Yes" "No"
16485: "service_level_targets", # "Yes" "No"
16486: "service_portfolio_changes", # "Yes" "No"
# 16486: "service_portfolio_changes", # "Yes" "No"
16496: "service_portfolio_eosc_portal", # "Yes" "No"
16497: "services_on_eosc_portal_list[]:service_name", # json list with double quotes
16499: "audits", # "Yes" "No"
......
compendium_v2/migrations/surveymodels/survey_model_2022.json
+ 19
− 24
View file @ 5408c560
......@@ -128,8 +128,8 @@
{
"type": "multipletext",
"name": "staff_employment_type",
"title": "What is the number of staff engaged in the NREN activities? ",
"description": "Please distinguish permanent and subcontracted using the boxes below. Please put answer in Full Time Equivalent (FTE's).",
"title": "What is the number of staff engaged in the NREN activities?",
"description": "Please put answer in Full Time Equivalent (FTE's).",
"items": [
{
"name": "permanent_fte",
......@@ -156,7 +156,7 @@
{
"type": "multipletext",
"name": "staff_roles",
"title": "Which of the following functional areas does your NREN have and how much FTE is dedicated to each? ",
"title": "How much FTE is devoted to roles in the following functional areas?",
"items": [
{
"name": "technical_fte",
......@@ -550,7 +550,7 @@
{
"type": "text",
"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?",
"validators": [
{
"type": "expression",
......@@ -616,7 +616,7 @@
},
{
"value": "privacy_notice",
"text": "Organisational privacy notice"
"text": "Organisational Privacy Policy"
},
{
"value": "data_protection_contact",
......@@ -673,17 +673,6 @@
],
"showClearButton": true
},
{
"type": "radiogroup",
"name": "service_portfolio_changes",
"title": "Has your NREN made any changes to its service portfolio for its users?",
"description": "Please note any changes here and amend the Service Matrix at the last page of this survey",
"choices": [
"Yes",
"No"
],
"showClearButton": true
},
{
"type": "matrixdropdown",
"name": "service_matrix",
......@@ -821,7 +810,7 @@
"name": "audit_specifics",
"visibleIf": "{audits} = 'yes'",
"indent": 1,
"title": "Please specify ( for example a certified security auditor on ISO 27001 is performing the audits):"
"title": "Please specify (for example a certified security auditor on ISO 27001 is performing the audits):"
},
{
"type": "radiogroup",
......@@ -858,7 +847,7 @@
"choices": [
{
"value": "geant_workshops",
"text": "We participate in GEANT Crisis workshops such as CLAW"
"text": "We participate in GÉANT Crisis workshops such as CLAW"
},
{
"value": "national_excercises",
......@@ -951,7 +940,8 @@
{
"type": "matrixdynamic",
"name": "connected_sites_lists",
"title": "Please provide the URLs that lists the sites that are connected to the NREN, if available:",
"title": "Please provide the URLs of the webpages listing the institutions or organisations that are connected to the NREN, if available:",
"description": "Many NRENs have one or more pages on their website listing user institutions. Please provide these links here if you have them.",
"columns": [
{
"name": "connected_sites_url",
......@@ -1103,7 +1093,7 @@
"type": "matrixdropdown",
"name": "connectivity_level",
"title": "Level of IP connectivity by Institution type:",
"description": "This table explores the average level of connectivity for each type of institution to the NREN. Please enter the typical and the highest capacity at which institutions in this category are connected ( in Mbit/s). As a minimum, please provide this information for Universities and Research institutes.",
"description": "This table explores the average level of connectivity for each type of institution to the NREN. Please enter the typical and the highest capacity at which institutions in this category are connected ( in Mbit/s). As a minimum, please provide this information for Universities and Research Institutes.",
"columns": [
{
"name": "typical_speed",
......@@ -1645,7 +1635,7 @@
"name": "dark_fibre_lease_kilometers_outside_country",
"visibleIf": "{dark_fibre_lease} = 'Yes'",
"indent": 1,
"title": "Please state the number of km of such fiber that is outside your country:",
"title": "Please state the number of km of such fibre that is outside your country:",
"validators": [
{
"type": "numeric",
......@@ -1923,8 +1913,8 @@
{
"type": "radiogroup",
"name": "alienwave_services",
"title": "Does your NREN make use of alien wavelength/lightpath (AW) services provided by third parties?",
"description": "This does not include alien waves (AW) used internally inside your network e.g. coloured optics on routers as they are covered in a later question.",
"title": "Does your NREN make use of alien wavelength/lightpath services provided by third parties?",
"description": "This does not include alien waves used internally inside your network e.g. coloured optics on routers as they are covered in a later question.",
"choices": [
"Yes",
"No",
......@@ -1937,7 +1927,7 @@
"name": "alienwave_services_number",
"visibleIf": "{alienwave_services} = 'yes'",
"indent": 1,
"title": "Please state the number of individual AW services:",
"title": "Please state the number of individual alien wavelength services:",
"validators": [
{
"type": "numeric",
......@@ -2276,6 +2266,11 @@
{
"name": "services",
"elements": [
{
"type": "html",
"name": "services_hover_explanation",
"html": "Descriptions of the individual services are shown if you hover over the service name."
},
{
"type": "matrixdropdown",
"name": "services_network",
......
compendium_v2/migrations/versions/208f6d063905_minor_survey_updates.py 0 → 100644
+ 2978
− 0
View file @ 5408c560
This diff is collapsed.
compendium_v2/static/survey-bundle.js
+ 1
− 1
View file @ 5408c560
This diff is collapsed.
survey-frontend/src/SurveyContainerComponent.tsx
+ 1
− 0
View file @ 5408c560
......@@ -53,6 +53,7 @@ function SurveyContainerComponent({ loadFrom }) {
survey.setVariable('previousyear', parseInt(year!) - 1);
survey.showNavigationButtons = false;
survey.requiredText = '';
survey.verificationStatus = new Map<string, VerificationStatus>();
for (const questionName in json["verification_status"]) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment