Skip to content
Snippets Groups Projects
Commit f84b4033 authored by Bjarke Madsen's avatar Bjarke Madsen
Browse files

Check against radio button choices for some questions

parent bb2afde1
No related branches found
No related tags found
No related merge requests found
...@@ -110,8 +110,9 @@ def _map_2023(nren, answers) -> None: ...@@ -110,8 +110,9 @@ def _map_2023(nren, answers) -> None:
non_technical_fte=decimal_or_zero(staff_roles, "nontechnical_fte") non_technical_fte=decimal_or_zero(staff_roles, "nontechnical_fte")
)) ))
has_parent = answers.get("parent_organization") == "Yes"
parent = answers.get("parent_organization_name") parent = answers.get("parent_organization_name")
if parent: if has_parent and parent:
db.session.add(ParentOrganization(nren_id=nren.id, nren=nren, year=year, organization=parent)) db.session.add(ParentOrganization(nren_id=nren.id, nren=nren, year=year, organization=parent))
has_subs = answers.get("suborganizations") == 'Yes' has_subs = answers.get("suborganizations") == 'Yes'
...@@ -126,9 +127,9 @@ def _map_2023(nren, answers) -> None: ...@@ -126,9 +127,9 @@ def _map_2023(nren, answers) -> None:
organization=sub.get("suborganization_name"), organization=sub.get("suborganization_name"),
role=role role=role
)) ))
has_ec_projects = answers.get("ec_projects") == "Yes"
ec_projects = answers.get("ec_project_names") ec_projects = answers.get("ec_project_names")
if ec_projects: if has_ec_projects and ec_projects:
for ec_project in ec_projects: for ec_project in ec_projects:
if ec_project: if ec_project:
db.session.add( db.session.add(
...@@ -169,14 +170,16 @@ def _map_2023(nren, answers) -> None: ...@@ -169,14 +170,16 @@ def _map_2023(nren, answers) -> None:
urls=urls urls=urls
)) ))
central_procurement = answers.get("central_software_procurement") central_procurement = answers.get("central_software_procurement") == "Yes"
if central_procurement: if central_procurement:
central_procurement = central_procurement == "Yes" central_procurement_amount = decimal_or_none(answers, "central_procurement_amount")
db.session.add(CentralProcurement( else:
nren_id=nren.id, nren=nren, year=year, central_procurement_amount = None
central_procurement=central_procurement, db.session.add(CentralProcurement(
amount=decimal_or_none(answers, "central_procurement_amount") nren_id=nren.id, nren=nren, year=year,
)) central_procurement=central_procurement,
amount=central_procurement_amount
))
formal_service_management_framework = answers.get("formal_service_management_framework") formal_service_management_framework = answers.get("formal_service_management_framework")
service_level_targets = answers.get("service_level_targets") service_level_targets = answers.get("service_level_targets")
...@@ -199,10 +202,11 @@ def _map_2023(nren, answers) -> None: ...@@ -199,10 +202,11 @@ def _map_2023(nren, answers) -> None:
service_category=service_type service_category=service_type
)) ))
has_eosc_listings = answers.get("service_portfolio_eosc_portal") == "Yes"
services_on_eosc_portal_list = answers.get("services_on_eosc_portal_list", []) services_on_eosc_portal_list = answers.get("services_on_eosc_portal_list", [])
eosc_list = [i.get("service_name") for i in services_on_eosc_portal_list] eosc_list = [i.get("service_name") for i in services_on_eosc_portal_list]
eosc_list = [i for i in eosc_list if i] eosc_list = [i for i in eosc_list if i]
if eosc_list: if has_eosc_listings and eosc_list:
db.session.add(EOSCListings( db.session.add(EOSCListings(
nren_id=nren.id, nren=nren, year=year, nren_id=nren.id, nren=nren, year=year,
service_names=eosc_list service_names=eosc_list
...@@ -329,20 +333,23 @@ def _map_2023(nren, answers) -> None: ...@@ -329,20 +333,23 @@ def _map_2023(nren, answers) -> None:
remote_campuses = answers.get("remote_campuses") remote_campuses = answers.get("remote_campuses")
if remote_campuses: if remote_campuses:
remote_campuses = remote_campuses == "Yes" remote_campuses = remote_campuses == "Yes"
remote_campuses_specifics = answers.get("remote_campuses_specifics", [])
remote_campuses_specifics = [ if remote_campuses:
{"country": i.get("country", ""), "local_r_and_e_connection": bool_or_none(i, "connected")} remote_campuses_specifics = answers.get("remote_campuses_specifics", [])
for i in remote_campuses_specifics remote_campuses_specifics = [
] {"country": i.get("country", ""), "local_r_and_e_connection": bool_or_none(i, "connected")}
for i in remote_campuses_specifics
]
else:
remote_campuses_specifics = []
db.session.add(RemoteCampuses( db.session.add(RemoteCampuses(
nren_id=nren.id, nren=nren, year=year, nren_id=nren.id, nren=nren, year=year,
remote_campus_connectivity=remote_campuses, remote_campus_connectivity=remote_campuses,
connections=remote_campuses_specifics connections=remote_campuses_specifics
)) ))
dark_fibre_lease = answers.get("dark_fibre_lease") dark_fibre_lease = answers.get("dark_fibre_lease") == "Yes"
if dark_fibre_lease: if dark_fibre_lease:
dark_fibre_lease = dark_fibre_lease == "Yes"
db.session.add(DarkFibreLease( db.session.add(DarkFibreLease(
nren_id=nren.id, nren=nren, year=year, nren_id=nren.id, nren=nren, year=year,
iru_or_lease=dark_fibre_lease, iru_or_lease=dark_fibre_lease,
...@@ -351,9 +358,8 @@ def _map_2023(nren, answers) -> None: ...@@ -351,9 +358,8 @@ def _map_2023(nren, answers) -> None:
iru_duration=decimal_or_none(answers, "dark_fibre_lease_duration") iru_duration=decimal_or_none(answers, "dark_fibre_lease_duration")
)) ))
dark_fibre_nren = answers.get("dark_fibre_nren") dark_fibre_nren = answers.get("dark_fibre_nren") == "Yes"
if dark_fibre_nren: if dark_fibre_nren:
dark_fibre_nren = dark_fibre_nren == "Yes"
db.session.add(DarkFibreInstalled( db.session.add(DarkFibreInstalled(
nren_id=nren.id, nren=nren, year=year, nren_id=nren.id, nren=nren, year=year,
installed=dark_fibre_nren, installed=dark_fibre_nren,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment