diff --git a/compendium_v2/publishers/excel_parser.py b/compendium_v2/publishers/excel_parser.py index 94a30647b3c4014649e728bf7b0b8c9cdad8d364..b2d5a3c8aed99fec2f20b0dc4d9913339c620eb0 100644 --- a/compendium_v2/publishers/excel_parser.py +++ b/compendium_v2/publishers/excel_parser.py @@ -495,6 +495,7 @@ def fetch_remit_excel_data(): logger.warning(f'unknown remit: {excel_remit}') result = {} + def create_points_for_year(year, start_column): for i in range(8, 51): nren_name = rows[i][start_column].value @@ -522,8 +523,8 @@ def fetch_nr_connected_excel_data(): sheet_name = "Connected Institutions" ws = wb[sheet_name] rows = list(ws.rows) - result = {} + def create_points_for_year(year, start_column): for i in range(5, 48): nren_name = rows[i][start_column].value @@ -548,8 +549,8 @@ def fetch_market_share_excel_data(): sheet_name = "Table Market Share" ws = wb[sheet_name] rows = list(ws.rows) - result = {} + def create_points_for_year(year, start_column): for i in range(8, 51): nren_name = rows[i][start_column].value @@ -576,8 +577,8 @@ def fetch_users_served_excel_data(): sheet_name = "Users" ws = wb[sheet_name] rows = list(ws.rows) - result = {} + def create_points_for_year(year, start_column): for i in range(4, 47): nren_name = rows[i][start_column].value @@ -602,8 +603,8 @@ def fetch_typical_speed_excel_data(): sheet_name = "Table _Typical IP Link capacity" ws = wb[sheet_name] rows = list(ws.rows) - result = {} + def create_points_for_year(year, start_column): for i in range(33, 76): nren_name = rows[i][start_column].value @@ -630,8 +631,8 @@ def fetch_highest_speed_excel_data(): sheet_name = "Table _Highest IP Link capacity" ws = wb[sheet_name] rows = list(ws.rows) - result = {} + def create_points_for_year(year, start_column): for i in range(33, 76): nren_name = rows[i][start_column].value @@ -658,8 +659,8 @@ def fetch_highest_speed_proportion_excel_data(): sheet_name = "Aver High cap conn Share" ws = wb[sheet_name] rows = list(ws.rows) - result = {} + def create_points_for_year(year, start_column): for i in range(5, 48): nren_name = rows[i][start_column].value @@ -700,6 +701,7 @@ def fetch_carriers_excel_data(): logger.warning(f'unknown carrier: {excel_carrier}') result = {} + def create_points_for_year(year, start_column): for i in range(3, 46): nren_name = rows[i][start_column].value @@ -724,8 +726,8 @@ def fetch_growth_excel_data(): sheet_name = "Table Traffic Growth % " ws = wb[sheet_name] rows = list(ws.rows) - result = {} + def create_points_for_year(year, start_column): for i in range(5, 46): nren_name = rows[i][start_column].value @@ -750,8 +752,8 @@ def fetch_average_traffic_excel_data(): sheet_name = "Average Traffic" ws = wb[sheet_name] rows = list(ws.rows) - result = {} + def create_points_for_year(year, start_column): for i in range(5, 48): nren_name = rows[i][start_column].value @@ -777,8 +779,8 @@ def fetch_peak_traffic_excel_data(): sheet_name = "Peak traffic" ws = wb[sheet_name] rows = list(ws.rows) - result = {} + def create_points_for_year(year, start_column): for i in range(6, 49): nren_name = rows[i][start_column].value diff --git a/compendium_v2/publishers/survey_publisher_legacy_excel.py b/compendium_v2/publishers/survey_publisher_legacy_excel.py index 059d7d93d1b927bb95024a5ee08a914e3ac15a1c..fadee87a53d7dd654fa191510b507a9121d8a46d 100644 --- a/compendium_v2/publishers/survey_publisher_legacy_excel.py +++ b/compendium_v2/publishers/survey_publisher_legacy_excel.py @@ -433,19 +433,18 @@ def db_remote_campuses_migration(nren_dict): def _cli(app): with app.app_context(): nren_dict = helpers.get_uppercase_nren_dict() - # db_budget_migration(nren_dict) - # db_funding_migration(nren_dict) - # db_charging_structure_migration(nren_dict) - # db_staffing_migration(nren_dict) - # db_ecprojects_migration(nren_dict) - # db_organizations_migration(nren_dict) - # db_traffic_volume_migration(nren_dict) - # db_services_migration() - # db_nren_services_migration(nren_dict) - - # db_connected_proportion_migration(nren_dict) - # db_connectivity_level_migration(nren_dict) - + db_budget_migration(nren_dict) + db_funding_migration(nren_dict) + db_charging_structure_migration(nren_dict) + db_staffing_migration(nren_dict) + db_ecprojects_migration(nren_dict) + db_organizations_migration(nren_dict) + db_traffic_volume_migration(nren_dict) + db_services_migration() + db_nren_services_migration(nren_dict) + + db_connected_proportion_migration(nren_dict) + db_connectivity_level_migration(nren_dict) db_connection_carrier_migration(nren_dict) db_connectivity_growth_migration(nren_dict) db_connectivity_load_migration(nren_dict)