added mapping info for connected users page

compendium_v2/conversion/mapping.py

@@ -94,6 +94,149 @@ id_to_name = {
     16762: "crisis_management_procedure",  # "Yes" "No"
     16763: "crisis_exercises",  # json list with double quotes  ["We participate in GEANT Crisis workshops such as CLAW","No, we have not done any crisis exercises or trainings","We participated in National crisis exercises ","We had a real crisis","We run our own simulation exercises","We run our own tabletop exercises","We have done/participated in other exercises or trainings"]
 
+    16507: "connected_sites_list",  # json list with double quotes  NB the new situation allows only 1 single entry  TODO change to list like some of the other questions
+    16509: "connectivity_proportions:cultural:nr_connected",
+    16510: "connectivity_proportions:universities:nr_connected",
+    16511: "connectivity_proportions:secondary_schools:nr_connected",
+    16512: "connectivity_proportions:hospitals:nr_connected",
+    16513: "connectivity_proportions:primary_schools:nr_connected",
+    16514: "connectivity_proportions:for_profit_orgs:nr_connected",
+    16515: "connectivity_proportions:further_education:nr_connected",
+    16516: "connectivity_proportions:government:nr_connected",
+    16517: "connectivity_proportions:institutes:nr_connected",
+    16518: "connectivity_proportions:universities:market_share_percentage",
+    16519: "connectivity_proportions:iros:nr_connected",
+    16520: "connectivity_proportions:further_education:market_share_percentage",
+    16521: "connectivity_proportions:secondary_schools:market_share_percentage",
+    16522: "connectivity_proportions:primary_schools:market_share_percentage",
+    16523: "connectivity_proportions:cultural:market_share_percentage",
+    16524: "connectivity_proportions:institutes:market_share_percentage",
+    16525: "connectivity_proportions:iros:market_share_percentage",
+    16526: "connectivity_proportions:hospitals:market_share_percentage",
+    16527: "connectivity_proportions:government:market_share_percentage",
+    16528: "connectivity_proportions:for_profit_orgs:market_share_percentage",
+    16529: "connectivity_proportions:universities:nr_of_users",
+    16530: "connectivity_proportions:institutes:nr_of_users",
+    16531: "connectivity_proportions:further_education:nr_of_users",
+    16532: "connectivity_proportions:secondary_schools:nr_of_users",
+    16533: "connectivity_proportions:cultural:nr_of_users",
+    16534: "connectivity_proportions:primary_schools:nr_of_users",
+    16535: "connectivity_proportions:hospitals:nr_of_users",
+    16536: "connectivity_proportions:government:nr_of_users",
+    16537: "connectivity_proportions:for_profit_orgs:nr_of_users",
+    16538: "connectivity_proportions:iros:nr_of_users",
+    16539: "connectivity_proportions:further_education:covered",
+    16540: "connectivity_proportions:secondary_schools:covered",
+    16541: "connectivity_proportions:for_profit_orgs:covered",
+    16542: "connectivity_proportions:primary_schools:covered",
+    16543: "connectivity_proportions:institutes:covered",
+    16544: "connectivity_proportions:government:covered",
+    16545: "connectivity_proportions:iros:covered",
+    16546: "connectivity_proportions:cultural:covered",
+    16547: "connectivity_proportions:universities:covered",
+    16548: "connectivity_proportions:hospitals:covered",
+    16550: "connectivity_level:for_profit_orgs:typical_speed",
+    16551: "connectivity_level:further_education:highest_speed_connection_percentage",
+    16552: "connectivity_level:institutes:highest_speed",
+    16553: "connectivity_level:further_education:highest_speed",
+    16554: "connectivity_level:secondary_schools:highest_speed_connection_percentage",
+    16555: "connectivity_level:secondary_schools:typical_speed",
+    16556: "connectivity_level:primary_schools:highest_speed_connection_percentage",
+    16557: "connectivity_level:secondary_schools:highest_speed",
+    16558: "connectivity_level:primary_schools:highest_speed",
+    16559: "connectivity_level:universities:typical_speed",
+    16560: "connectivity_level:further_education:typical_speed",
+    16561: "connectivity_level:cultural:typical_speed",
+    16562: "connectivity_level:cultural:highest_speed_connection_percentage",
+    16563: "connectivity_level:primary_schools:typical_speed",
+    16564: "connectivity_level:institutes:highest_speed_connection_percentage",
+    16565: "connectivity_level:institutes:typical_speed",
+    16566: "connectivity_level:cultural:highest_speed",
+    16567: "connectivity_level:hospitals:typical_speed",
+    16568: "connectivity_level:hospitals:highest_speed",
+    16569: "connectivity_level:iros:typical_speed",
+    16570: "connectivity_level:hospitals:highest_speed_connection_percentage",
+    16571: "connectivity_level:for_profit_orgs:highest_speed",
+    16572: "connectivity_level:government:typical_speed",
+    16573: "connectivity_level:iros:highest_speed",
+    16574: "connectivity_level:government:highest_speed",
+    16575: "connectivity_level:for_profit_orgs:highest_speed_connection_percentage",
+    16576: "connectivity_level:government:highest_speed_connection_percentage",
+    16577: "connectivity_level:iros:highest_speed_connection_percentage",
+    16578: "connectivity_level:universities:highest_speed",
+    16579: "connectivity_level:universities:highest_speed_connection_percentage",
+    16581: "traffic_carriers:government:carry_mechanism",  # "NREN provides the local loops" "MAN" "Traffic carried to the backbone by commercial providers" "Traffic carried to the backbone by regional NREN" "Other"
+    16582: "traffic_carriers:universities:carry_mechanism",  # "NREN provides the local loops" "MAN" "Traffic carried to the backbone by commercial providers" "Traffic carried to the backbone by regional NREN" "Other"
+    16583: "traffic_carriers:secondary_schools:carry_mechanism",  # "NREN provides the local loops" "MAN" "Traffic carried to the backbone by commercial providers" "Traffic carried to the backbone by regional NREN" "Other"
+    16584: "traffic_carriers:institutes:carry_mechanism",  # "NREN provides the local loops" "MAN" "Traffic carried to the backbone by commercial providers" "Traffic carried to the backbone by regional NREN" "Other"
+    16585: "traffic_carriers:cultural:carry_mechanism",  # "NREN provides the local loops" "MAN" "Traffic carried to the backbone by commercial providers" "Traffic carried to the backbone by regional NREN" "Other"
+    16586: "traffic_carriers:hospitals:carry_mechanism",  # "NREN provides the local loops" "MAN" "Traffic carried to the backbone by commercial providers" "Traffic carried to the backbone by regional NREN" "Other"
+    16587: "traffic_carriers:iros:carry_mechanism",  # "NREN provides the local loops" "MAN" "Traffic carried to the backbone by commercial providers" "Traffic carried to the backbone by regional NREN" "Other"
+    16588: "traffic_carriers:for_profit_orgs:carry_mechanism",  # "NREN provides the local loops" "MAN" "Traffic carried to the backbone by commercial providers" "Traffic carried to the backbone by regional NREN" "Other"
+    16589: "traffic_carriers:primary_schools:carry_mechanism",  # "NREN provides the local loops" "MAN" "Traffic carried to the backbone by commercial providers" "Traffic carried to the backbone by regional NREN" "Other"
+    16590: "traffic_carriers:further_education:carry_mechanism",  # "NREN provides the local loops" "MAN" "Traffic carried to the backbone by commercial providers" "Traffic carried to the backbone by regional NREN" "Other"
+    16592: "traffic_load:government:average_from_institutions_to_network",
+    16593: "traffic_load:iros:average_from_institutions_to_network",
+    16594: "traffic_load:for_profit_orgs:average_from_institutions_to_network",
+    16595: "traffic_load:universities:average_from_institutions_to_network",
+    16596: "traffic_load:further_education:average_from_institutions_to_network",
+    16597: "traffic_load:secondary_schools:average_from_institutions_to_network",
+    16598: "traffic_load:primary_schools:average_from_institutions_to_network",
+    16599: "traffic_load:institutes:average_from_institutions_to_network",
+    16600: "traffic_load:cultural:average_from_institutions_to_network",
+    16601: "traffic_load:hospitals:average_from_institutions_to_network",
+    16602: "traffic_load:universities:average_to_institutions_from_network",
+    16603: "traffic_load:further_education:average_to_institutions_from_network",
+    16604: "traffic_load:secondary_schools:average_to_institutions_from_network",
+    16605: "traffic_load:primary_schools:average_to_institutions_from_network",
+    16606: "traffic_load:institutes:average_to_institutions_from_network",
+    16607: "traffic_load:cultural:average_to_institutions_from_network",
+    16608: "traffic_load:hospitals:average_to_institutions_from_network",
+    16609: "traffic_load:government:average_to_institutions_from_network",
+    16610: "traffic_load:iros:average_to_institutions_from_network",
+    16611: "traffic_load:for_profit_orgs:average_to_institutions_from_network",
+    16613: "traffic_load:secondary_schools:peak_to_institutions_from_network",
+    16614: "traffic_load:institutes:peak_to_institutions_from_network",
+    16615: "traffic_load:universities:peak_from_institutions_to_network",
+    16616: "traffic_load:for_profit_orgs:peak_from_institutions_to_network",
+    16617: "traffic_load:further_education:peak_from_institutions_to_network",
+    16618: "traffic_load:hospitals:peak_to_institutions_from_network",
+    16619: "traffic_load:secondary_schools:peak_from_institutions_to_network",
+    16620: "traffic_load:universities:peak_to_institutions_from_network",
+    16621: "traffic_load:primary_schools:peak_from_institutions_to_network",
+    16622: "traffic_load:primary_schools:peak_to_institutions_from_network",
+    16623: "traffic_load:institutes:peak_from_institutions_to_network",
+    16624: "traffic_load:cultural:peak_from_institutions_to_network",
+    16625: "traffic_load:hospitals:peak_from_institutions_to_network",
+    16626: "traffic_load:further_education:peak_to_institutions_from_network",
+    16627: "traffic_load:government:peak_from_institutions_to_network",
+    16628: "traffic_load:government:peak_to_institutions_from_network",
+    16629: "traffic_load:iros:peak_from_institutions_to_network",
+    16630: "traffic_load:for_profit_orgs:peak_to_institutions_from_network",
+    16631: "traffic_load:cultural:peak_to_institutions_from_network",
+    16632: "traffic_load:iros:peak_to_institutions_from_network",
+    16634: "traffic_growth:iros:growth_rate",
+    16635: "traffic_growth:for_profit_orgs:growth_rate",
+    16636: "traffic_growth:institutes:growth_rate",
+    16637: "traffic_growth:primary_schools:growth_rate",
+    16638: "traffic_growth:further_education:growth_rate",
+    16639: "traffic_growth:universities:growth_rate",
+    16640: "traffic_growth:hospitals:growth_rate",
+    16641: "traffic_growth:secondary_schools:growth_rate",
+    16642: "traffic_growth:government:growth_rate",
+    16643: "traffic_growth:cultural:growth_rate",
+    16646: "commercial_organizations:commercial_service_provider:connection",  # "Yes - including transit to other networks" "Yes - national NREN access only" "Yes - only if sponsored by a connected institution" "No - not eligible for policy reasons" "No - but we offer a direct or IX peering" "No - financial restrictions (NREN is unable to charge/recover costs)" "No - other reason / unsure"
+    16647: "commercial_organizations:commercial_collaboration:connection",  # "Yes - including transit to other networks" "Yes - national NREN access only" "Yes - only if sponsored by a connected institution" "No - not eligible for policy reasons" "No - but we offer a direct or IX peering" "No - financial restrictions (NREN is unable to charge/recover costs)" "No - other reason / unsure"
+    16648: "commercial_organizations:commercial_r_e:connection",  # "Yes - including transit to other networks" "Yes - national NREN access only" "Yes - only if sponsored by a connected institution" "No - not eligible for policy reasons" "No - but we offer a direct or IX peering" "No - financial restrictions (NREN is unable to charge/recover costs)" "No - other reason / unsure"
+    16649: "commercial_organizations:commercial_general:connection",  # "Yes - including transit to other networks" "Yes - national NREN access only" "Yes - only if sponsored by a connected institution" "No - not eligible for policy reasons" "No - but we offer a direct or IX peering" "No - financial restrictions (NREN is unable to charge/recover costs)" "No - other reason / unsure"
+    16650: "commercial_organizations:university_spin_off:connection",  # "Yes - including transit to other networks" "Yes - national NREN access only" "Yes - only if sponsored by a connected institution" "No - not eligible for policy reasons" "No - but we offer a direct or IX peering" "No - financial restrictions (NREN is unable to charge/recover costs)" "No - other reason / unsure"
+    16652: "commercial_charging_levels:collaboration:charging_level",  # "Charges typically higher than for R+E users" "Same charging model as for R+E users" "Charges typically lower than for R+E users" "No charges applied if requested by R+E users"
+    16653: "commercial_charging_levels:services:charging_level",  # "Charges typically higher than for R+E users" "Same charging model as for R+E users" "Charges typically lower than for R+E users" "No charges applied if requested by R+E users"
+    16654: "commercial_charging_levels:peering:charging_level",  # "Charges typically higher than for R+E users" "Same charging model as for R+E users" "Charges typically lower than for R+E users" "No charges applied if requested by R+E users"
+    16656: "remote_campuses",  # "Yes" "No"
+    16658: "remote_campuses_specifics[0]:connected",  # NB free text, doesnt map properly
+    16659: "remote_campuses_specifics[0]:country",  # NB free text, doesnt map properly
+    16660: "connected_users_comments",  # but should we map comments or not?
 
 
 }

compendium_v2/routes/survey_model.json

@@ -826,7 +826,7 @@
            "text": "No - other reason"
           },
           {
-           "value": "item7",
+           "value": "unsure",
            "text": "Unsure/unclear"
           }
          ]