diff --git a/data_storage/UK/Crime/combined_crime_uk.db b/data_storage/UK/Crime/combined_crime_uk.db index 6d5281bcb78561d54a3afbe97a335d0c6113f994..db7b6fa031c4608dafdef468e8c5fd777f853349 100644 Binary files a/data_storage/UK/Crime/combined_crime_uk.db and b/data_storage/UK/Crime/combined_crime_uk.db differ diff --git a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_expenditure.db b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_expenditure.db index 80d80ecd725de464ce3dc13aecba0bc10c8cc6fd..e4c3138eeb08a693524d16e8286e5c2c63fd165a 100644 Binary files a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_expenditure.db and b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_expenditure.db differ diff --git a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_highest_qualifications_time_series_rounded.db b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_highest_qualifications_time_series_rounded.db index 3ca9ffb9827a993e335212e4c46fec8054f6af52..a37e6271e4bc0738bf86eac5fd8c7d5cbbefbb7a 100644 Binary files a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_highest_qualifications_time_series_rounded.db and b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_highest_qualifications_time_series_rounded.db differ diff --git a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_neet.db b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_neet.db index bd9886f4548e33952604cc949065eb0baa25bca2..9e466b3b8f607a32c9d5754bef3047ee72c8c514 100644 Binary files a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_neet.db and b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_neet.db differ diff --git a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_post_compulsory_education_fe_students.db b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_post_compulsory_education_fe_students.db index 7902b615ab82831138e1e11b58d6fe6ef48ddbb6..7f9fe29a781009c84a89b4e04b19a695d100f9d3 100644 Binary files a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_post_compulsory_education_fe_students.db and b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_post_compulsory_education_fe_students.db differ diff --git a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_post_compulsory_education_he_students.db b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_post_compulsory_education_he_students.db index eb66727d5b73ab33de6c26f642f538849cbd1105..61db8c2f5cba7adb6eea5aef9ac2b58f74a6bc43 100644 Binary files a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_post_compulsory_education_he_students.db and b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_post_compulsory_education_he_students.db differ diff --git a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_post_compulsory_education_institutions.db b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_post_compulsory_education_institutions.db index 91ca59622cbe8affa42ed7665dbe3f019c3bc95a..0b4467a36bf868ad6ac57a734d31ea95b270cc30 100644 Binary files a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_post_compulsory_education_institutions.db and b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_post_compulsory_education_institutions.db differ diff --git a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_pupil_teacher_ratios.db b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_pupil_teacher_ratios.db index 6bc77c5989eed9389e1a38f184d31e056c070ee4..169213fb82d92c916c418006623c2803918a065c 100644 Binary files a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_pupil_teacher_ratios.db and b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_pupil_teacher_ratios.db differ diff --git a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_pupils_suppressed.db b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_pupils_suppressed.db index e1fdf2a5d444bf288190a16734e20c8d962004d0..5959f77d67c0419334f94a47d5be3060a8023dd5 100644 Binary files a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_pupils_suppressed.db and b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_pupils_suppressed.db differ diff --git a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_schools.db b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_schools.db index 3dfed68612c7b69d0a16848dd6cc05f45853eca9..5c7670a3850b02e5d50ed3e9d2e8ce9a7fd56a30 100644 Binary files a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_schools.db and b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_schools.db differ diff --git a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_teachers_suppressed.db b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_teachers_suppressed.db index 5845143ff9df15dc86b0f4f8a13a0cce7ef78306..e9ad821c99462f3dbd3a3614396bd1d3f2d01fa8 100644 Binary files a/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_teachers_suppressed.db and b/data_storage/UK/Education/education-and-training-statistics-for-the-uk_2024/data/uk_teachers_suppressed.db differ diff --git a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_income_la_regional_national.db b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_income_la_regional_national.db index 1a309804c247479d2af9ed0c6e3473da8939edd1..39da6990b70bf8c774d65b9552668f9cb0c2ac01 100644 Binary files a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_income_la_regional_national.db and b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_income_la_regional_national.db differ diff --git a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_income_national_summary.db b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_income_national_summary.db index c8c9c2f4c86958a9793855dfb3c6f653ca814ff8..0effe924fb33e6c3276daa02212c8aed5857bf45 100644 Binary files a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_income_national_summary.db and b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_income_national_summary.db differ diff --git a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_revenue_reserve_la_regional_national_data.db b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_revenue_reserve_la_regional_national_data.db index a3e6509402d980e04beb98e8e0a315db9255ba6f..47109cf0eff0e2bcbad0da90506094eb08690db2 100644 Binary files a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_revenue_reserve_la_regional_national_data.db and b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_revenue_reserve_la_regional_national_data.db differ diff --git a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_revenue_reserves_national_rounded_data.db b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_revenue_reserves_national_rounded_data.db index 94cd8d7adb721c656521aa9665950bc9f200c9e5..88c9641947f3d7a444e7f5b7ef0bb07c9630b2cd 100644 Binary files a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_revenue_reserves_national_rounded_data.db and b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/cfr_revenue_reserves_national_rounded_data.db differ diff --git a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/headline_key_figures.db b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/headline_key_figures.db index 99be58afe51df9fa9059060ef1a99c8fd47d1295..0401025aa15e92a511423bd9f942f3cc2feb68bf 100644 Binary files a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/headline_key_figures.db and b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/headline_key_figures.db differ diff --git a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/s251_childrens_young_peoples_services_la_regional_national.db b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/s251_childrens_young_peoples_services_la_regional_national.db index 897510ecc9a7d3b93f093d2a25d6baa02b319a39..2718e7c092dfa6813ece910a0fd2a00e1ce85546 100644 Binary files a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/s251_childrens_young_peoples_services_la_regional_national.db and b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/s251_childrens_young_peoples_services_la_regional_national.db differ diff --git a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/s251_childrens_young_peoples_services_national.db b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/s251_childrens_young_peoples_services_national.db index 9819bf449794f3b22c8b12bf5e6dc0b97db0a381..044c153e726b6d2b3f7c8cf9468c7255e193c6b0 100644 Binary files a/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/s251_childrens_young_peoples_services_national.db and b/data_storage/UK/Education/la-and-school-expenditure_2023-24/data/s251_childrens_young_peoples_services_national.db differ diff --git a/data_storage/UK/Education/school-funding-statistics_2023-24/data/20240125_fig2.db b/data_storage/UK/Education/school-funding-statistics_2023-24/data/20240125_fig2.db index 481c4fd859a60192426ed2e6e24d7ca81090cbab..7072883a04b2fbc294f6b89dce4d45473a2a3db9 100644 Binary files a/data_storage/UK/Education/school-funding-statistics_2023-24/data/20240125_fig2.db and b/data_storage/UK/Education/school-funding-statistics_2023-24/data/20240125_fig2.db differ diff --git a/data_storage/UK/Education/school-funding-statistics_2023-24/data/20240125_school_level_data_csv.db b/data_storage/UK/Education/school-funding-statistics_2023-24/data/20240125_school_level_data_csv.db index ecb65f303282ad00b8058dc9d876c1869c746dbb..71fd8ac613e82d3a3905ec96973d82e834c76d60 100644 Binary files a/data_storage/UK/Education/school-funding-statistics_2023-24/data/20240125_school_level_data_csv.db and b/data_storage/UK/Education/school-funding-statistics_2023-24/data/20240125_school_level_data_csv.db differ diff --git a/data_storage/UK/Education/school-funding-statistics_2023-24/data/20240125_tab1.db b/data_storage/UK/Education/school-funding-statistics_2023-24/data/20240125_tab1.db index bd4d44913d1a687b865160b2787adbdc74243124..4e04265f8cc739f7ae44c1910e2ec00963a74908 100644 Binary files a/data_storage/UK/Education/school-funding-statistics_2023-24/data/20240125_tab1.db and b/data_storage/UK/Education/school-funding-statistics_2023-24/data/20240125_tab1.db differ diff --git a/data_storage/UN/Crime/SYB67_328_202411_Intentional homicides and other crimes.db b/data_storage/UN/Crime/SYB67_328_202411_Intentional homicides and other crimes.db index 806b5bb9be253709ab9203e1039f8ca670efa88d..6e56cccc53f3f0f3d600c5dfd1ac252828456aa7 100644 Binary files a/data_storage/UN/Crime/SYB67_328_202411_Intentional homicides and other crimes.db and b/data_storage/UN/Crime/SYB67_328_202411_Intentional homicides and other crimes.db differ diff --git a/data_storage/UN/Crime/UN_Crime_Continents.db b/data_storage/UN/Crime/UN_Crime_Continents.db index f3226cfa940a8a1605fc02a38ea959682194f0a0..664b0c3dae36ef9c92e5a3ba8666e4ef8e32b31c 100644 Binary files a/data_storage/UN/Crime/UN_Crime_Continents.db and b/data_storage/UN/Crime/UN_Crime_Continents.db differ diff --git a/data_storage/UN/Economy/GDP_per_capita_continents.db b/data_storage/UN/Economy/GDP_per_capita_continents.db index 08881b9a8caea3f2288960e97a6e43a1d98b122f..f9df474e0872e57aa720bf5345cbe74e92f02016 100644 Binary files a/data_storage/UN/Economy/GDP_per_capita_continents.db and b/data_storage/UN/Economy/GDP_per_capita_continents.db differ diff --git a/data_storage/UN/Economy/Government_final_consumption_expenditure_by_function_at_current_prices.db b/data_storage/UN/Economy/Government_final_consumption_expenditure_by_function_at_current_prices.db index eee002abbb6161bd7c94b98a1b19a973a21713a0..dde7736c2e3329707406c63d7b4184da2a69a1b7 100644 Binary files a/data_storage/UN/Economy/Government_final_consumption_expenditure_by_function_at_current_prices.db and b/data_storage/UN/Economy/Government_final_consumption_expenditure_by_function_at_current_prices.db differ diff --git a/data_storage/UN/Economy/SYB67_128_202411_Consumer Price Index.db b/data_storage/UN/Economy/SYB67_128_202411_Consumer Price Index.db index 56b8395196a8ff5319ecb6c01e2d0f9239fdba61..6399c5daa62596d9119f37d263fcf51386b9f5d8 100644 Binary files a/data_storage/UN/Economy/SYB67_128_202411_Consumer Price Index.db and b/data_storage/UN/Economy/SYB67_128_202411_Consumer Price Index.db differ diff --git a/data_storage/UN/Economy/SYB67_230_202411_GDP and GDP Per Capita.db b/data_storage/UN/Economy/SYB67_230_202411_GDP and GDP Per Capita.db index 273991b2dc98d3d6b7d41b355ee5714870222c0f..3a604b0fcf873dd465ee84515768ec2860db9daa 100644 Binary files a/data_storage/UN/Economy/SYB67_230_202411_GDP and GDP Per Capita.db and b/data_storage/UN/Economy/SYB67_230_202411_GDP and GDP Per Capita.db differ diff --git a/data_storage/UN/Education/SYB67_245_202411_Public expenditure on education and access to computers.db b/data_storage/UN/Education/SYB67_245_202411_Public expenditure on education and access to computers.db index 8e082aa8c72f225db0cbcffc4103e6fffd5ea71e..4d6e3f0318170083f9e6b4dc6736eb9bde2217e0 100644 Binary files a/data_storage/UN/Education/SYB67_245_202411_Public expenditure on education and access to computers.db and b/data_storage/UN/Education/SYB67_245_202411_Public expenditure on education and access to computers.db differ diff --git a/data_storage/UN/Education/SYB67_309_202411_Education.db b/data_storage/UN/Education/SYB67_309_202411_Education.db index 5218fe46614a47a8d2efefbc33b3ea0e9e6a6047..225fc8fd17d089f282d7ff6aa60ce9c21a4598af 100644 Binary files a/data_storage/UN/Education/SYB67_309_202411_Education.db and b/data_storage/UN/Education/SYB67_309_202411_Education.db differ diff --git a/data_storage/UN/Education/SYB67_323_202411_Teaching Staff in education.db b/data_storage/UN/Education/SYB67_323_202411_Teaching Staff in education.db index 5e780aa845112654dff1b5e918f8ec3920636de2..0991342d364d27f7fd6501971a34400f718ab0af 100644 Binary files a/data_storage/UN/Education/SYB67_323_202411_Teaching Staff in education.db and b/data_storage/UN/Education/SYB67_323_202411_Teaching Staff in education.db differ diff --git a/data_storage/UN/Gender/SYB67_319_202411_Ratio of girls to boys in education.db b/data_storage/UN/Gender/SYB67_319_202411_Ratio of girls to boys in education.db index 96a88475ff8b967110913e030819e6a151f684e6..e2691273d7eb76e8f35ade28ffa8ddc1f2d8835e 100644 Binary files a/data_storage/UN/Gender/SYB67_319_202411_Ratio of girls to boys in education.db and b/data_storage/UN/Gender/SYB67_319_202411_Ratio of girls to boys in education.db differ diff --git a/data_storage/UN/Health/SYB67_154_202411_Health Personnel.db b/data_storage/UN/Health/SYB67_154_202411_Health Personnel.db index e299fb3b1fad099436dc66e1bcfb86e6fd3c8efd..b7dc629e81ae8d2ffa3a9b0c92ab5404a6a955d0 100644 Binary files a/data_storage/UN/Health/SYB67_154_202411_Health Personnel.db and b/data_storage/UN/Health/SYB67_154_202411_Health Personnel.db differ diff --git a/data_storage/UN/Health/SYB67_325_202411_Expenditure on health.db b/data_storage/UN/Health/SYB67_325_202411_Expenditure on health.db index 9bee12caa159af8b600485421172b9750f314d53..6fac3af83c796b72a1d8c4e261e4e45b8c990f71 100644 Binary files a/data_storage/UN/Health/SYB67_325_202411_Expenditure on health.db and b/data_storage/UN/Health/SYB67_325_202411_Expenditure on health.db differ diff --git a/data_storage/UN/Internet/SYB67_314_202411_Internet Usage.db b/data_storage/UN/Internet/SYB67_314_202411_Internet Usage.db index 3aa5ad63739219878eb0f302fb8bebac30d1ea07..d16a6f745a7e106eeceb484d2079c0c0f7a74e6e 100644 Binary files a/data_storage/UN/Internet/SYB67_314_202411_Internet Usage.db and b/data_storage/UN/Internet/SYB67_314_202411_Internet Usage.db differ diff --git a/data_storage/UN/Labour/SYB67_200_202411_Employment.db b/data_storage/UN/Labour/SYB67_200_202411_Employment.db index 41c3a9db24fff1fa8112b551fdb98af297226c4c..db762c4bb5bc11d1dee1d2e4f56ae244230be206 100644 Binary files a/data_storage/UN/Labour/SYB67_200_202411_Employment.db and b/data_storage/UN/Labour/SYB67_200_202411_Employment.db differ diff --git a/data_storage/UN/Labour/SYB67_329_202411_Labour Force and Unemployment.db b/data_storage/UN/Labour/SYB67_329_202411_Labour Force and Unemployment.db index 2a48a2bd0f9425c34b9ca0c42beea55ef142e83c..dadab7e422308195cf8379b0fcd8c5a4e2d1c02a 100644 Binary files a/data_storage/UN/Labour/SYB67_329_202411_Labour Force and Unemployment.db and b/data_storage/UN/Labour/SYB67_329_202411_Labour Force and Unemployment.db differ diff --git a/data_storage/UN/Land/SYB67_145_202411_Land.db b/data_storage/UN/Land/SYB67_145_202411_Land.db index 4a4b30e8a4ddcf792f22d63e26364b7bb589432e..9be0812fe950085ac8744858a704ef8b6fa84199 100644 Binary files a/data_storage/UN/Land/SYB67_145_202411_Land.db and b/data_storage/UN/Land/SYB67_145_202411_Land.db differ diff --git a/graphs/graphs_display.html b/graphs/graphs_display.html index 4b0066443cd6e55c613753c0262c3bac83f390e2..4d20def23015ebf732ae893fa60b652db04c716f 100644 Binary files a/graphs/graphs_display.html and b/graphs/graphs_display.html differ diff --git a/main.py b/main.py index 05ace6118811722fa71854bd434208ca9d1b4aec..658ce21d9cb68940887a907d702d6c1f636fb641 100644 --- a/main.py +++ b/main.py @@ -78,7 +78,7 @@ def un_crime_line_chart(): fig.update_layout( title="Crime Rate Over Time: Total, all countries or areas", xaxis_title="Year", - yaxis_title="Homicide Rate", + yaxis_title="Homicide Rate per 100,000", updatemenus=[dict( buttons=buttons, direction="down", @@ -163,7 +163,7 @@ def gdp_per_continent(threshold=4): values=main_init["Percentage"] )], layout=go.Layout( - title=f"GDP per Capita (Percentage) - {initial_year}", + title=f"GDP per Capita (Percentage)", updatemenus=[dict( type="buttons", showactive=False, @@ -240,7 +240,7 @@ def large_grouped_bar_chart(): # Add Crime Rate bar fig.add_trace(go.Bar( - name='Average Crime Rate', + name='Average Homidice Rate per 100,000', x=merged_df["Region_Country_Area"], y=merged_df["Avg_Crime_Rate"], yaxis='y2', @@ -373,7 +373,7 @@ def combined_choropleth(): margin=dict(l=0, r=0, t=50, b=0), updatemenus=[dict( x=0.85, # position of the dropdown horizontally - y=1.3, # position of the dropdown vertically + y=1.4, # position of the dropdown vertically xanchor="right", yanchor="top", buttons=buttons @@ -709,10 +709,10 @@ def graph8(): if __name__ == "__main__": graphs = [ ("Map of World Crime", combined_choropleth, "UN", "Crime"), - ("Total Recorded Crime 2002-2022", un_crime_line_chart, "UN", "Crime"), + ("Homicide Rate", un_crime_line_chart, "UN", "Crime"), ("GDP per Capita (USD) by Continent", gdp_per_continent, "UN", "Socioeconomic"), - ("Crime and Economy", large_grouped_bar_chart, "UN", "Crime"), - ("Total Recorded Crime 2015-2024", graph9, "UK", "Crime"), + ("Crime and Economy", large_grouped_bar_chart, "UN", "Socioeconomic"), + ("Total Recorded Crime", graph9, "UK", "Crime"), ("UK Education Expenditure", graph8, "UK", "Socioeconomic"), ("UK Crime Bar Chart", graph10, "UK", "Crime"), ("Distribution of Crime Types", graph11, "UK", "Crime")