From af34b2f31f60bf82d948a7abd34e7f0e685de1a0 Mon Sep 17 00:00:00 2001 From: HO <93981322+VWSCoronaDashboard19@users.noreply.github.com> Date: Mon, 28 Nov 2022 13:47:37 +0100 Subject: [PATCH] chore: update and cleanup keys and data structure (#4515) --- packages/cms/src/data/data-structure.ts | 90 +++++++++++---------- packages/cms/src/lokalize/key-mutations.csv | 16 ---- 2 files changed, 48 insertions(+), 58 deletions(-) diff --git a/packages/cms/src/data/data-structure.ts b/packages/cms/src/data/data-structure.ts index 3e2f06c0b8..4998060e71 100644 --- a/packages/cms/src/data/data-structure.ts +++ b/packages/cms/src/data/data-structure.ts @@ -12,16 +12,18 @@ export const dataStructure = { 'admissions_on_date_of_reporting', ], tested_overall: ['infected', 'infected_moving_average', 'infected_moving_average_rounded', 'infected_per_100k', 'infected_per_100k_moving_average'], - sewer: ['average', 'total_number_of_samples', 'sampled_installation_count', 'total_installation_count'], + sewer: ['average', 'total_number_of_samples', 'sampled_installation_count', 'total_installation_count', 'data_is_outdated'], vaccine_coverage_per_age_group: [ - 'age_group_range', - 'autumn_2022_vaccinated_percentage', - 'fully_vaccinated_percentage', - 'booster_shot_percentage', - 'birthyear_range', - 'autumn_2022_vaccinated_percentage_label', - 'fully_vaccinated_percentage_label', - 'booster_shot_percentage_label', + 'vaccination_type', + 'birthyear_range_12_plus', + 'birthyear_range_18_plus', + 'birthyear_range_60_plus', + 'vaccinated_percentage_12_plus', + 'vaccinated_percentage_12_plus_label', + 'vaccinated_percentage_18_plus', + 'vaccinated_percentage_18_plus_label', + 'vaccinated_percentage_60_plus', + 'vaccinated_percentage_60_plus_label', ], vaccine_coverage_per_age_group_archived: [ 'age_group_range', @@ -41,28 +43,30 @@ export const dataStructure = { 'booster_shot_percentage_label', 'has_one_shot_percentage_label', ], - booster_coverage: ['age_group', 'percentage', 'percentage_label'], + booster_coverage_archived_20220904: ['age_group', 'percentage', 'percentage_label'], }, gm_collection: { hospital_nice: ['admissions_on_date_of_admission', 'admissions_on_date_of_admission_per_100000', 'admissions_on_date_of_reporting'], hospital_nice_choropleth: ['admissions_on_date_of_admission', 'admissions_on_date_of_admission_per_100000', 'admissions_on_date_of_reporting'], tested_overall: ['infected_per_100k', 'infected'], - sewer: ['average', 'total_installation_count'], + sewer: ['average', 'total_installation_count', 'data_is_outdated'], vaccine_coverage_per_age_group: [ - 'age_group_range', - 'autumn_2022_vaccinated_percentage', - 'fully_vaccinated_percentage', - 'booster_shot_percentage', - 'birthyear_range', - 'autumn_2022_vaccinated_percentage_label', - 'fully_vaccinated_percentage_label', - 'booster_shot_percentage_label', + 'vaccination_type', + 'birthyear_range_12_plus', + 'birthyear_range_18_plus', + 'birthyear_range_60_plus', + 'vaccinated_percentage_12_plus', + 'vaccinated_percentage_12_plus_label', + 'vaccinated_percentage_18_plus', + 'vaccinated_percentage_18_plus_label', + 'vaccinated_percentage_60_plus', + 'vaccinated_percentage_60_plus_label', ], }, nl: { - booster_shot_administered: ['administered_total', 'ggd_administered_total', 'others_administered_total'], + booster_shot_administered_archived_20220904: ['administered_total', 'ggd_administered_total', 'others_administered_total'], repeating_shot_administered: ['ggd_administered_total'], - booster_coverage: ['age_group', 'percentage'], + booster_coverage_archived_20220904: ['age_group', 'percentage'], doctor: ['covid_symptoms_per_100k', 'covid_symptoms'], g_number: ['g_number'], infectious_people: ['margin_low', 'estimate', 'margin_high'], @@ -232,10 +236,8 @@ export const dataStructure = { 'age_group_total', 'autumn_2022_vaccinated', 'fully_vaccinated', - 'booster_shot', 'autumn_2022_vaccinated_percentage', 'fully_vaccinated_percentage', - 'booster_shot_percentage', 'date_of_report_unix', 'birthyear_range', ], @@ -294,7 +296,7 @@ export const dataStructure = { topical: {}, vr: { g_number: ['g_number'], - sewer: ['average'], + sewer: ['average', 'data_is_outdated'], tested_overall: ['infected', 'infected_moving_average', 'infected_moving_average_rounded', 'infected_per_100k', 'infected_per_100k_moving_average'], hospital_nice: [ 'admissions_on_date_of_admission', @@ -393,14 +395,16 @@ export const dataStructure = { 'other', ], vaccine_coverage_per_age_group: [ - 'age_group_range', - 'autumn_2022_vaccinated_percentage', - 'fully_vaccinated_percentage', - 'booster_shot_percentage', - 'birthyear_range', - 'autumn_2022_vaccinated_percentage_label', - 'fully_vaccinated_percentage_label', - 'booster_shot_percentage_label', + 'vaccination_type', + 'birthyear_range_12_plus', + 'birthyear_range_18_plus', + 'birthyear_range_60_plus', + 'vaccinated_percentage_12_plus', + 'vaccinated_percentage_12_plus_label', + 'vaccinated_percentage_18_plus', + 'vaccinated_percentage_18_plus_label', + 'vaccinated_percentage_60_plus', + 'vaccinated_percentage_60_plus_label', ], vaccine_coverage_per_age_group_archived: [ 'age_group_range', @@ -420,14 +424,14 @@ export const dataStructure = { 'booster_shot_percentage_label', 'has_one_shot_percentage_label', ], - booster_coverage: ['age_group', 'percentage', 'percentage_label'], + booster_coverage_archived_20220904: ['age_group', 'percentage', 'percentage_label'], }, vr_collection: { hospital_nice: ['admissions_on_date_of_admission', 'admissions_on_date_of_admission_per_100000', 'admissions_on_date_of_reporting'], hospital_nice_choropleth: ['admissions_on_date_of_admission', 'admissions_on_date_of_admission_per_100000', 'admissions_on_date_of_reporting'], tested_overall: ['infected_per_100k', 'infected'], nursing_home: ['newly_infected_people', 'newly_infected_locations', 'infected_locations_total', 'infected_locations_percentage', 'deceased_daily'], - sewer: ['average'], + sewer: ['average', 'data_is_outdated'], behavior_archived_20221019: [ 'number_of_participants', 'curfew_compliance', @@ -471,14 +475,16 @@ export const dataStructure = { elderly_at_home: ['positive_tested_daily', 'positive_tested_daily_per_100k', 'deceased_daily'], situations: ['has_sufficient_data', 'home_and_visits', 'work', 'school_and_day_care', 'health_care', 'gathering', 'travel', 'hospitality', 'other'], vaccine_coverage_per_age_group: [ - 'age_group_range', - 'autumn_2022_vaccinated_percentage', - 'fully_vaccinated_percentage', - 'booster_shot_percentage', - 'birthyear_range', - 'autumn_2022_vaccinated_percentage_label', - 'fully_vaccinated_percentage_label', - 'booster_shot_percentage_label', + 'vaccination_type', + 'birthyear_range_12_plus', + 'birthyear_range_18_plus', + 'birthyear_range_60_plus', + 'vaccinated_percentage_12_plus', + 'vaccinated_percentage_12_plus_label', + 'vaccinated_percentage_18_plus', + 'vaccinated_percentage_18_plus_label', + 'vaccinated_percentage_60_plus', + 'vaccinated_percentage_60_plus_label', ], }, }; diff --git a/packages/cms/src/lokalize/key-mutations.csv b/packages/cms/src/lokalize/key-mutations.csv index 29d273cf79..a7c6419a8a 100644 --- a/packages/cms/src/lokalize/key-mutations.csv +++ b/packages/cms/src/lokalize/key-mutations.csv @@ -1,17 +1 @@ timestamp,action,key,document_id,move_to -2022-11-07T15:09:11.939Z,add,common.choropleth_tooltip.gm.outdated_data_notification,TrUIlGMFRR6fBR627mmYKT,__ -2022-11-07T15:41:35.054Z,delete,common.choropleth_tooltip.gm.outdated_data_notification,TrUIlGMFRR6fBR627mmYKT,__ -2022-11-07T15:57:14.611Z,add,common.choropleth_tooltip.outdated_data_notification,Fgb5SAAswLDPRQ9KRzHRc8,__ -2022-11-07T16:00:34.118Z,delete,common.choropleth_tooltip.outdated_data_notification,Fgb5SAAswLDPRQ9KRzHRc8,__ -2022-11-07T16:01:10.105Z,add,common.choropleth_tooltip.gm.average.outdated_data_notification,Fgb5SAAswLDPRQ9KRzIAnG,__ -2022-11-07T16:01:11.103Z,add,common.choropleth_tooltip.vr.average.outdated_data_notification,BBCOmHCrMQzaQKV1wWKvZ9,__ -2022-11-11T08:49:48.826Z,add,pages.sewer_page.nl.choropleth_legend_outdated_data_label,TrUIlGMFRR6fBR628D5VMd,__ -2022-11-21T09:11:46.413Z,add,common.common.age_groups.12,UE7TbOA80ovT85nyy1gcYy,__ -2022-11-21T09:11:47.332Z,add,common.common.age_groups.18,UE7TbOA80ovT85nyy1gcqO,__ -2022-11-21T09:11:48.400Z,add,common.common.age_groups.60,Tg1qSQfR7l8JBUWv7hoA0J,__ -2022-11-21T09:11:49.412Z,add,common.vaccinations.coverage_kinds.autumn_2022,cMBWaVHxQUmXKxLgJyJ8LF,__ -2022-11-21T09:11:50.358Z,add,common.vaccinations.coverage_kinds.fully_basisserie,cMBWaVHxQUmXKxLgJyJ8aT,__ -2022-11-21T09:11:50.359Z,delete,common.vaccinations.coverage_kinds.autumn_2022_vaccinated_percentage,NGAoa2ArqEakZsIxnSDBhz,__ -2022-11-21T09:11:50.360Z,delete,common.vaccinations.coverage_kinds.fully_vaccinated_percentage,jDbv30Y7XYH5kl8ZaoSZwv,__ -2022-11-23T09:37:10.394Z,add,common.vaccinations.coverage_kinds.primary_series,cMBWaVHxQUmXKxLgKD55A5,__ -2022-11-23T09:37:10.395Z,delete,common.vaccinations.coverage_kinds.fully_basisserie,cMBWaVHxQUmXKxLgJyJ8aT,__