From 1eb38f0e848401fee1eb52ca5dca74ebe8c99197 Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard25 <98813868+VWSCoronaDashboard25@users.noreply.github.com> Date: Fri, 21 Apr 2023 09:30:56 +0200 Subject: [PATCH 1/5] chore(key-mutations.csv): sync cms after release (#4754) --- packages/cms/src/lokalize/key-mutations.csv | 509 -------------------- 1 file changed, 509 deletions(-) diff --git a/packages/cms/src/lokalize/key-mutations.csv b/packages/cms/src/lokalize/key-mutations.csv index 2987d964be..a7c6419a8a 100644 --- a/packages/cms/src/lokalize/key-mutations.csv +++ b/packages/cms/src/lokalize/key-mutations.csv @@ -1,510 +1 @@ timestamp,action,key,document_id,move_to -2023-03-21T10:10:15.918Z,delete,common.common.veiligheidsregio_label,jF33EuwumlGuwav2FD3gOS,__ -2023-03-21T13:32:36.900Z,add,pages.vaccinations_page.gm.bronnen.rivm.download,qAiz52vTEAxO2GlVGsZghw,__ -2023-03-21T13:32:37.948Z,add,pages.vaccinations_page.gm.bronnen.rivm.href,0l2RiEJzGzK1fkzwXwH0RT,__ -2023-03-21T13:32:39.016Z,add,pages.vaccinations_page.gm.bronnen.rivm.text,rjdXTk1G5FCmwrjr0m0WX6,__ -2023-03-22T07:55:22.183Z,add,pages.vaccinations_page.shared.bronnen.rivm.download,21Pj6HJGA3EcTfimnqclgX,__ -2023-03-22T07:55:23.102Z,add,pages.vaccinations_page.shared.bronnen.rivm.href,21Pj6HJGA3EcTfimnqclqn,__ -2023-03-22T07:55:24.229Z,add,pages.vaccinations_page.shared.bronnen.rivm.text,qAiz52vTEAxO2GlVGttAI0,__ -2023-03-22T07:55:24.230Z,delete,pages.vaccinations_page.gm.bronnen.rivm.download,qAiz52vTEAxO2GlVGsZghw,__ -2023-03-22T07:55:24.230Z,delete,pages.vaccinations_page.gm.bronnen.rivm.href,0l2RiEJzGzK1fkzwXwH0RT,__ -2023-03-22T07:55:24.231Z,delete,pages.vaccinations_page.gm.bronnen.rivm.text,rjdXTk1G5FCmwrjr0m0WX6,__ -2023-03-21T10:20:24.789Z,add,common.variant_codes.XBB_1_9,RyCRpDTGPDLYu6gaddCWdr,__ -2023-03-21T10:20:26.048Z,add,common.variant_codes.XBB_1_5_1,ps9F7aH5kHk3YIueyBw9hz,__ -2023-03-21T10:20:27.093Z,add,common.variant_codes.XBB_2_3,ps9F7aH5kHk3YIueyBwAHn,__ -2023-03-21T10:20:28.116Z,add,common.variant_codes.XBB_1_9_1,eCGP1L6ULnem2F6oJS4kuB,__ -2023-03-21T10:20:29.124Z,add,common.variant_codes.XBB_1_6,ps9F7aH5kHk3YIueyBwAgr,__ -2023-03-21T10:20:30.147Z,add,common.variant_codes.XBF,ps9F7aH5kHk3YIueyBwB9V,__ -2023-03-21T12:32:29.754Z,delete,common.variant_codes.XBB_1_6,ps9F7aH5kHk3YIueyBwAgr,__ -2023-03-21T12:35:01.148Z,add,common.variant_codes.XBB_1_16,qAiz52vTEAxO2GlVGsTNF8,__ -2023-03-22T10:28:29.290Z,delete,pages.behavior_page.shared.meer_onderzoeksresultaten.description,jF33EuwumlGuwav2FD3sQu,__ -2023-03-22T10:28:29.290Z,delete,pages.behavior_page.shared.meer_onderzoeksresultaten.link_href,jF33EuwumlGuwav2FD3sUG,__ -2023-03-22T10:28:29.292Z,delete,pages.behavior_page.shared.meer_onderzoeksresultaten.link_label,jF33EuwumlGuwav2FD3sSa,__ -2023-03-22T10:28:29.294Z,delete,pages.behavior_page.shared.meer_onderzoeksresultaten.title,jF33EuwumlGuwav2FD3sPE,__ -2023-03-22T10:28:29.296Z,delete,pages.behavior_page.vr.basisregels.description,KGhe1o8loW86HkK2zkJxly,__ -2023-03-22T10:28:29.298Z,delete,pages.behavior_page.vr.basisregels.intro.compliance,jF33EuwumlGuwav2FD3toS,__ -2023-03-22T10:28:29.301Z,delete,pages.behavior_page.vr.basisregels.intro.support,jF33EuwumlGuwav2FD3tq8,__ -2023-03-22T10:28:29.305Z,delete,pages.behavior_page.vr.basisregels.steunen_beschrijving,7wdlutZNkP0LZIK1UVt03C,__ -2023-03-22T10:28:29.308Z,delete,pages.behavior_page.vr.basisregels.title,jF33EuwumlGuwav2FD3tmm,__ -2023-03-22T10:28:29.310Z,delete,pages.behavior_page.vr.basisregels.voetnoot.compliance,jF33EuwumlGuwav2FD3tro,__ -2023-03-22T10:28:29.312Z,delete,pages.behavior_page.vr.basisregels.voetnoot.support,jF33EuwumlGuwav2FD3ttU,__ -2023-03-22T10:28:29.314Z,delete,pages.behavior_page.vr.basisregels.voetnoot_asterisk.compliance,jF33EuwumlGuwav2FD3tvA,__ -2023-03-22T10:28:29.316Z,delete,pages.behavior_page.vr.basisregels.voetnoot_asterisk.support,jF33EuwumlGuwav2FD3twq,__ -2023-03-22T10:28:29.318Z,delete,pages.behavior_page.vr.basisregels.volgen_beschrijving,7wdlutZNkP0LZIK1UVsw7Y,__ -2023-03-22T10:28:29.329Z,delete,pages.behavior_page.vr.basisregels_over_tijd.intro.compliance,jF33EuwumlGuwav2FD3u0C,__ -2023-03-22T10:28:29.333Z,delete,pages.behavior_page.vr.basisregels_over_tijd.intro.support,jF33EuwumlGuwav2FD3u1s,__ -2023-03-22T10:28:29.343Z,delete,pages.behavior_page.vr.basisregels_over_tijd.title,jF33EuwumlGuwav2FD3tyW,__ -2023-03-22T10:28:29.346Z,delete,pages.behavior_page.vr.bronnen.rivm.download,jF33EuwumlGuwav2FD3u6u,__ -2023-03-22T10:28:29.350Z,delete,pages.behavior_page.vr.bronnen.rivm.href,jF33EuwumlGuwav2FD3uAG,__ -2023-03-22T10:28:29.352Z,delete,pages.behavior_page.vr.bronnen.rivm.text,jF33EuwumlGuwav2FD3u8a,__ -2023-03-22T10:28:29.355Z,delete,pages.behavior_page.vr.datums,jF33EuwumlGuwav2FD3tXg,__ -2023-03-22T10:28:29.357Z,delete,pages.behavior_page.vr.kpi.aantal_respondenten.bron.href,jF33EuwumlGuwav2FD3tl6,__ -2023-03-22T10:28:29.361Z,delete,pages.behavior_page.vr.kpi.aantal_respondenten.bron.text,jF33EuwumlGuwav2FD3tjQ,__ -2023-03-22T10:28:29.363Z,delete,pages.behavior_page.vr.kpi.aantal_respondenten.titel,jF33EuwumlGuwav2FD3tg4,__ -2023-03-22T10:28:29.365Z,delete,pages.behavior_page.vr.kpi.aantal_respondenten.toelichting,jF33EuwumlGuwav2FD3thk,__ -2023-03-22T10:28:29.368Z,delete,pages.behavior_page.vr.kpi.deelgenomen_mensen,sNNH6WARQASU7sDHs2hUzn,__ -2023-03-22T10:28:29.370Z,delete,pages.behavior_page.vr.kpi.titel,KGhe1o8loW86HkK2zXPrxt,__ -2023-03-22T10:28:29.373Z,delete,pages.behavior_page.vr.metadata.description,jF33EuwumlGuwav2FD3tQy,__ -2023-03-22T10:28:29.375Z,delete,pages.behavior_page.vr.metadata.title,jF33EuwumlGuwav2FD3tPI,__ -2023-03-22T10:28:29.377Z,delete,pages.behavior_page.vr.onderzoek_uitleg.titel,jF33EuwumlGuwav2FD3tci,__ -2023-03-22T10:28:29.379Z,delete,pages.behavior_page.vr.onderzoek_uitleg.toelichting,jF33EuwumlGuwav2FD3teO,__ -2023-03-22T10:28:29.381Z,delete,pages.behavior_page.vr.pagina.titel,jF33EuwumlGuwav2FD3tSe,__ -2023-03-22T10:28:29.385Z,delete,pages.behavior_page.vr.pagina.toelichting,jF33EuwumlGuwav2FD3tUK,__ -2023-03-22T10:28:29.387Z,delete,pages.behavior_page.vr.reference.href,jF33EuwumlGuwav2FD3u3Y,__ -2023-03-22T10:28:29.389Z,delete,pages.behavior_page.vr.warning,0ztyMU2xVVOl2tFNigYGg3,__ -2023-03-22T10:56:23.713Z,delete,pages.disability_care_page.vr.besmette_locaties.barscale_screenreader_text,jF33EuwumlGuwav2FD3xjg,__ -2023-03-22T10:56:23.713Z,delete,pages.disability_care_page.vr.besmette_locaties.barscale_titel,jF33EuwumlGuwav2FD3xbI,__ -2023-03-22T10:56:23.724Z,delete,pages.disability_care_page.vr.besmette_locaties.barscale_toelichting,jF33EuwumlGuwav2FD3xcy,__ -2023-03-22T10:56:23.730Z,delete,pages.disability_care_page.vr.besmette_locaties.bronnen.rivm.download,jF33EuwumlGuwav2FD3xtk,__ -2023-03-22T10:56:23.733Z,delete,pages.disability_care_page.vr.besmette_locaties.bronnen.rivm.href,jF33EuwumlGuwav2FD3xvQ,__ -2023-03-22T10:56:23.743Z,delete,pages.disability_care_page.vr.besmette_locaties.bronnen.rivm.text,jF33EuwumlGuwav2FD3xx6,__ -2023-03-22T10:56:23.745Z,delete,pages.disability_care_page.vr.besmette_locaties.datums,jF33EuwumlGuwav2FD3xWG,__ -2023-03-22T10:56:23.748Z,delete,pages.disability_care_page.vr.besmette_locaties.kpi_titel,jF33EuwumlGuwav2FD3xee,__ -2023-03-22T10:56:23.750Z,delete,pages.disability_care_page.vr.besmette_locaties.kpi_toelichting,jF33EuwumlGuwav2FD3xgK,__ -2023-03-22T10:56:23.754Z,delete,pages.disability_care_page.vr.besmette_locaties.linechart_description,EN7zYfnqIlnfGd7xBhW2Eh,__ -2023-03-22T10:56:23.761Z,delete,pages.disability_care_page.vr.besmette_locaties.linechart_metric_label,jF33EuwumlGuwav2FD3xym,__ -2023-03-22T10:56:23.772Z,delete,pages.disability_care_page.vr.besmette_locaties.linechart_titel,jF33EuwumlGuwav2FD3xi0,__ -2023-03-22T10:56:23.776Z,delete,pages.disability_care_page.vr.besmette_locaties.metadata.description,jF33EuwumlGuwav2FD3xn2,__ -2023-03-22T10:56:23.779Z,delete,pages.disability_care_page.vr.besmette_locaties.metadata.title,jF33EuwumlGuwav2FD3xlM,__ -2023-03-22T10:56:23.785Z,delete,pages.disability_care_page.vr.besmette_locaties.pagina_toelichting,jF33EuwumlGuwav2FD3xZc,__ -2023-03-22T10:56:23.791Z,delete,pages.disability_care_page.vr.besmette_locaties.reference.href,jF33EuwumlGuwav2FD3xqO,__ -2023-03-22T10:56:23.797Z,delete,pages.disability_care_page.vr.besmette_locaties.titel,jF33EuwumlGuwav2FD3xXw,__ -2023-03-22T10:56:23.799Z,delete,pages.disability_care_page.vr.besmette_locaties.warning,grBB1wMeP3licxsoUoRsTy,__ -2023-03-22T10:56:23.801Z,delete,pages.disability_care_page.vr.oversterfte.barscale_screenreader_text,jF33EuwumlGuwav2FD3x3k,__ -2023-03-22T10:56:23.803Z,delete,pages.disability_care_page.vr.oversterfte.barscale_titel,jF33EuwumlGuwav2FD3x24,__ -2023-03-22T10:56:23.805Z,delete,pages.disability_care_page.vr.oversterfte.bronnen.rivm.download,jF33EuwumlGuwav2FD3xKW,__ -2023-03-22T10:56:23.806Z,delete,pages.disability_care_page.vr.oversterfte.bronnen.rivm.href,jF33EuwumlGuwav2FD3xMC,__ -2023-03-22T10:56:23.808Z,delete,pages.disability_care_page.vr.oversterfte.bronnen.rivm.text,jF33EuwumlGuwav2FD3xNs,__ -2023-03-22T10:56:23.809Z,delete,pages.disability_care_page.vr.oversterfte.datums,jF33EuwumlGuwav2FD3wtg,__ -2023-03-22T10:56:23.810Z,delete,pages.disability_care_page.vr.oversterfte.extra_uitleg,jF33EuwumlGuwav2FD3x5Q,__ -2023-03-22T10:56:23.812Z,delete,pages.disability_care_page.vr.oversterfte.line_chart_deceased_daily_moving_average,jF33EuwumlGuwav2FD3xSu,__ -2023-03-22T10:56:23.815Z,delete,pages.disability_care_page.vr.oversterfte.line_chart_deceased_daily_moving_average_short_label,jF33EuwumlGuwav2FD3xUa,__ -2023-03-22T10:56:23.816Z,delete,pages.disability_care_page.vr.oversterfte.line_chart_legend_inaccurate_label,jF33EuwumlGuwav2FD3xRE,__ -2023-03-22T10:56:23.818Z,delete,pages.disability_care_page.vr.oversterfte.line_chart_legend_trend_label,jF33EuwumlGuwav2FD3xPY,__ -2023-03-22T10:56:23.824Z,delete,pages.disability_care_page.vr.oversterfte.linechart_description,6QpSQ1LKij6fvuYEHvMqyd,__ -2023-03-22T10:56:23.826Z,delete,pages.disability_care_page.vr.oversterfte.linechart_titel,jF33EuwumlGuwav2FD3x76,__ -2023-03-22T10:56:23.828Z,delete,pages.disability_care_page.vr.oversterfte.pagina_toelichting,jF33EuwumlGuwav2FD3x0O,__ -2023-03-22T10:56:23.829Z,delete,pages.disability_care_page.vr.oversterfte.reference.href,jF33EuwumlGuwav2FD3xHA,__ -2023-03-22T10:56:23.831Z,delete,pages.disability_care_page.vr.oversterfte.titel,jF33EuwumlGuwav2FD3wyi,__ -2023-03-22T10:56:23.833Z,delete,pages.disability_care_page.vr.positief_geteste_personen.barscale_screenreader_text,jF33EuwumlGuwav2FD3yAW,__ -2023-03-22T10:56:23.834Z,delete,pages.disability_care_page.vr.positief_geteste_personen.barscale_titel,jF33EuwumlGuwav2FD3y3o,__ -2023-03-22T10:56:23.836Z,delete,pages.disability_care_page.vr.positief_geteste_personen.bronnen.rivm.download,jF33EuwumlGuwav2FD3yRI,__ -2023-03-22T10:56:23.838Z,delete,pages.disability_care_page.vr.positief_geteste_personen.bronnen.rivm.href,jF33EuwumlGuwav2FD3ySy,__ -2023-03-22T10:56:23.839Z,delete,pages.disability_care_page.vr.positief_geteste_personen.bronnen.rivm.text,jF33EuwumlGuwav2FD3yUe,__ -2023-03-22T10:56:23.840Z,delete,pages.disability_care_page.vr.positief_geteste_personen.datums,jF33EuwumlGuwav2FD3y0S,__ -2023-03-22T10:56:23.842Z,delete,pages.disability_care_page.vr.positief_geteste_personen.extra_uitleg,jF33EuwumlGuwav2FD3y5U,__ -2023-03-22T10:56:23.843Z,delete,pages.disability_care_page.vr.positief_geteste_personen.kpi_titel,jF33EuwumlGuwav2FD3yWK,__ -2023-03-22T10:56:23.844Z,delete,pages.disability_care_page.vr.positief_geteste_personen.line_chart_legend_inaccurate_label,jF33EuwumlGuwav2FD3yZg,__ -2023-03-22T10:56:23.845Z,delete,pages.disability_care_page.vr.positief_geteste_personen.line_chart_legend_trend_label,jF33EuwumlGuwav2FD3yY0,__ -2023-03-22T10:56:23.846Z,delete,pages.disability_care_page.vr.positief_geteste_personen.line_chart_newly_infected_people_moving_average,jF33EuwumlGuwav2FD3ybM,__ -2023-03-22T10:56:23.847Z,delete,pages.disability_care_page.vr.positief_geteste_personen.line_chart_newly_infected_people_moving_average_short_label,jF33EuwumlGuwav2FD3yd2,__ -2023-03-22T10:56:23.849Z,delete,pages.disability_care_page.vr.positief_geteste_personen.linechart_description,p4JeWnX1BdBjLeRfpbg4j0,__ -2023-03-22T10:56:23.850Z,delete,pages.disability_care_page.vr.positief_geteste_personen.linechart_titel,jF33EuwumlGuwav2FD3y8q,__ -2023-03-22T10:56:23.851Z,delete,pages.disability_care_page.vr.positief_geteste_personen.pagina_toelichting,jF33EuwumlGuwav2FD3y7A,__ -2023-03-22T10:56:23.852Z,delete,pages.disability_care_page.vr.positief_geteste_personen.reference.href,jF33EuwumlGuwav2FD3yNw,__ -2023-03-22T10:56:23.854Z,delete,pages.disability_care_page.vr.positief_geteste_personen.titel,jF33EuwumlGuwav2FD3y28,__ -2023-03-22T12:14:13.311Z,delete,pages.nursing_home_page.vr.barscale_screenreader_text,jF33EuwumlGuwav2FD3pps,__ -2023-03-22T12:14:13.312Z,delete,pages.nursing_home_page.vr.barscale_titel,jF33EuwumlGuwav2FD3poC,__ -2023-03-22T12:14:13.318Z,delete,pages.nursing_home_page.vr.besmette_locaties.barscale_screenreader_text,jF33EuwumlGuwav2FD3qcW,__ -2023-03-22T12:14:13.323Z,delete,pages.nursing_home_page.vr.besmette_locaties.barscale_titel,jF33EuwumlGuwav2FD3qU8,__ -2023-03-22T12:14:13.328Z,delete,pages.nursing_home_page.vr.besmette_locaties.barscale_toelichting,jF33EuwumlGuwav2FD3qVo,__ -2023-03-22T12:14:13.333Z,delete,pages.nursing_home_page.vr.besmette_locaties.bronnen.rivm.download,jF33EuwumlGuwav2FD3qma,__ -2023-03-22T12:14:13.341Z,delete,pages.nursing_home_page.vr.besmette_locaties.bronnen.rivm.href,jF33EuwumlGuwav2FD3qoG,__ -2023-03-22T12:14:13.350Z,delete,pages.nursing_home_page.vr.besmette_locaties.bronnen.rivm.text,jF33EuwumlGuwav2FD3qpw,__ -2023-03-22T12:14:13.354Z,delete,pages.nursing_home_page.vr.besmette_locaties.datums,jF33EuwumlGuwav2FD3qLk,__ -2023-03-22T12:14:13.359Z,delete,pages.nursing_home_page.vr.besmette_locaties.kpi_titel,jF33EuwumlGuwav2FD3qXU,__ -2023-03-22T12:14:13.362Z,delete,pages.nursing_home_page.vr.besmette_locaties.kpi_toelichting,jF33EuwumlGuwav2FD3qZA,__ -2023-03-22T12:14:13.365Z,delete,pages.nursing_home_page.vr.besmette_locaties.linechart_description,EN7zYfnqIlnfGd7xBhS76Z,__ -2023-03-22T12:14:13.369Z,delete,pages.nursing_home_page.vr.besmette_locaties.linechart_titel,jF33EuwumlGuwav2FD3qaq,__ -2023-03-22T12:14:13.371Z,delete,pages.nursing_home_page.vr.besmette_locaties.metadata.description,jF33EuwumlGuwav2FD3qfs,__ -2023-03-22T12:14:13.374Z,delete,pages.nursing_home_page.vr.besmette_locaties.metadata.title,jF33EuwumlGuwav2FD3qeC,__ -2023-03-22T12:14:13.377Z,delete,pages.nursing_home_page.vr.besmette_locaties.pagina_toelichting,jF33EuwumlGuwav2FD3qSS,__ -2023-03-22T12:14:13.379Z,delete,pages.nursing_home_page.vr.besmette_locaties.reference.href,jF33EuwumlGuwav2FD3qjE,__ -2023-03-22T12:14:13.382Z,delete,pages.nursing_home_page.vr.besmette_locaties.titel,jF33EuwumlGuwav2FD3qQm,__ -2023-03-22T12:14:13.385Z,delete,pages.nursing_home_page.vr.bronnen.rivm.download,jF33EuwumlGuwav2FD3q6e,__ -2023-03-22T12:14:13.388Z,delete,pages.nursing_home_page.vr.bronnen.rivm.href,jF33EuwumlGuwav2FD3q8K,__ -2023-03-22T12:14:13.391Z,delete,pages.nursing_home_page.vr.bronnen.rivm.text,jF33EuwumlGuwav2FD3qA0,__ -2023-03-22T12:14:13.393Z,delete,pages.nursing_home_page.vr.datums,jF33EuwumlGuwav2FD3pfo,__ -2023-03-22T12:14:13.396Z,delete,pages.nursing_home_page.vr.extra_uitleg,jF33EuwumlGuwav2FD3prY,__ -2023-03-22T12:14:13.401Z,delete,pages.nursing_home_page.vr.line_chart_legend_inaccurate_label,jF33EuwumlGuwav2FD3qDM,__ -2023-03-22T12:14:13.408Z,delete,pages.nursing_home_page.vr.line_chart_legend_trend_label,jF33EuwumlGuwav2FD3qBg,__ -2023-03-22T12:14:13.412Z,delete,pages.nursing_home_page.vr.line_chart_legend_trend_moving_average_label,jF33EuwumlGuwav2FD3qF2,__ -2023-03-22T12:14:13.418Z,delete,pages.nursing_home_page.vr.linechart_description,EN7zYfnqIlnfGd7xBhSNbN,__ -2023-03-22T12:14:13.422Z,delete,pages.nursing_home_page.vr.linechart_titel,jF33EuwumlGuwav2FD3ptE,__ -2023-03-22T12:14:13.425Z,delete,pages.nursing_home_page.vr.pagina_toelichting,jF33EuwumlGuwav2FD3pmW,__ -2023-03-22T12:14:13.429Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.barscale_screenreader_text,jF33EuwumlGuwav2FD3r6i,__ -2023-03-22T12:14:13.432Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.barscale_titel,jF33EuwumlGuwav2FD3r00,__ -2023-03-22T12:14:13.436Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.bronnen.rivm.download,jF33EuwumlGuwav2FD3rNU,__ -2023-03-22T12:14:13.439Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.bronnen.rivm.href,jF33EuwumlGuwav2FD3rPA,__ -2023-03-22T12:14:13.441Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.bronnen.rivm.text,jF33EuwumlGuwav2FD3rQq,__ -2023-03-22T12:14:13.444Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.datums,jF33EuwumlGuwav2FD3qtI,__ -2023-03-22T12:14:13.447Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.extra_uitleg,jF33EuwumlGuwav2FD3r1g,__ -2023-03-22T12:14:13.450Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.line_chart_legend_inaccurate_label,jF33EuwumlGuwav2FD3rUC,__ -2023-03-22T12:14:13.453Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.line_chart_legend_trend_label,jF33EuwumlGuwav2FD3rSW,__ -2023-03-22T12:14:13.456Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.line_chart_legend_trend_moving_average_label,jF33EuwumlGuwav2FD3rVs,__ -2023-03-22T12:14:13.459Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.linechart_description,EN7zYfnqIlnfGd7xBhRnNj,__ -2023-03-22T12:14:13.462Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.linechart_titel,jF33EuwumlGuwav2FD3r52,__ -2023-03-22T12:14:13.466Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.pagina_toelichting,jF33EuwumlGuwav2FD3r3M,__ -2023-03-22T12:14:13.471Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.reference.href,jF33EuwumlGuwav2FD3rK8,__ -2023-03-22T12:14:13.474Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.titel,jF33EuwumlGuwav2FD3qyK,__ -2023-03-22T12:14:13.479Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.tooltip_labels.inaccurate,jF33EuwumlGuwav2FD3rXY,__ -2023-03-22T12:14:13.482Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.tooltip_labels.newly_infected_people,jF33EuwumlGuwav2FD3rZE,__ -2023-03-22T12:14:13.486Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.tooltip_labels.newly_infected_people_moving_average,jF33EuwumlGuwav2FD3rau,__ -2023-03-22T12:14:13.490Z,delete,pages.nursing_home_page.vr.positief_geteste_personen.warning,0ztyMU2xVVOl2tFNigYHIl,__ -2023-03-22T12:14:13.492Z,delete,pages.nursing_home_page.vr.reference.href,jF33EuwumlGuwav2FD3q3I,__ -2023-03-22T12:14:13.494Z,delete,pages.nursing_home_page.vr.titel,jF33EuwumlGuwav2FD3pkq,__ -2023-03-22T12:14:13.507Z,delete,pages.nursing_home_page.vr.tooltip_labels.deceased_daily,jF33EuwumlGuwav2FD3qIO,__ -2023-03-22T12:14:13.510Z,delete,pages.nursing_home_page.vr.tooltip_labels.deceased_daily_moving_average,jF33EuwumlGuwav2FD3qK4,__ -2023-03-22T12:14:13.514Z,delete,pages.nursing_home_page.vr.tooltip_labels.inaccurate,jF33EuwumlGuwav2FD3qGi,__ -2023-03-22T12:14:13.517Z,delete,pages.positive_tests_page.vr.barscale_screenreader_text,jF33EuwumlGuwav2FD3ir6,__ -2023-03-22T12:14:13.519Z,delete,pages.positive_tests_page.vr.barscale_titel,jF33EuwumlGuwav2FD3ink,__ -2023-03-22T12:14:13.520Z,delete,pages.positive_tests_page.vr.barscale_toelichting,jF33EuwumlGuwav2FD3ipQ,__ -2023-03-22T12:14:13.522Z,delete,pages.positive_tests_page.vr.bronnen.rivm.download,jF33EuwumlGuwav2FD3jQK,__ -2023-03-22T12:14:13.524Z,delete,pages.positive_tests_page.vr.bronnen.rivm.href,jF33EuwumlGuwav2FD3jS0,__ -2023-03-22T12:14:13.525Z,delete,pages.positive_tests_page.vr.bronnen.rivm.text,jF33EuwumlGuwav2FD3jTg,__ -2023-03-22T12:14:13.526Z,delete,pages.positive_tests_page.vr.datums,jF33EuwumlGuwav2FD3ikO,__ -2023-03-22T12:14:13.529Z,delete,pages.positive_tests_page.vr.ggd.bronnen.rivm.download,jF33EuwumlGuwav2FD3pam,__ -2023-03-22T12:14:13.530Z,delete,pages.positive_tests_page.vr.ggd.bronnen.rivm.href,jF33EuwumlGuwav2FD3pcS,__ -2023-03-22T12:14:13.532Z,delete,pages.positive_tests_page.vr.ggd.bronnen.rivm.text,jF33EuwumlGuwav2FD3pe8,__ -2023-03-22T12:14:13.534Z,delete,pages.positive_tests_page.vr.ggd.datums,jF33EuwumlGuwav2FD3p8G,__ -2023-03-22T12:14:13.535Z,delete,pages.positive_tests_page.vr.ggd.linechart_percentage_legend_label,avHj0RuKBVR3WKDFaNt28q,__ -2023-03-22T12:14:13.536Z,delete,pages.positive_tests_page.vr.ggd.linechart_percentage_titel,jF33EuwumlGuwav2FD3pNM,__ -2023-03-22T12:14:13.539Z,delete,pages.positive_tests_page.vr.ggd.linechart_percentage_toelichting,jF33EuwumlGuwav2FD3pP2,__ -2023-03-22T12:14:13.540Z,delete,pages.positive_tests_page.vr.ggd.linechart_percentage_toggle_label,xjLKnlFrh2WM7l3Tdo94x5,__ -2023-03-22T12:14:13.542Z,delete,pages.positive_tests_page.vr.ggd.linechart_positivetests_legend_label,jF33EuwumlGuwav2FD3pVk,__ -2023-03-22T12:14:13.543Z,delete,pages.positive_tests_page.vr.ggd.linechart_positivetests_legend_label_moving_average,KGhe1o8loW86HkK2xnYI4f,__ -2023-03-22T12:14:13.545Z,delete,pages.positive_tests_page.vr.ggd.linechart_totaltests_legend_label,jF33EuwumlGuwav2FD3pU4,__ -2023-03-22T12:14:13.546Z,delete,pages.positive_tests_page.vr.ggd.linechart_totaltests_legend_label_moving_average,sNNH6WARQASU7sDHqgf8yd,__ -2023-03-22T12:14:13.548Z,delete,pages.positive_tests_page.vr.ggd.linechart_totaltests_titel,jF33EuwumlGuwav2FD3pQi,__ -2023-03-22T12:14:13.550Z,delete,pages.positive_tests_page.vr.ggd.linechart_totaltests_toelichting,jF33EuwumlGuwav2FD3pSO,__ -2023-03-22T12:14:13.551Z,delete,pages.positive_tests_page.vr.ggd.linechart_totaltests_toggle_label,PZq3D7oQCo96ts7zr9FF1F,__ -2023-03-22T12:14:13.553Z,delete,pages.positive_tests_page.vr.ggd.percentage_kpi.description,L0R7Ua3YIau8O4TDzSpErb,__ -2023-03-22T12:14:13.555Z,delete,pages.positive_tests_page.vr.ggd.percentage_kpi.last_value_text,41m6S8Y6xAJZkZywfxw520,__ -2023-03-22T12:14:13.558Z,delete,pages.positive_tests_page.vr.ggd.percentage_kpi.title,41m6S8Y6xAJZkZywfxw4yI,__ -2023-03-22T12:14:13.560Z,delete,pages.positive_tests_page.vr.ggd.tests_kpi.description,41m6S8Y6xAJZkZywfxw58g,__ -2023-03-22T12:14:13.562Z,delete,pages.positive_tests_page.vr.ggd.tests_kpi.last_value_text,41m6S8Y6xAJZkZywfxw5Ds,__ -2023-03-22T12:14:13.564Z,delete,pages.positive_tests_page.vr.ggd.tests_kpi.title,41m6S8Y6xAJZkZywfxw54y,__ -2023-03-22T12:14:13.566Z,delete,pages.positive_tests_page.vr.ggd.titel,jF33EuwumlGuwav2FD3p3E,__ -2023-03-22T12:14:13.567Z,delete,pages.positive_tests_page.vr.ggd.toelichting,jF33EuwumlGuwav2FD3pDI,__ -2023-03-22T12:14:13.569Z,delete,pages.positive_tests_page.vr.infected_kpi.description,L0R7Ua3YIau8O4TDzSpC9P,__ -2023-03-22T12:14:13.570Z,delete,pages.positive_tests_page.vr.infected_kpi.last_value_text,L0R7Ua3YIau8O4TDzSpCYt,__ -2023-03-22T12:14:13.571Z,delete,pages.positive_tests_page.vr.infected_kpi.link_cta,L0R7Ua3YIau8O4TDzSpCyN,__ -2023-03-22T12:14:13.573Z,delete,pages.positive_tests_page.vr.infected_kpi.title,41m6S8Y6xAJZkZywfxw4dW,__ -2023-03-22T12:14:13.574Z,delete,pages.positive_tests_page.vr.linechart_titel,jF33EuwumlGuwav2FD3izU,__ -2023-03-22T12:14:13.575Z,delete,pages.positive_tests_page.vr.linechart_toelichting,jF33EuwumlGuwav2FD3j1A,__ -2023-03-22T12:14:13.577Z,delete,pages.positive_tests_page.vr.map_last_value_text,vlhYWEAgyN27KxCATFAKbA,__ -2023-03-22T12:14:13.579Z,delete,pages.positive_tests_page.vr.map_titel,jF33EuwumlGuwav2FD3iw8,__ -2023-03-22T12:14:13.580Z,delete,pages.positive_tests_page.vr.map_toelichting,jF33EuwumlGuwav2FD3ixo,__ -2023-03-22T12:14:13.582Z,delete,pages.positive_tests_page.vr.metadata.description,jF33EuwumlGuwav2FD3jLI,__ -2023-03-22T12:14:13.584Z,delete,pages.positive_tests_page.vr.metadata.title,jF33EuwumlGuwav2FD3jJc,__ -2023-03-22T12:14:13.585Z,delete,pages.positive_tests_page.vr.pagina_toelichting,jF33EuwumlGuwav2FD3iii,__ -2023-03-22T12:14:13.587Z,delete,pages.positive_tests_page.vr.percentage_kpi.description,L0R7Ua3YIau8O4TDzSpDDf,__ -2023-03-22T12:14:13.600Z,delete,pages.positive_tests_page.vr.percentage_kpi.last_value_text,L0R7Ua3YIau8O4TDzSpDd9,__ -2023-03-22T12:14:13.609Z,delete,pages.positive_tests_page.vr.percentage_kpi.link_cta,z1CGDOfh23CnZYQwFAf6TJ,__ -2023-03-22T12:14:13.613Z,delete,pages.positive_tests_page.vr.percentage_kpi.title,41m6S8Y6xAJZkZywfxw4mQ,__ -2023-03-22T12:14:13.617Z,delete,pages.positive_tests_page.vr.reference.href,jF33EuwumlGuwav2FD3jMy,__ -2023-03-22T12:14:13.620Z,delete,pages.positive_tests_page.vr.section_archived.description,41m6S8Y6xAJZkZywfx0IKg,__ -2023-03-22T12:14:13.622Z,delete,pages.positive_tests_page.vr.section_archived.title,z1CGDOfh23CnZYQwF8mhah,__ -2023-03-22T12:14:13.625Z,delete,pages.positive_tests_page.vr.titel,jF33EuwumlGuwav2FD3ih2,__ -2023-03-22T12:14:13.627Z,delete,pages.positive_tests_page.vr.warning,0ztyMU2xVVOl2tFNigYGoW,__ -2023-03-22T14:16:28.691Z,delete,pages.situations_page.shared.situaties_over_tijd_grafiek.legenda.help_text,pUh1Ah0fhZhgu4kALBKgUC,__ -2023-03-22T14:16:28.691Z,delete,pages.situations_page.shared.situaties_over_tijd_grafiek.legenda.onvoldoende_gegevens,I1mQi256rmdwYuRIrQVHfZ,__ -2023-03-22T14:16:28.698Z,delete,pages.situations_page.shared.situaties_over_tijd_grafiek.omschrijving,I1mQi256rmdwYuRIrQUeNQ,__ -2023-03-22T14:16:28.703Z,delete,pages.situations_page.shared.situaties_over_tijd_grafiek.titel,lJrmoPoRnpF3E0PvGdn2J7,__ -2023-03-22T14:16:28.712Z,delete,pages.situations_page.shared.situaties_over_tijd_grafiek.tooltip.onvoldoende_gegevens,pUh1Ah0fhZhgu4kALBJqtA,__ -2023-03-22T14:16:28.722Z,delete,pages.situations_page.shared.veiligheidsregio_dekking.beschrijving_genoeg_dekking,pUh1Ah0fhZhgu4kALkJpjY,__ -2023-03-22T14:16:28.734Z,delete,pages.situations_page.shared.veiligheidsregio_dekking.beschrijving_niet_genoeg_dekking,I1mQi256rmdwYuRIs2CQSR,__ -2023-03-22T14:16:28.739Z,delete,pages.situations_page.shared.veiligheidsregio_dekking.titel,lJrmoPoRnpF3E0PvH14xUc,__ -2023-03-22T14:16:28.747Z,delete,pages.situations_page.shared.veiligheidsregio_dekking.titel_genoeg_dekking,I1mQi256rmdwYuRIs2CgBi,__ -2023-03-22T14:16:28.753Z,delete,pages.situations_page.shared.veiligheidsregio_dekking.titel_niet_genoeg_dekking,lJrmoPoRnpF3E0PvH16NOc,__ -2023-03-22T14:16:28.755Z,delete,pages.situations_page.shared.veiligheidsregio_kpi.beschrijving,I1mQi256rmdwYuRIs2THMl,__ -2023-03-22T14:16:28.757Z,delete,pages.situations_page.shared.veiligheidsregio_kpi.beschrijving_bekend,pUh1Ah0fhZhgu4kALkcrcm,__ -2023-03-22T14:16:28.760Z,delete,pages.situations_page.shared.veiligheidsregio_kpi.titel,lJrmoPoRnpF3E0PvH1Gku7,__ -2023-03-22T14:16:28.762Z,delete,pages.situations_page.shared.veiligheidsregio_tabel.beschrijving,lJrmoPoRnpF3E0PvH1AJJ7,__ -2023-03-22T14:16:28.765Z,delete,pages.situations_page.shared.veiligheidsregio_tabel.laatste_onderzoek,pUh1Ah0fhZhgu4kALkRgjG,__ -2023-03-22T14:16:28.767Z,delete,pages.situations_page.shared.veiligheidsregio_tabel.niet_genoeg_gegevens,I1mQi256rmdwYuRIs2JrAx,__ -2023-03-22T14:16:28.768Z,delete,pages.situations_page.shared.veiligheidsregio_tabel.soort_situatie,I1mQi256rmdwYuRIs2JBZz,__ -2023-03-22T14:16:28.770Z,delete,pages.situations_page.shared.veiligheidsregio_tabel.titel,lJrmoPoRnpF3E0PvH19vv7,__ -2023-03-22T12:10:59.816Z,delete,pages.deceased_page.vr.kpi_titel,jF33EuwumlGuwav2FD420i,__ -2023-03-22T12:10:59.817Z,delete,pages.deceased_page.vr.metadata.description,jF33EuwumlGuwav2FD41TA,__ -2023-03-22T12:10:59.817Z,delete,pages.deceased_page.vr.metadata.title,jF33EuwumlGuwav2FD41RU,__ -2023-03-22T12:10:59.817Z,delete,pages.deceased_page.vr.section_deceased_rivm.bronnen.rivm.download,jF33EuwumlGuwav2FD41dE,__ -2023-03-22T12:10:59.817Z,delete,pages.deceased_page.vr.section_deceased_rivm.bronnen.rivm.href,jF33EuwumlGuwav2FD41Zs,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.bronnen.rivm.text,jF33EuwumlGuwav2FD41bY,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.datums,jF33EuwumlGuwav2FD41YC,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.description,jF33EuwumlGuwav2FD41WW,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.kpi_covid_daily_description,jF33EuwumlGuwav2FD41jw,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.kpi_covid_daily_title,jF33EuwumlGuwav2FD41iG,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.kpi_covid_total_description,jF33EuwumlGuwav2FD41nI,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.kpi_covid_total_title,jF33EuwumlGuwav2FD41lc,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.line_chart_covid_daily_description,jF33EuwumlGuwav2FD41qe,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.line_chart_covid_daily_legend_trend_label,jF33EuwumlGuwav2FD41sK,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.line_chart_covid_daily_legend_trend_label_moving_average,jF33EuwumlGuwav2FD41xM,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.line_chart_covid_daily_legend_trend_short_label,jF33EuwumlGuwav2FD41vg,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.line_chart_covid_daily_legend_trend_short_label_moving_average,jF33EuwumlGuwav2FD41z2,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.line_chart_covid_daily_title,jF33EuwumlGuwav2FD41oy,__ -2023-03-22T12:10:59.818Z,delete,pages.deceased_page.vr.section_deceased_rivm.reference.href,jF33EuwumlGuwav2FD41eu,__ -2023-03-22T12:10:59.819Z,delete,pages.deceased_page.vr.section_deceased_rivm.title,jF33EuwumlGuwav2FD41Uq,__ -2023-03-22T12:10:59.819Z,delete,pages.deceased_page.vr.section_deceased_rivm.warning,grBB1wMeP3licxsoUoRqc9,__ -2023-03-22T12:10:59.819Z,delete,pages.deceased_page.vr.section_sterftemonitor.bronnen.cbs.download,jF33EuwumlGuwav2FD4Iay,__ -2023-03-22T12:10:59.819Z,delete,pages.deceased_page.vr.section_sterftemonitor.bronnen.cbs.href,jF33EuwumlGuwav2FD4IXc,__ -2023-03-22T12:10:59.819Z,delete,pages.deceased_page.vr.section_sterftemonitor.bronnen.cbs.text,jF33EuwumlGuwav2FD4IZI,__ -2023-03-22T12:10:59.819Z,delete,pages.deceased_page.vr.section_sterftemonitor.datums,jF33EuwumlGuwav2FD4IVw,__ -2023-03-22T12:10:59.819Z,delete,pages.deceased_page.vr.section_sterftemonitor.description,jF33EuwumlGuwav2FD4IUG,__ -2023-03-22T12:10:59.819Z,delete,pages.deceased_page.vr.section_sterftemonitor.reference.href,jF33EuwumlGuwav2FD4Ice,__ -2023-03-22T12:10:59.819Z,delete,pages.deceased_page.vr.section_sterftemonitor.title,jF33EuwumlGuwav2FD4ISa,__ -2023-03-22T12:10:59.819Z,delete,pages.deceased_page.vr.titel_kpi,jF33EuwumlGuwav2FD41Po,__ -2023-03-22T12:10:59.819Z,delete,pages.deceased_page.vr.warning,i93JRHeRUDvH5qV1yv8rXG,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.kpi_titel,jF33EuwumlGuwav2FD40iC,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.metadata.description,jF33EuwumlGuwav2FD3zoq,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.metadata.title,jF33EuwumlGuwav2FD3znA,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.section_deceased.bronnen.rivm.download,jF33EuwumlGuwav2FD40T6,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.section_deceased.bronnen.rivm.href,jF33EuwumlGuwav2FD40Pk,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.section_deceased.bronnen.rivm.text,jF33EuwumlGuwav2FD40RQ,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.section_deceased.datums,jF33EuwumlGuwav2FD40Zo,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.section_deceased.description,jF33EuwumlGuwav2FD40Ki,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.section_deceased.kpi_daily_description,jF33EuwumlGuwav2FD40WS,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.section_deceased.kpi_daily_title,jF33EuwumlGuwav2FD40Um,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.section_deceased.line_chart_daily_description,EN7zYfnqIlnfGd7xBhZOn5,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.section_deceased.line_chart_daily_title,jF33EuwumlGuwav2FD40Y8,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.section_deceased.line_chart_deceased_daily_moving_average,jF33EuwumlGuwav2FD40eq,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.section_deceased.line_chart_deceased_daily_moving_average_short_label,jF33EuwumlGuwav2FD40gW,__ -2023-03-22T12:10:59.820Z,delete,pages.elderly_at_home_page.vr.section_deceased.line_chart_legend_inaccurate_label,jF33EuwumlGuwav2FD40dA,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_deceased.line_chart_legend_trend_label,jF33EuwumlGuwav2FD40bU,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_deceased.reference.href,jF33EuwumlGuwav2FD40MO,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_deceased.title,jF33EuwumlGuwav2FD40J2,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.bronnen.rivm.download,jF33EuwumlGuwav2FD400a,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.bronnen.rivm.href,jF33EuwumlGuwav2FD3zxE,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.bronnen.rivm.text,jF33EuwumlGuwav2FD3zyu,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.datums,jF33EuwumlGuwav2FD40Ae,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.description,jF33EuwumlGuwav2FD3zsC,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.kpi_daily_description,jF33EuwumlGuwav2FD403w,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.kpi_daily_per_100k_description,jF33EuwumlGuwav2FD407I,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.kpi_daily_per_100k_title,jF33EuwumlGuwav2FD405c,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.kpi_daily_title,jF33EuwumlGuwav2FD402G,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.line_chart_daily_description,p4JeWnX1BdBjLeRfpbntSc,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.line_chart_daily_title,jF33EuwumlGuwav2FD408y,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.line_chart_legend_trend_label,jF33EuwumlGuwav2FD40CK,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.line_chart_positive_tested_daily_moving_average,jF33EuwumlGuwav2FD40Fg,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.line_chart_positive_tested_daily_moving_average_short_label,jF33EuwumlGuwav2FD40HM,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.reference.href,jF33EuwumlGuwav2FD3zts,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.section_positive_tested.title,jF33EuwumlGuwav2FD3zqW,__ -2023-03-22T12:10:59.821Z,delete,pages.elderly_at_home_page.vr.titel_kpi,jF33EuwumlGuwav2FD3zlU,__ -2023-03-22T12:10:59.822Z,delete,pages.elderly_at_home_page.vr.warning,grBB1wMeP3licxsoUoRtZJ,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.barscale_screenreader_text,jF33EuwumlGuwav2FD3iBA,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.barscale_titel,jF33EuwumlGuwav2FD3i2m,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.bronnen.rivm.download,jF33EuwumlGuwav2FD3iQG,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.bronnen.rivm.href,jF33EuwumlGuwav2FD3iRw,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.bronnen.rivm.text,jF33EuwumlGuwav2FD3iTc,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.datums,jF33EuwumlGuwav2FD3hzQ,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.extra_uitleg,jF33EuwumlGuwav2FD3i4S,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.kpi_titel,jF33EuwumlGuwav2FD3iYe,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.linechart_description,jF33EuwumlGuwav2FD3iGC,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.linechart_legend_titel,jF33EuwumlGuwav2FD3iaK,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.linechart_legend_titel_moving_average,jF33EuwumlGuwav2FD3idg,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.linechart_legend_underreported_titel,jF33EuwumlGuwav2FD3ic0,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.linechart_titel,jF33EuwumlGuwav2FD3i9U,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.map_titel,jF33EuwumlGuwav2FD3i68,__ -2023-03-22T12:10:59.822Z,delete,pages.hospital_page.vr.map_toelichting,jF33EuwumlGuwav2FD3i7o,__ -2023-03-22T12:10:59.823Z,delete,pages.hospital_page.vr.metadata.description,jF33EuwumlGuwav2FD3iJY,__ -2023-03-22T12:10:59.823Z,delete,pages.hospital_page.vr.metadata.title,jF33EuwumlGuwav2FD3iHs,__ -2023-03-22T12:10:59.823Z,delete,pages.hospital_page.vr.pagina_toelichting,jF33EuwumlGuwav2FD3hxk,__ -2023-03-22T12:10:59.823Z,delete,pages.hospital_page.vr.reference.href,jF33EuwumlGuwav2FD3iMu,__ -2023-03-22T12:10:59.823Z,delete,pages.hospital_page.vr.titel,jF33EuwumlGuwav2FD3hw4,__ -2023-03-22T12:10:59.823Z,delete,pages.hospital_page.vr.titel_kpi,jF33EuwumlGuwav2FD3iLE,__ -2023-03-22T12:10:59.823Z,delete,pages.hospital_page.vr.warning,grBB1wMeP3licxsoUoRuWZ,__ -2023-03-22T12:10:59.823Z,delete,pages.sewer_page.vr.barscale_screenreader_text,jF33EuwumlGuwav2FD3jh6,__ -2023-03-22T12:10:59.823Z,delete,pages.sewer_page.vr.barscale_titel,jF33EuwumlGuwav2FD3jdk,__ -2023-03-22T12:10:59.823Z,delete,pages.sewer_page.vr.bronnen.rivm.download,jF33EuwumlGuwav2FD3kGK,__ -2023-03-22T12:10:59.823Z,delete,pages.sewer_page.vr.bronnen.rivm.href,jF33EuwumlGuwav2FD3kJg,__ -2023-03-22T12:10:59.823Z,delete,pages.sewer_page.vr.bronnen.rivm.text,jF33EuwumlGuwav2FD3kI0,__ -2023-03-22T12:10:59.823Z,delete,pages.sewer_page.vr.datums,jF33EuwumlGuwav2FD3jaO,__ -2023-03-22T12:10:59.823Z,delete,pages.sewer_page.vr.display_outliers,jF33EuwumlGuwav2FD3kOi,__ -2023-03-22T12:10:59.823Z,delete,pages.sewer_page.vr.extra_uitleg,jF33EuwumlGuwav2FD3jfQ,__ -2023-03-22T12:10:59.823Z,delete,pages.sewer_page.vr.graph_average_label_text,jF33EuwumlGuwav2FD3jrA,__ -2023-03-22T12:10:59.823Z,delete,pages.sewer_page.vr.graph_daily_label_text_rwzi,jF33EuwumlGuwav2FD3k1E,__ -2023-03-22T12:10:59.823Z,delete,pages.sewer_page.vr.graph_range_description,jF33EuwumlGuwav2FD3k4a,__ -2023-03-22T12:10:59.823Z,delete,pages.sewer_page.vr.graph_secondary_label_text,jF33EuwumlGuwav2FD3jsq,__ -2023-03-22T12:10:59.824Z,delete,pages.sewer_page.vr.graph_selected_rwzi_placeholder,jF33EuwumlGuwav2FD3k2u,__ -2023-03-22T12:10:59.824Z,delete,pages.sewer_page.vr.hide_outliers,jF33EuwumlGuwav2FD3kQO,__ -2023-03-22T12:10:59.824Z,delete,pages.sewer_page.vr.kpi_titel,jF33EuwumlGuwav2FD3kLM,__ -2023-03-22T12:10:59.824Z,delete,pages.sewer_page.vr.linechart_description,6QpSQ1LKij6fvuYEHva4Bz,__ -2023-03-22T12:10:59.824Z,delete,pages.sewer_page.vr.linechart_titel,jF33EuwumlGuwav2FD3jim,__ -2023-03-22T12:10:59.824Z,delete,pages.sewer_page.vr.metadata.description,jF33EuwumlGuwav2FD3jzY,__ -2023-03-22T12:10:59.824Z,delete,pages.sewer_page.vr.metadata.title,jF33EuwumlGuwav2FD3jxs,__ -2023-03-22T12:10:59.824Z,delete,pages.sewer_page.vr.pagina_toelichting,jF33EuwumlGuwav2FD3jYi,__ -2023-03-22T12:10:59.824Z,delete,pages.sewer_page.vr.reference.href,jF33EuwumlGuwav2FD3kCy,__ -2023-03-22T12:10:59.824Z,delete,pages.sewer_page.vr.tile_explanation_description,u2w2cmKrEkkhu4TKoJgGJv,__ -2023-03-22T12:10:59.825Z,delete,pages.sewer_page.vr.tile_explanation_title,oFxmVAb3WhH1wXDkdlNopS,__ -2023-03-22T12:10:59.825Z,delete,pages.sewer_page.vr.titel,jF33EuwumlGuwav2FD3jX2,__ -2023-03-22T12:10:59.825Z,delete,pages.sewer_page.vr.titel_kpi,jF33EuwumlGuwav2FD3k6G,__ -2023-03-22T12:10:59.825Z,delete,pages.sewer_page.vr.total_measurements_description,jF33EuwumlGuwav2FD3kVQ,__ -2023-03-22T12:10:59.825Z,delete,pages.sewer_page.vr.total_measurements_locations,jF33EuwumlGuwav2FD3kX6,__ -2023-03-22T12:10:59.825Z,delete,pages.sewer_page.vr.total_measurements_title,jF33EuwumlGuwav2FD3kTk,__ -2023-03-22T12:10:59.825Z,delete,pages.sewer_page.vr.warning,Hpcrbv9k01wdsU0EhzLjtf,__ -2023-03-22T12:10:59.825Z,delete,pages.sewer_page.vr.warning_chart,grBB1wMeP3licxsoUoRtOX,__ -2023-03-22T12:10:59.825Z,delete,pages.sewer_page.vr.warning_method,jF33EuwumlGuwav2FD3kS4,__ -2023-03-22T12:10:59.825Z,delete,pages.vaccinations_page.vr.information_block.dates,DWLUotrm23arH2ViSPEVme,__ -2023-03-22T12:10:59.825Z,delete,pages.vaccinations_page.vr.information_block.description,4wy7f8NuwuLne309uN5voW,__ -2023-03-22T12:10:59.825Z,delete,pages.vaccinations_page.vr.information_block.reference.href,DWLUotrm23arH2ViSPEVqK,__ -2023-03-22T12:10:59.825Z,delete,pages.vaccinations_page.vr.information_block.title,4wy7f8NuwuLne309uMwkHM,__ -2023-03-22T12:10:59.825Z,delete,pages.vaccinations_page.vr.metadata.description,m5cl7ciD7CmTUWm5dGlTxJ,__ -2023-03-22T12:10:59.825Z,delete,pages.vaccinations_page.vr.metadata.title,4wy7f8NuwuLne309uM0FdM,__ -2023-03-22T12:10:59.825Z,delete,pages.vaccinations_page.vr.titel_kpi,m5cl7ciD7CmTUWm5dGkg7w,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_coverage.description_booster_and_fully_vaccinated,hqivmGf8UPzCLjKFjIAkSr,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_coverage.information_block.dates,Hbf18OLBqHEYSTRqYPqx9J,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_coverage.information_block.description,hisQZuyoPo60cR6z1YJbXQ,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_coverage.information_block.reference.href,hisQZuyoPo60cR6z1YJbss,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_coverage.information_block.title,hVR84KsTzwRokpuMM7g5EQ,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_coverage.title,xNELI4GNAeXqkWZzsI1aAP,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_coverage.top_level_information_block.dates,Hbf18OLBqHEYSTRqYPuVtR,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_coverage.top_level_information_block.description,hisQZuyoPo60cR6z1YNuVU,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_coverage.top_level_information_block.reference.href,Hbf18OLBqHEYSTRqYPuWBB,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_coverage.top_level_information_block.title,hisQZuyoPo60cR6z1YNuqw,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_12_plus.booster_date_interval,BQ2C9RbOg28sfWOKxJ4HKN,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_12_plus.description_booster_grade,cYpVOlvFzO3vMMRPBB3j4g,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_12_plus.description_booster_grade_not_available,BQ2C9RbOg28sfWOKxJ4Nui,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_12_plus.description_vaccination_grade,cYpVOlvFzO3vMMRPBB3ooD,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_12_plus.description_vaccination_one_shot,cYpVOlvFzO3vMMRPBB3tG9,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_12_plus.description_vaccination_one_shot_with_percentage,BQ2C9RbOg28sfWOKxJ4XgB,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_12_plus.label,tX1MPJIDnGqPfyLRsHU8Vu,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_18_plus.booster_date_interval,BQ2C9RbOg28sfWOKxJ4dt3,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_18_plus.description_booster_grade,cYpVOlvFzO3vMMRPBB460o,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_18_plus.description_booster_grade_not_available,BQ2C9RbOg28sfWOKxJ4kvY,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_18_plus.description_vaccination_grade,cYpVOlvFzO3vMMRPBB4D7F,__ -2023-03-22T12:10:59.826Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_18_plus.description_vaccination_one_shot,cYpVOlvFzO3vMMRPBB4GnQ,__ -2023-03-22T12:10:59.827Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_18_plus.description_vaccination_one_shot_with_percentage,BQ2C9RbOg28sfWOKxJ4vu7,__ -2023-03-22T12:10:59.827Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.age_18_plus.label,BQ2C9RbOg28sfWOKxJ4z9w,__ -2023-03-22T12:10:59.827Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.source.href,iLvivnjMZ7igG7VqAgygAW,__ -2023-03-22T12:10:59.827Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.source.text,iLvivnjMZ7igG7VqAgyfxS,__ -2023-03-22T12:10:59.827Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.title,iLvivnjMZ7igG7VqAgygIM,__ -2023-03-22T12:10:59.827Z,delete,pages.vaccinations_page.vr.warning,grBB1wMeP3licxsoUoRtpT,__ -2023-03-22T11:31:11.144Z,delete,pages.behavior_page.nl.section_archived.description,ibZWLQHfYl2AyCZBOq5lUb,__ -2023-03-22T11:31:11.146Z,delete,pages.behavior_page.nl.section_archived.title,rSoN2URF0rxEHQvXsrmWoN,__ -2023-03-22T11:31:11.154Z,delete,pages.behavior_page.nl.verdeling_in_nederland.compliance_title,jwZCGJpB6f5MPNxDruqUQy,__ -2023-03-22T11:31:11.159Z,delete,pages.behavior_page.nl.verdeling_in_nederland.description,2HjSiE19Y3xp0kLX6T6JA7,__ -2023-03-22T11:31:11.162Z,delete,pages.behavior_page.nl.verdeling_in_nederland.geen_beschikbare_data,2HjSiE19Y3xp0kLX6T6aOP,__ -2023-03-22T11:31:11.164Z,delete,pages.behavior_page.nl.verdeling_in_nederland.intro,jF33EuwumlGuwav2FD3sv6,__ -2023-03-22T11:31:11.166Z,delete,pages.behavior_page.nl.verdeling_in_nederland.legenda_titel,jF33EuwumlGuwav2FD3syS,__ -2023-03-22T11:31:11.168Z,delete,pages.behavior_page.nl.verdeling_in_nederland.onbekend,jF33EuwumlGuwav2FD3swm,__ -2023-03-22T11:31:11.171Z,delete,pages.behavior_page.nl.verdeling_in_nederland.support_title,jwZCGJpB6f5MPNxDrurJfa,__ -2023-03-22T11:31:11.175Z,delete,pages.behavior_page.nl.verdeling_in_nederland.titel,jF33EuwumlGuwav2FD3stQ,__ -2023-03-21T10:35:31.652Z,delete,pages.vaccinations_page.gm.vaccination_grade_toggle_tile.description_footer,4Hn4MB4VRci1fnngMVhx1g,__ -2023-03-21T10:35:31.653Z,delete,pages.vaccinations_page.nl.vaccination_grade_toggle_tile.description_footer,qjZwg5QUJcN8JoCoxxDDJy,__ -2023-03-21T10:35:31.653Z,delete,pages.vaccinations_page.shared.vaccination_grade_tile.autumn_labels.description_footer,u6z14vWwH5lzTVbDpRg06r,__ -2023-03-21T10:35:31.653Z,delete,pages.vaccinations_page.shared.vaccination_grade_tile.fully_vaccinated_labels.description_footer,772MCeNIooHnNdtyUIs7TE,__ -2023-03-21T10:35:31.653Z,delete,pages.vaccinations_page.vr.vaccination_grade_toggle_tile.description_footer,qjZwg5QUJcN8JoCoxxDHxs,__ -2023-03-24T10:25:28.260Z,delete,common.accessibility.charts.confirmed_cases_infected_people_choropleth.description,Z3v1SKYekK4CLDpzUPbDYl,__ -2023-03-24T10:25:28.261Z,delete,common.accessibility.charts.confirmed_cases_infected_people_choropleth.label,Z3v1SKYekK4CLDpzUPbD2R,__ -2023-03-24T10:25:28.274Z,delete,common.accessibility.charts.confirmed_cases_tested_total_over_time_chart.description,cl0A2qFve1QxscrDIqJJqj,__ -2023-03-24T10:25:28.284Z,delete,common.accessibility.charts.confirmed_cases_tested_total_over_time_chart.label,cl0A2qFve1QxscrDIqJIGP,__ -2023-03-24T10:25:28.290Z,delete,common.accessibility.charts.situations_over_time_chart.description,Z3v1SKYekK4CLDpzUPc9za,__ -2023-03-24T10:25:28.298Z,delete,common.accessibility.charts.situations_over_time_chart.label,cl0A2qFve1QxscrDIqKQEt,__ -2023-03-23T07:13:41.639Z,delete,common.common.zoekveld_placeholder_regio,jF33EuwumlGuwav2FD3gL6,__ -2023-03-23T07:13:41.643Z,delete,common.veiligheidsregio_index.selecteer_titel,jF33EuwumlGuwav2FD3nEq,__ -2023-03-23T07:13:41.644Z,delete,common.veiligheidsregio_index.selecteer_toelichting,jF33EuwumlGuwav2FD3nGW,__ -2023-03-27T08:10:29.719Z,delete,common.regionaal_index.belangrijk_bericht,jF33EuwumlGuwav2FD3g7g,__ -2023-03-22T14:16:09.203Z,delete,common.common.gm_plural,jF33EuwumlGuwav2FD3gfE,__ -2023-03-22T14:16:09.204Z,delete,common.common.gm_singular,jF33EuwumlGuwav2FD3gdY,__ -2023-03-22T14:16:09.204Z,delete,common.common.vr_plural,jF33EuwumlGuwav2FD3gia,__ -2023-03-22T14:16:09.204Z,delete,common.common.vr_singular,jF33EuwumlGuwav2FD3ggu,__ -2023-03-22T14:16:09.204Z,delete,common.common.zoekveld_placeholder_regio,jF33EuwumlGuwav2FD3gL6,__ -2023-03-22T14:16:09.204Z,delete,common.search.aria_label,m5cl7ciD7CmTUWm5d7zP2O,__ -2023-03-22T14:16:09.204Z,delete,common.search.clear,jF33EuwumlGuwav2FD4DVc,__ -2023-03-22T14:16:09.204Z,delete,common.search.no_hits,jF33EuwumlGuwav2FD4DXI,__ -2023-03-22T14:16:09.204Z,delete,common.search.placeholder,jF33EuwumlGuwav2FD4DTw,__ -2023-03-24T07:45:03.889Z,delete,pages.topical_page.shared.secties.search.title.gm,PGwiP4IwXrA0GfLCLD9UBA,__ -2023-03-24T07:45:03.890Z,delete,pages.topical_page.shared.secties.search.title.nl,PGwiP4IwXrA0GfLCLD9Tth,__ -2023-03-24T07:45:03.890Z,delete,pages.topical_page.shared.secties.search.title.vr,7nClfXqPlyZyEU7PO2TAAw,__ -2023-03-23T08:50:33.174Z,delete,common.nav.links.veiligheidsregio,jF33EuwumlGuwav2FD3VW8,__ -2023-03-27T10:31:36.962Z,delete,common.accessibility.charts.situations_choropleths.description,G1DXw0RdifOml06twMk14A,__ -2023-03-27T10:31:36.964Z,delete,common.accessibility.charts.situations_choropleths.label,G1DXw0RdifOml06twMk0QP,__ -2023-03-27T10:31:36.967Z,delete,common.accessibility.charts.situations_has_sufficient_data_choropleth.description,cl0A2qFve1QxscrDIqKPRj,__ -2023-03-27T10:31:36.978Z,delete,common.accessibility.charts.situations_has_sufficient_data_choropleth.label,Z3v1SKYekK4CLDpzUPc7uI,__ -2023-03-27T10:31:36.983Z,delete,pages.situations_page.shared.belangrijk_bericht,RQYRq9yqc5kuEd5capEHG3,__ -2023-03-27T10:31:36.986Z,delete,pages.situations_page.shared.bronnen.rivm.download,4IMVphhWjPcsfUKN0EVEXi,__ -2023-03-27T10:31:36.989Z,delete,pages.situations_page.shared.bronnen.rivm.href,CKPlHi4fNCjhqsan4TBhIQ,__ -2023-03-27T10:31:36.993Z,delete,pages.situations_page.shared.bronnen.rivm.text,4IMVphhWjPcsfUKN0EVFBC,__ -2023-03-27T10:31:36.996Z,delete,pages.situations_page.shared.bronnen.thijs.foo,9Ul66JU7B1nuUXBcC92Cfu,__ -2023-03-27T10:31:37.000Z,delete,pages.situations_page.shared.datums,CKPlHi4fNCjhqsan4TBfnZ,__ -2023-03-27T10:31:37.061Z,delete,pages.situations_page.shared.kpi_titel,6dTIFBydK0C6dL2sJemPx9,__ -2023-03-27T10:31:37.082Z,delete,pages.situations_page.shared.metadata.description,4IMVphhWjPcsfUKN0EVDxW,__ -2023-03-27T10:31:37.088Z,delete,pages.situations_page.shared.metadata.title,6dTIFBydK0C6dL2sJemSyF,__ -2023-03-27T10:31:37.093Z,delete,pages.situations_page.shared.pagina_toelichting,6dTIFBydK0C6dL2sJemTLd,__ -2023-03-27T10:31:37.097Z,delete,pages.situations_page.shared.reference.href,zrTRdM3o3E3fhzuaPw6kL1,__ -2023-03-27T10:31:37.100Z,delete,pages.situations_page.shared.situaties.gathering.beschrijving,6dTIFBydK0C6dL2sJzKahP,__ -2023-03-27T10:31:37.123Z,delete,pages.situations_page.shared.situaties.gathering.titel,4IMVphhWjPcsfUKN0T8OCc,__ -2023-03-27T10:31:37.126Z,delete,pages.situations_page.shared.situaties.health_care.beschrijving,4IMVphhWjPcsfUKN0T8Nss,__ -2023-03-27T10:31:37.129Z,delete,pages.situations_page.shared.situaties.health_care.titel,4IMVphhWjPcsfUKN0T8NLy,__ -2023-03-27T10:31:37.142Z,delete,pages.situations_page.shared.situaties.home_and_visits.beschrijving,6dTIFBydK0C6dL2sJzKXIv,__ -2023-03-27T10:31:37.146Z,delete,pages.situations_page.shared.situaties.home_and_visits.titel,CKPlHi4fNCjhqsan4opUgn,__ -2023-03-27T10:31:37.151Z,delete,pages.situations_page.shared.situaties.hospitality.beschrijving,4IMVphhWjPcsfUKN0T8Q74,__ -2023-03-27T10:31:37.155Z,delete,pages.situations_page.shared.situaties.hospitality.titel,6dTIFBydK0C6dL2sJzKbuF,__ -2023-03-27T10:31:37.159Z,delete,pages.situations_page.shared.situaties.other.beschrijving,CKPlHi4fNCjhqsan4opcxw,__ -2023-03-27T10:31:37.162Z,delete,pages.situations_page.shared.situaties.other.titel,CKPlHi4fNCjhqsan4opcFx,__ -2023-03-27T10:31:37.165Z,delete,pages.situations_page.shared.situaties.school_and_day_care.beschrijving,6dTIFBydK0C6dL2sJzKZdv,__ -2023-03-27T10:31:37.181Z,delete,pages.situations_page.shared.situaties.school_and_day_care.titel,CKPlHi4fNCjhqsan4opXWj,__ -2023-03-27T10:31:37.186Z,delete,pages.situations_page.shared.situaties.travel.beschrijving,4IMVphhWjPcsfUKN0T8PWs,__ -2023-03-27T10:31:37.188Z,delete,pages.situations_page.shared.situaties.travel.titel,4IMVphhWjPcsfUKN0T8Omo,__ -2023-03-27T10:31:37.191Z,delete,pages.situations_page.shared.situaties.work.beschrijving,6dTIFBydK0C6dL2sJzKYVl,__ -2023-03-27T10:31:37.194Z,delete,pages.situations_page.shared.situaties.work.titel,6dTIFBydK0C6dL2sJzKXgJ,__ -2023-03-27T10:31:37.196Z,delete,pages.situations_page.shared.situaties_kaarten_overzicht.beschrijving,6dTIFBydK0C6dL2sJzKeOb,__ -2023-03-27T10:31:37.198Z,delete,pages.situations_page.shared.situaties_kaarten_overzicht.legenda.onvoldoende_data,4IMVphhWjPcsfUKN0T8S86,__ -2023-03-27T10:31:37.200Z,delete,pages.situations_page.shared.situaties_kaarten_overzicht.legenda.titel,CKPlHi4fNCjhqsan4opeE8,__ -2023-03-27T10:31:37.201Z,delete,pages.situations_page.shared.situaties_kaarten_overzicht.titel,CKPlHi4fNCjhqsan4opgHC,__ -2023-03-27T10:31:37.203Z,delete,pages.situations_page.shared.situaties_kaarten_uitkomsten.beschrijving,lJrmoPoRnpF3E0PvGciez7,__ -2023-03-27T10:31:37.205Z,delete,pages.situations_page.shared.situaties_kaarten_uitkomsten.legenda.onvoldoende_data.omschrijving,lJrmoPoRnpF3E0PvGcoUl7,__ -2023-03-27T10:31:37.206Z,delete,pages.situations_page.shared.situaties_kaarten_uitkomsten.legenda.onvoldoende_data.titel,lJrmoPoRnpF3E0PvGcjPH7,__ -2023-03-27T10:31:37.208Z,delete,pages.situations_page.shared.situaties_kaarten_uitkomsten.legenda.voldoende_data.omschrijving,lJrmoPoRnpF3E0PvGcjBP7,__ -2023-03-27T10:31:37.209Z,delete,pages.situations_page.shared.situaties_kaarten_uitkomsten.legenda.voldoende_data.titel,lJrmoPoRnpF3E0PvGcj0W7,__ -2023-03-27T10:31:37.212Z,delete,pages.situations_page.shared.situaties_kaarten_uitkomsten.titel,pUh1Ah0fhZhgu4kAL9jOsc,__ -2023-03-27T10:31:37.213Z,delete,pages.situations_page.shared.situaties_kaarten_uitkomsten.tooltip.onvoldoende_data,lJrmoPoRnpF3E0PvGcjjC7,__ -2023-03-27T10:31:37.216Z,delete,pages.situations_page.shared.situaties_kaarten_uitkomsten.tooltip.voldoende_data,pUh1Ah0fhZhgu4kAL9l6DL,__ -2023-03-27T10:31:37.218Z,delete,pages.situations_page.shared.titel,6dTIFBydK0C6dL2sJemSDT,__ -2023-03-27T10:31:37.219Z,delete,pages.situations_page.shared.warning,grBB1wMeP3licxsoUoRq0R,__ -2023-03-27T11:57:30.539Z,delete,common.sidebar.metrics.source_investigation.title,c0OY0u3YEyF1oawiVvkMa6,__ -2023-03-28T12:50:47.492Z,delete,common.accessibility.charts.confirmed_cases_region_choropleth.description,Z3v1SKYekK4CLDpzUPbJIJ,__ -2023-03-28T12:50:47.493Z,delete,common.accessibility.charts.confirmed_cases_region_choropleth.label,G1DXw0RdifOml06twMjEhw,__ -2023-03-28T12:52:25.750Z,delete,common.accessibility.charts.hospital_admissions_region_choropleth.description,YzrXb3vQYHnZxtu61Xgzap,__ -2023-03-28T12:52:25.751Z,delete,common.accessibility.charts.hospital_admissions_region_choropleth.label,Z3v1SKYekK4CLDpzUPbgJt,__ -2023-03-27T13:01:45.444Z,delete,common.accessibility.charts.elderly_at_home_deceased_over_time_chart.description,G1DXw0RdifOml06twMjSTZ,__ -2023-03-27T13:01:45.445Z,delete,common.accessibility.charts.elderly_at_home_deceased_over_time_chart.label,G1DXw0RdifOml06twMjRl8,__ -2023-03-28T13:00:33.765Z,delete,common.accessibility.charts.sewer_region_choropleth.description,cl0A2qFve1QxscrDIqKL1F,__ -2023-03-28T13:00:33.766Z,delete,common.accessibility.charts.sewer_region_choropleth.label,Z3v1SKYekK4CLDpzUPc5x5,__ -2023-04-03T15:45:47.784Z,delete,pages.behavior_page.nl.tooltip_labels.compliance,uFGMarfssEPhdNlk3s6Avk,__ -2023-04-03T15:45:47.785Z,delete,pages.behavior_page.nl.tooltip_labels.support,EaUS1FZKh46VBcUuh47mI4,__ -2023-03-29T10:43:54.266Z,delete,common.choropleth.choropleth_vaccination_coverage.shared.vr,G6M7GhzH8XbtdKiRrez14Y,__ -2023-04-12T10:11:37.825Z,add,common.choropleth.vaccination_coverage.shared.dropdown_label_vaccination_coverage_kind_select,mt9hMqvnezW3fDtFvUjLNr,__ -2023-04-12T10:11:38.807Z,add,common.choropleth.vaccination_coverage.shared.dropdown_label_age_group_select,eamHKzD43YGGBYDBd2rfcD,__ -2023-04-11T15:39:11.176Z,add,common.sidebar.metrics.tests.title,CsCcyhU6YSJUj7yolLoyBL,__ -2023-04-11T15:39:14.357Z,add,pages.tests_page.nl.metadata.description,CsCcyhU6YSJUj7yolLoyIy,__ -2023-04-11T15:39:16.050Z,add,pages.tests_page.nl.metadata.title,sV6BHv8iu7DuHPF8JxKZSk,__ -2023-04-11T15:39:17.408Z,add,pages.tests_page.nl.sources.rivm.aria_text,CsCcyhU6YSJUj7yolLoyQb,__ -2023-04-11T15:39:19.304Z,add,pages.tests_page.nl.sources.rivm.download,sV6BHv8iu7DuHPF8JxKaSq,__ -2023-04-11T15:39:21.493Z,add,pages.tests_page.nl.sources.rivm.href,sV6BHv8iu7DuHPF8JxKbQ7,__ -2023-04-11T15:39:26.183Z,add,pages.tests_page.nl.sources.rivm.text,CsCcyhU6YSJUj7yolLoyre,__ -2023-04-11T15:39:29.664Z,add,pages.tests_page.nl.sources.self_test.aria_text,jw0M9D1FUbTPkflikzUdd8,__ -2023-04-11T15:39:33.508Z,add,pages.tests_page.nl.sources.self_test.download,sV6BHv8iu7DuHPF8JxKd3j,__ -2023-04-11T15:39:35.057Z,add,pages.tests_page.nl.sources.self_test.href,jw0M9D1FUbTPkflikzUdmw,__ -2023-04-11T15:39:37.338Z,add,pages.tests_page.nl.sources.self_test.text,sV6BHv8iu7DuHPF8JxKdYm,__ -2023-04-11T15:39:38.574Z,add,pages.tests_page.nl.reference.href,jw0M9D1FUbTPkflikzUdsS,__ -2023-04-11T15:39:42.269Z,add,pages.tests_page.nl.dates,CsCcyhU6YSJUj7yolLozOw,__ -2023-04-11T15:39:45.361Z,add,pages.tests_page.nl.description,sV6BHv8iu7DuHPF8JxKesd,__ -2023-04-11T15:39:47.349Z,add,pages.tests_page.nl.title,sV6BHv8iu7DuHPF8JxKfCO,__ -2023-04-11T15:39:49.307Z,add,pages.tests_page.nl.chart_self_tests.title,CsCcyhU6YSJUj7yolLp0IQ,__ -2023-04-11T15:39:51.003Z,add,pages.tests_page.nl.chart_self_tests.description,CsCcyhU6YSJUj7yolLp0Of,__ -2023-04-11T15:39:52.678Z,add,pages.tests_page.nl.chart_self_tests.tooltip_label,jw0M9D1FUbTPkflikzUeTE,__ -2023-04-11T15:39:52.682Z,delete,pages.positive_tests_page.nl.bronnen.self_test.aria_text,PKXdxxxKAnTg0F1ZCsSm7v,__ -2023-04-11T15:39:52.694Z,delete,pages.positive_tests_page.nl.bronnen.self_test.download,KoLyCpXIGU95m7jfEPMPhh,__ -2023-04-11T15:39:52.702Z,delete,pages.positive_tests_page.nl.bronnen.self_test.href,KoLyCpXIGU95m7jfEPMPlH,__ -2023-04-11T15:39:52.711Z,delete,pages.positive_tests_page.nl.bronnen.self_test.text,0iJeil5hiqRr6jTKtbFGx7,__ -2023-04-11T15:39:52.717Z,delete,pages.positive_tests_page.nl.linechart_self_test_titel,PKXdxxxKAnTg0F1ZCghMkN,__ -2023-04-11T15:39:52.725Z,delete,pages.positive_tests_page.nl.linechart_self_test_toelichting,PKXdxxxKAnTg0F1ZCghMnz,__ -2023-04-11T15:39:52.730Z,delete,pages.positive_tests_page.nl.linechart_self_test_tooltip_label,KoLyCpXIGU95m7jfEHZKIf,__ -2023-04-17T09:54:53.417Z,add,pages.positive_tests_page.nl.bronnen.self_test.aria_text,eamHKzD43YGGBYDBdLwkJN,__ -2023-04-17T09:54:55.806Z,add,pages.positive_tests_page.nl.bronnen.self_test.download,eamHKzD43YGGBYDBdLwkSZ,__ -2023-04-17T09:54:57.376Z,add,pages.positive_tests_page.nl.bronnen.self_test.href,oB32MHoi5k0LjWD2RooOOv,__ -2023-04-17T09:54:58.827Z,add,pages.positive_tests_page.nl.bronnen.self_test.text,oB32MHoi5k0LjWD2RooOrr,__ -2023-04-17T09:54:59.852Z,add,pages.positive_tests_page.nl.linechart_self_test_titel,oB32MHoi5k0LjWD2RooPFy,__ -2023-04-17T09:55:01.863Z,add,pages.positive_tests_page.nl.linechart_self_test_toelichting,eamHKzD43YGGBYDBdLwkvz,__ -2023-04-17T09:55:02.863Z,add,pages.positive_tests_page.nl.linechart_self_test_tooltip_label,eamHKzD43YGGBYDBdLwl5B,__ From c79db5ecc0b4473f73b69f79536d636ac9754b22 Mon Sep 17 00:00:00 2001 From: LR <107395524+VWSCoronaDashboard26@users.noreply.github.com> Date: Fri, 21 Apr 2023 09:40:37 +0200 Subject: [PATCH 2/5] feature/COR-1202-severity-indicator-relative-timeline-parts (#4737) * feat(severity-indicator): added utility method for calculating the amount of days for a timeline bar part; added utility method for calculating the relative width of a timeline bar part; updated Timeline component to leverage new utility methods; * feat(severity-indicator): grouped timeline logic into single logic.ts file as all individual utilities are very small yet depent on each other; cleaned up JSX a bit; * feat(severity-indicator): updated some logic based on PR feedback; --------- Co-authored-by: VWSCoronaDashboard26 --- .../components/timeline/logic.ts | 74 +++++++++++++++++++ .../logic/get-timeline-bar-arrow-offset.ts | 28 ------- .../logic/get-timeline-range-dates.ts | 15 ---- .../components/timeline/timeline.tsx | 22 ++++-- packages/app/src/pages/index.tsx | 6 +- 5 files changed, 91 insertions(+), 54 deletions(-) create mode 100644 packages/app/src/components/severity-indicator-tile/components/timeline/logic.ts delete mode 100644 packages/app/src/components/severity-indicator-tile/components/timeline/logic/get-timeline-bar-arrow-offset.ts delete mode 100644 packages/app/src/components/severity-indicator-tile/components/timeline/logic/get-timeline-range-dates.ts diff --git a/packages/app/src/components/severity-indicator-tile/components/timeline/logic.ts b/packages/app/src/components/severity-indicator-tile/components/timeline/logic.ts new file mode 100644 index 0000000000..3189b354c4 --- /dev/null +++ b/packages/app/src/components/severity-indicator-tile/components/timeline/logic.ts @@ -0,0 +1,74 @@ +import { middleOfDayInSeconds } from '@corona-dashboard/common'; +import { createDateFromUnixTimestamp } from '~/utils/create-date-from-unix-timestamp'; +import { SeverityIndicatorTimelineEventConfig } from './timeline'; + +/** + * Calculated the difference, in days, between two dates. + * @param start - the start date of a given range + * @param end - the end date of a given range + * @returns the number of days between two dates + */ +export const getDifferenceInDays = (start: Date, end: Date): number => { + return Math.floor((end.getTime() - start.getTime()) / (1000 * 3600 * 24)); +}; + +/** + * Calculates the middle of the day for each passed in date (either today or the start and end date for a given range). + * @param today - today's Date object + * @param startDate - the start date of a given range + * @param endDate - the end date of a given range + * @returns the date representing the middle of the day for the passed in dates + */ +const getMiddleOfDayDates = (today: Date, startDate: number, endDate: number): Record => { + const todayMiddleOfDayDate = createDateFromUnixTimestamp(middleOfDayInSeconds(today.getTime() / 1000)); + const startOfIntervalDate = createDateFromUnixTimestamp(middleOfDayInSeconds(startDate)); + const endOfIntervalDate = createDateFromUnixTimestamp(middleOfDayInSeconds(endDate)); + + return { + startOfIntervalDate, + endOfIntervalDate, + todayMiddleOfDayDate, + }; +}; + +/** + * Calculates the relative offset value for the 'Today' label on the timeline. + * @param today - today's Date object + * @param startDate - the start date of the timeline + * @param endDate - the end date of the timeline + * @returns the relative offset value for the 'Today' label on the timeline + */ +export const getTimelineBarArrowOffset = (today: Date, startDate: number, endDate: number): number => { + const { startOfIntervalDate, endOfIntervalDate, todayMiddleOfDayDate } = getMiddleOfDayDates(today, startDate, endDate); + const numberOfDaysInInterval = getDifferenceInDays(startOfIntervalDate, endOfIntervalDate); + const numberOfDaysFromStartToToday = getDifferenceInDays(startOfIntervalDate, todayMiddleOfDayDate); + const arrowOffset = (numberOfDaysFromStartToToday / numberOfDaysInInterval) * 100; + + return arrowOffset; +}; + +/** + * Calculates the amount of relative width a timeline bar part covers. + * @param daysInBarPart - the amount of days in a timeline bar part + * @param totalDays - the total amount of days in a timeline + * @returns the relative width of a timeline bar part + */ +export const getTimelineBarPartWidth = (daysInBarPart: ReturnType, totalDays: number) => (daysInBarPart / totalDays) * 100; + +/** + * Calculates the start and end date of a given timeline range. + * @param timelineEvents - the timeline events/range to calculate the start and end dates for + * @returns the start and end date of the given timeline range + */ +export const getTimelineRangeDates = (timelineEvents: SeverityIndicatorTimelineEventConfig[]) => { + const timelineEventDates = timelineEvents + .flatMap((timelineEvent: SeverityIndicatorTimelineEventConfig) => [timelineEvent.start, timelineEvent.end]) + .map((timelineEventDate: number) => { + return createDateFromUnixTimestamp(timelineEventDate).getTime(); + }); + + return { + startDate: Math.min(...timelineEventDates), + endDate: Math.max(...timelineEventDates), + }; +}; diff --git a/packages/app/src/components/severity-indicator-tile/components/timeline/logic/get-timeline-bar-arrow-offset.ts b/packages/app/src/components/severity-indicator-tile/components/timeline/logic/get-timeline-bar-arrow-offset.ts deleted file mode 100644 index 767e30677e..0000000000 --- a/packages/app/src/components/severity-indicator-tile/components/timeline/logic/get-timeline-bar-arrow-offset.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { createDateFromUnixTimestamp } from '~/utils/create-date-from-unix-timestamp'; -import { middleOfDayInSeconds } from '@corona-dashboard/common'; - -// Returns the difference between two dates in days. -const getDifferenceInDays = (start: Date, end: Date): number => { - return Math.floor((end.getTime() - start.getTime()) / (1000 * 3600 * 24)); -}; - -// Returns the date representing the middle of the day for the passed in dates. -const getMiddleOfDayDates = (today: Date, startDate: number, endDate: number): Record => { - const todayMiddleOfDaySeconds = middleOfDayInSeconds(today.getTime() / 1000); - - return { - startOfIntervalDate: createDateFromUnixTimestamp(middleOfDayInSeconds(startDate)), - endOfIntervalDate: createDateFromUnixTimestamp(middleOfDayInSeconds(endDate)), - todayMiddleOfDayDate: createDateFromUnixTimestamp(todayMiddleOfDaySeconds), - }; -}; - -// Determines where to position the 'Vandaag' label on the timeline. -export const getTimelineBarArrowOffset = (today: Date, startDate: number, endDate: number): number => { - const { startOfIntervalDate, endOfIntervalDate, todayMiddleOfDayDate } = getMiddleOfDayDates(today, startDate, endDate); - const numberOfDaysInInterval = getDifferenceInDays(startOfIntervalDate, endOfIntervalDate); - const numberOfDaysFromStartToToday = getDifferenceInDays(startOfIntervalDate, todayMiddleOfDayDate); - const arrowOffset = (numberOfDaysFromStartToToday / numberOfDaysInInterval) * 100; - - return arrowOffset; -}; diff --git a/packages/app/src/components/severity-indicator-tile/components/timeline/logic/get-timeline-range-dates.ts b/packages/app/src/components/severity-indicator-tile/components/timeline/logic/get-timeline-range-dates.ts deleted file mode 100644 index e4f9dd4a95..0000000000 --- a/packages/app/src/components/severity-indicator-tile/components/timeline/logic/get-timeline-range-dates.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { createDateFromUnixTimestamp } from '~/utils/create-date-from-unix-timestamp'; -import { SeverityIndicatorTimelineEventConfig } from '../timeline'; - -export const getTimelineRangeDates = (timelineEvents: SeverityIndicatorTimelineEventConfig[]) => { - const timelineEventDates = timelineEvents - .flatMap((timelineEvent: SeverityIndicatorTimelineEventConfig) => [timelineEvent.start, timelineEvent.end]) - .map((timelineEventDate: number) => { - return createDateFromUnixTimestamp(timelineEventDate).getTime(); - }); - - return { - startDate: Math.min(...timelineEventDates), - endDate: Math.max(...timelineEventDates), - }; -}; diff --git a/packages/app/src/components/severity-indicator-tile/components/timeline/timeline.tsx b/packages/app/src/components/severity-indicator-tile/components/timeline/timeline.tsx index e38b457ba5..32f199030f 100644 --- a/packages/app/src/components/severity-indicator-tile/components/timeline/timeline.tsx +++ b/packages/app/src/components/severity-indicator-tile/components/timeline/timeline.tsx @@ -1,20 +1,21 @@ import { colors, middleOfDayInSeconds } from '@corona-dashboard/common'; import { ReactNode, useCallback, useRef, useState } from 'react'; import styled from 'styled-components'; -import { useIntl } from '~/intl'; -import { space } from '~/style/theme'; -import { useResizeObserver } from '~/utils/use-resize-observer'; import { Box } from '~/components/base'; -import { LegendItem, Legend } from '~/components/legend'; +import { Legend, LegendItem } from '~/components/legend'; import { TimelineEvent } from '~/components/time-series-chart/components/timeline/components/timeline-event'; import { Heading } from '~/components/typography'; +import { useIntl } from '~/intl'; +import { space } from '~/style/theme'; import { useCurrentDate } from '~/utils/current-date-context'; +import { useResizeObserver } from '~/utils/use-resize-observer'; +import { getSeverityColor } from '../../logic/get-severity-color'; +import { SeverityLevels } from '../../types'; import { TimelineBar } from './components/timeline-bar'; import { TimelineBarPart } from './components/timeline-bar-part'; import { TimelineTooltipContent } from './components/tooltip-content'; -import { getSeverityColor } from '../../logic/get-severity-color'; -import { getTimelineBarArrowOffset } from './logic/get-timeline-bar-arrow-offset'; -import { SeverityLevels } from '../../types'; +import { getDifferenceInDays, getTimelineBarArrowOffset, getTimelineBarPartWidth } from './logic'; +import { createDateFromUnixTimestamp } from '~/utils/create-date-from-unix-timestamp'; export interface SeverityIndicatorTimelineEventConfig { title: string; @@ -49,6 +50,11 @@ export const Timeline = ({ labels, startDate, endDate, legendItems, size = 10, t if (!timelineEvents) return null; + const totalDays = (endDate - startDate) / (1000 * 3600 * 24); + + const timelineBarPartDays = (timelineEvent: SeverityIndicatorTimelineEventConfig) => + getDifferenceInDays(createDateFromUnixTimestamp(timelineEvent.start), createDateFromUnixTimestamp(timelineEvent.end)); + return ( {labels.heading} @@ -61,7 +67,7 @@ export const Timeline = ({ labels, startDate, endDate, legendItems, size = 10, t isFirst={i === 0} isLast={i + 1 === timelineEvents.length} size={size} - width={`${100 / timelineEvents.length}%`} + width={`${getTimelineBarPartWidth(timelineBarPartDays(timelineEvent), totalDays)}%`} > {i + 1 === timelineEvents.length && ( diff --git a/packages/app/src/pages/index.tsx b/packages/app/src/pages/index.tsx index 4534b1287e..ffefd60607 100644 --- a/packages/app/src/pages/index.tsx +++ b/packages/app/src/pages/index.tsx @@ -4,11 +4,11 @@ import { css } from '@styled-system/css'; import { GetStaticPropsContext } from 'next'; import styled from 'styled-components'; import { isPresent } from 'ts-is-present'; -import { MaxWidth } from '~/components/max-width'; import { Box, Spacer } from '~/components/base'; import { RichContent } from '~/components/cms/rich-content'; import { CollapsibleSection } from '~/components/collapsible'; -import { getTimelineRangeDates } from '~/components/severity-indicator-tile/components/timeline/logic/get-timeline-range-dates'; +import { MaxWidth } from '~/components/max-width'; +import { getTimelineRangeDates } from '~/components/severity-indicator-tile/components/timeline/logic'; import { Timeline } from '~/components/severity-indicator-tile/components/timeline/timeline'; import { SEVERITY_LEVELS_LIST, TOPICAL_SEVERITY_INDICATOR_TILE_MAX_WIDTH } from '~/components/severity-indicator-tile/constants'; import { SeverityIndicatorTile } from '~/components/severity-indicator-tile/severity-indicator-tile'; @@ -28,7 +28,7 @@ import { Languages, SiteText } from '~/locale'; import { getArticleParts, getPagePartsQuery } from '~/queries/get-page-parts-query'; import { getThermometerEvents, getTopicalStructureQuery } from '~/queries/get-topical-structure-query'; import { TopicalSanityData } from '~/queries/query-types'; -import { createGetStaticProps, StaticProps } from '~/static-props/create-get-static-props'; +import { StaticProps, createGetStaticProps } from '~/static-props/create-get-static-props'; import { createGetContent, getLastGeneratedDate, getLokalizeTexts } from '~/static-props/get-data'; import { space } from '~/style/theme'; import { ArticleParts, LinkParts, PagePartQueryResult, RichTextParts } from '~/types/cms'; From e642943be83cd4ed9acd8afc9a988a1f2607b447 Mon Sep 17 00:00:00 2001 From: LR <107395524+VWSCoronaDashboard26@users.noreply.github.com> Date: Fri, 21 Apr 2023 10:24:09 +0200 Subject: [PATCH 3/5] feature/COR-1548-tests-page (#4743) * feat(tests-page): added new Tests route component; updated PositivelyTestedPeople route component to remove self tests chart; updated reverse router to add new Tests route and clean up; updated NlLayout component to add new Tests route to sidebar; moved Sanity keys using DELETE and ADD; updated types; * feat(tests-page): sorted mapKeysToReverseRouter entries in useSidebar hook; --------- Co-authored-by: VWSCoronaDashboard26 --- packages/app/src/domain/layout/logic/types.ts | 3 +- .../src/domain/layout/logic/use-sidebar.tsx | 7 +- packages/app/src/domain/layout/nl-layout.tsx | 2 +- .../landelijk/positief-geteste-mensen.tsx | 34 ----- packages/app/src/pages/landelijk/testen.tsx | 131 ++++++++++++++++++ packages/app/src/types/cms.d.ts | 21 +-- packages/common/src/data/reverse-router.ts | 37 ++--- 7 files changed, 168 insertions(+), 67 deletions(-) create mode 100644 packages/app/src/pages/landelijk/testen.tsx diff --git a/packages/app/src/domain/layout/logic/types.ts b/packages/app/src/domain/layout/logic/types.ts index a9f3f44241..8ca196bb70 100644 --- a/packages/app/src/domain/layout/logic/types.ts +++ b/packages/app/src/domain/layout/logic/types.ts @@ -13,13 +13,14 @@ export type NlItemKeys = | 'elderly_at_home' | 'general_practitioner_suspicions' | 'hospitals_and_care' - | 'patients' | 'infectious_people' | 'mortality' | 'nursing_home_care' + | 'patients' | 'positive_tests' | 'reproduction_number' | 'sewage_measurement' + | 'tests' | 'vaccinations' | 'variants'; diff --git a/packages/app/src/domain/layout/logic/use-sidebar.tsx b/packages/app/src/domain/layout/logic/use-sidebar.tsx index 5699d9f96c..42f20889ae 100644 --- a/packages/app/src/domain/layout/logic/use-sidebar.tsx +++ b/packages/app/src/domain/layout/logic/use-sidebar.tsx @@ -15,23 +15,24 @@ const mapCategoriesToIcons = { const mapKeysToReverseRouter = { compliance: 'gedrag', coronamelder_app: 'coronamelder', + current_advices: 'geldendeAdviezen', disabled_care: 'gehandicaptenzorg', elderly_at_home: 'thuiswonendeOuderen', general_practitioner_suspicions: 'verdenkingenHuisartsen', hospital_admissions: 'ziekenhuisopnames', hospitals_and_care: 'ziekenhuizenEnZorg', - patients: 'patientenInBeeld', infectious_people: 'besmettelijkeMensen', intensive_care_admissions: 'intensiveCareOpnames', - current_advices: 'geldendeAdviezen', mortality: 'sterfte', // Still the nursing home care name is used because of legacy naming inside of sanity's lokalize texts. nursing_home_care: 'kwetsbareGroepen', + patients: 'patientenInBeeld', positive_tests: 'positiefGetesteMensen', + reproduction_number: 'reproductiegetal', sewage_measurement: 'rioolwater', + tests: 'testen', vaccinations: 'vaccinaties', variants: 'varianten', - reproduction_number: 'reproductiegetal', } as const; type UseSidebarArgs = { diff --git a/packages/app/src/domain/layout/nl-layout.tsx b/packages/app/src/domain/layout/nl-layout.tsx index 627d55b7ef..b53d66c122 100644 --- a/packages/app/src/domain/layout/nl-layout.tsx +++ b/packages/app/src/domain/layout/nl-layout.tsx @@ -37,7 +37,7 @@ export function NlLayout(props: NlLayoutProps) { const items = useSidebar({ layout: 'nl', map: [ - ['development_of_the_virus', ['sewage_measurement', 'positive_tests', 'reproduction_number', 'variants', 'mortality']], + ['development_of_the_virus', ['sewage_measurement', 'positive_tests', 'tests', 'reproduction_number', 'variants', 'mortality']], ['consequences_for_healthcare', ['hospitals_and_care', 'patients', 'nursing_home_care']], ['actions_to_take', ['vaccinations', 'compliance']], ['archived_metrics', ['disabled_care', 'elderly_at_home', 'coronamelder_app', 'infectious_people', 'general_practitioner_suspicions']], diff --git a/packages/app/src/pages/landelijk/positief-geteste-mensen.tsx b/packages/app/src/pages/landelijk/positief-geteste-mensen.tsx index a5590bdfa1..75fbfa6809 100644 --- a/packages/app/src/pages/landelijk/positief-geteste-mensen.tsx +++ b/packages/app/src/pages/landelijk/positief-geteste-mensen.tsx @@ -84,8 +84,6 @@ export const getStaticProps = createGetStaticProps( function PositivelyTestedPeople(props: StaticProps) { const { pageText, selectedNlData: data, choropleth, content, lastGenerated } = props; - const [confirmedCasesSelfTestedTimeframe, setConfirmedCasesSelfTestedTimeframe] = useState(TimeframeOption.SIX_MONTHS); - const [confirmedCasesInfectedTimeframe, setConfirmedCasesInfectedTimeframe] = useState(TimeframeOption.SIX_MONTHS); const [confirmedCasesInfectedPercentageTimeframe, setConfirmedCasesInfectedPercentageTimeframe] = useState(TimeframeOption.ALL); @@ -144,38 +142,6 @@ function PositivelyTestedPeople(props: StaticProps) { articles={content.articles} /> - - - - ({ + metadataTexts: siteText.pages.topical_page.nl.nationaal_metadata, + textNl: siteText.pages.tests_page.nl, +}); + +type LokalizeTexts = ReturnType; + +export const getStaticProps = createGetStaticProps( + ({ locale }: { locale: keyof Languages }) => getLokalizeTexts(selectLokalizeTexts, locale), + getLastGeneratedDate, + selectNlData('self_test_overall'), + async (context: GetStaticPropsContext) => { + const { content } = await createGetContent<{ + parts: PagePartQueryResult; + elements: ElementsQueryResult; + }>((context) => { + const { locale } = context; + return `{ + "parts": ${getPagePartsQuery('tests_page')}, + "elements": ${getElementsQuery('nl', ['self_test_overall'], locale)} + }`; + })(context); + return { + content: { + articles: getArticleParts(content.parts.pageParts, 'testsPageArticles'), + elements: content.elements, + }, + }; + } +); + +const Tests = (props: StaticProps) => { + const { pageText, selectedNlData: data, content, lastGenerated } = props; + + const [confirmedCasesSelfTestedTimeframe, setConfirmedCasesSelfTestedTimeframe] = useState(TimeframeOption.SIX_MONTHS); + + const { commonTexts } = useIntl(); + + const { metadataTexts, textNl } = useDynamicLokalizeTexts(pageText, selectLokalizeTexts); + + const metadata = { + ...metadataTexts, + title: textNl.metadata.title, + description: textNl.metadata.description, + }; + + const lastInsertionDateOfPage = getLastInsertionDateOfPage(data, pageMetrics); + + return ( + + + + + + + ); +}; + +export default Tests; diff --git a/packages/app/src/types/cms.d.ts b/packages/app/src/types/cms.d.ts index a44aeb9972..160dc4f715 100644 --- a/packages/app/src/types/cms.d.ts +++ b/packages/app/src/types/cms.d.ts @@ -3,22 +3,23 @@ import { ArticleSummary } from '~/components/article-teaser'; import { CategoriesTypes } from '~/domain/topical/common/categories'; export type PageIdentifier = + | 'behavior_page' + | 'deceased_page' + | 'disability_care_page' + | 'elderly_at_home_page' | 'hospital_page' | 'hospitals_and_care_page' - | 'behavior_page' - | 'situations_page' - | 'reproduction_page' | 'infectious_people_page' - | 'topical_page' - | 'elderly_at_home_page' - | 'disability_care_page' + | 'nursing_home_page' + | 'patients_page' | 'positive_tests_page' - | 'variants_page' + | 'reproduction_page' | 'sewer_page' - | 'patients_page' + | 'situations_page' + | 'tests_page' + | 'topical_page' | 'vaccinations_page' - | 'nursing_home_page' - | 'deceased_page'; + | 'variants_page'; export type PageBasePart = { pageDataKind: string; diff --git a/packages/common/src/data/reverse-router.ts b/packages/common/src/data/reverse-router.ts index 2c632716d8..06b38c2669 100644 --- a/packages/common/src/data/reverse-router.ts +++ b/packages/common/src/data/reverse-router.ts @@ -15,24 +15,25 @@ export function getReverseRouter(isMobile: boolean) { }, nl: { - index: () => (isMobile ? `/landelijk` : reverseRouter.nl.rioolwater()), - vaccinaties: () => `/landelijk/vaccinaties`, - positiefGetesteMensen: () => `/landelijk/positief-geteste-mensen`, - besmettelijkeMensen: () => `/landelijk/besmettelijke-mensen`, - reproductiegetal: () => `/landelijk/reproductiegetal`, - sterfte: () => `/landelijk/sterfte`, - ziekenhuisopnames: () => `/landelijk/ziekenhuis-opnames`, - intensiveCareOpnames: () => `/landelijk/intensive-care-opnames`, - ziekenhuizenEnZorg: () => `/landelijk/ziekenhuizen-en-zorg`, - patientenInBeeld: () => `/landelijk/patienten-in-beeld`, - kwetsbareGroepen: () => `/landelijk/kwetsbare-groepen-70-plussers`, - gehandicaptenzorg: () => `/landelijk/gehandicaptenzorg`, - thuiswonendeOuderen: () => `/landelijk/thuiswonende-ouderen`, - rioolwater: () => `/landelijk/rioolwater`, - verdenkingenHuisartsen: () => `/landelijk/verdenkingen-huisartsen`, - gedrag: () => `/landelijk/gedrag`, - coronamelder: () => `/landelijk/coronamelder`, - varianten: () => `/landelijk/varianten`, + index: () => (isMobile ? '/landelijk' : reverseRouter.nl.rioolwater()), + vaccinaties: () => '/landelijk/vaccinaties', + positiefGetesteMensen: () => '/landelijk/positief-geteste-mensen', + testen: () => '/landelijk/testen', + besmettelijkeMensen: () => '/landelijk/besmettelijke-mensen', + reproductiegetal: () => '/landelijk/reproductiegetal', + sterfte: () => '/landelijk/sterfte', + ziekenhuisopnames: () => '/landelijk/ziekenhuis-opnames', + intensiveCareOpnames: () => '/landelijk/intensive-care-opnames', + ziekenhuizenEnZorg: () => '/landelijk/ziekenhuizen-en-zorg', + patientenInBeeld: () => '/landelijk/patienten-in-beeld', + kwetsbareGroepen: () => '/landelijk/kwetsbare-groepen-70-plussers', + gehandicaptenzorg: () => '/landelijk/gehandicaptenzorg', + thuiswonendeOuderen: () => '/landelijk/thuiswonende-ouderen', + rioolwater: () => '/landelijk/rioolwater', + verdenkingenHuisartsen: () => '/landelijk/verdenkingen-huisartsen', + gedrag: () => '/landelijk/gedrag', + coronamelder: () => '/landelijk/coronamelder', + varianten: () => '/landelijk/varianten', }, gm: { From 294b5d9b899cdc35400d29c39094a7d6832f0693 Mon Sep 17 00:00:00 2001 From: VWSCoronaDashboard27 <111750729+VWSCoronaDashboard27@users.noreply.github.com> Date: Mon, 24 Apr 2023 16:43:08 +0200 Subject: [PATCH 4/5] feat: COR-1547 archived National and Municipalities Positive tests pages (#4751) * feat: archived National and Municipalities Positive tests pages * fix: revert static_values from archiving * fix: revert schemas changes * fix: revert nl/gm data * fix: delited localyze kay * fix: added localyze key * fix: toggle button style * fix: toggle button style to 16px * fix: warning style of writing the code --------- Co-authored-by: VWSCoronaDashboard27 --- .../app/schema/gm_collection/__index.json | 12 +------- .../schema/gm_collection/tested_overall.json | 8 +---- packages/app/src/domain/layout/gm-layout.tsx | 4 +-- packages/app/src/domain/layout/nl-layout.tsx | 4 +-- .../domain/tested/g-number-bar-chart-tile.tsx | 1 - .../[code]/positief-geteste-mensen.tsx | 5 +++- .../landelijk/positief-geteste-mensen.tsx | 29 ++++++------------- packages/cms/src/lokalize/key-mutations.csv | 2 ++ 8 files changed, 21 insertions(+), 44 deletions(-) diff --git a/packages/app/schema/gm_collection/__index.json b/packages/app/schema/gm_collection/__index.json index 35bb8e51b7..c94b90c8ab 100644 --- a/packages/app/schema/gm_collection/__index.json +++ b/packages/app/schema/gm_collection/__index.json @@ -3,17 +3,7 @@ "type": "object", "title": "gm_collection", "additionalProperties": false, - "required": [ - "last_generated", - "proto_name", - "name", - "code", - "hospital_nice", - "hospital_nice_choropleth", - "tested_overall", - "sewer", - "vaccine_coverage_per_age_group" - ], + "required": ["last_generated", "proto_name", "name", "code", "hospital_nice", "hospital_nice_choropleth", "tested_overall", "sewer", "vaccine_coverage_per_age_group"], "properties": { "last_generated": { "type": "string" diff --git a/packages/app/schema/gm_collection/tested_overall.json b/packages/app/schema/gm_collection/tested_overall.json index cb16add012..1556b9091d 100644 --- a/packages/app/schema/gm_collection/tested_overall.json +++ b/packages/app/schema/gm_collection/tested_overall.json @@ -3,13 +3,7 @@ "type": "object", "title": "gm_collection_tested_overall", "additionalProperties": false, - "required": [ - "date_unix", - "gmcode", - "infected", - "infected_per_100k", - "date_of_insertion_unix" - ], + "required": ["date_unix", "gmcode", "infected", "infected_per_100k", "date_of_insertion_unix"], "properties": { "date_unix": { "type": "integer" diff --git a/packages/app/src/domain/layout/gm-layout.tsx b/packages/app/src/domain/layout/gm-layout.tsx index 0c22707b4f..320b3cd93c 100644 --- a/packages/app/src/domain/layout/gm-layout.tsx +++ b/packages/app/src/domain/layout/gm-layout.tsx @@ -59,10 +59,10 @@ export function GmLayout(props: GmLayoutProps) { layout: 'gm', code: code, map: [ - ['development_of_the_virus', ['sewage_measurement', 'positive_tests']], + ['development_of_the_virus', ['sewage_measurement']], ['consequences_for_healthcare', ['hospital_admissions']], ['actions_to_take', ['vaccinations']], - ['archived_metrics', ['mortality']], + ['archived_metrics', ['positive_tests', 'mortality']], ], }); diff --git a/packages/app/src/domain/layout/nl-layout.tsx b/packages/app/src/domain/layout/nl-layout.tsx index b53d66c122..b62a65c114 100644 --- a/packages/app/src/domain/layout/nl-layout.tsx +++ b/packages/app/src/domain/layout/nl-layout.tsx @@ -37,10 +37,10 @@ export function NlLayout(props: NlLayoutProps) { const items = useSidebar({ layout: 'nl', map: [ - ['development_of_the_virus', ['sewage_measurement', 'positive_tests', 'tests', 'reproduction_number', 'variants', 'mortality']], + ['development_of_the_virus', ['sewage_measurement', 'tests', 'reproduction_number', 'variants', 'mortality']], ['consequences_for_healthcare', ['hospitals_and_care', 'patients', 'nursing_home_care']], ['actions_to_take', ['vaccinations', 'compliance']], - ['archived_metrics', ['disabled_care', 'elderly_at_home', 'coronamelder_app', 'infectious_people', 'general_practitioner_suspicions']], + ['archived_metrics', ['positive_tests', 'disabled_care', 'elderly_at_home', 'coronamelder_app', 'infectious_people', 'general_practitioner_suspicions']], ], }); diff --git a/packages/app/src/domain/tested/g-number-bar-chart-tile.tsx b/packages/app/src/domain/tested/g-number-bar-chart-tile.tsx index 63203391b9..927aa07972 100644 --- a/packages/app/src/domain/tested/g-number-bar-chart-tile.tsx +++ b/packages/app/src/domain/tested/g-number-bar-chart-tile.tsx @@ -16,7 +16,6 @@ export function GNumberBarChartTile({ data: __data, timeframeInitialValue = Time const [gnumberTimeframe, setGnumberTimeframe] = useState(TimeframeOption.ALL); const { formatPercentage, commonTexts } = useIntl(); - const text = commonTexts.g_number.bar_chart; const firstOfSeptember2020Unix = new Date('1 September 2020').valueOf() / 1000; diff --git a/packages/app/src/pages/gemeente/[code]/positief-geteste-mensen.tsx b/packages/app/src/pages/gemeente/[code]/positief-geteste-mensen.tsx index cf7b5d5353..1b35e833aa 100644 --- a/packages/app/src/pages/gemeente/[code]/positief-geteste-mensen.tsx +++ b/packages/app/src/pages/gemeente/[code]/positief-geteste-mensen.tsx @@ -2,6 +2,7 @@ import { colors, TimeframeOption, TimeframeOptionsList } from '@corona-dashboard import { GgdTesten } from '@corona-dashboard/icons'; import { GetStaticPropsContext } from 'next'; import { useState } from 'react'; +import { WarningTile } from '~/components'; import { Box } from '~/components/base'; import { ChartTile } from '~/components/chart-tile'; import { DynamicChoropleth } from '~/components/choropleth'; @@ -105,7 +106,7 @@ function PositivelyTestedPeople(props: StaticProps) { ) { warning={textGm.warning} /> + {!!textShared.warning && } + ({ metadataTexts: siteText.pages.topical_page.nl.nationaal_metadata, @@ -52,7 +52,6 @@ export const getStaticProps = createGetStaticProps( 'difference.tested_overall__infected_moving_average', 'difference.tested_overall__infected_per_100k_moving_average', 'g_number', - 'self_test_overall', 'tested_ggd', 'tested_overall', 'tested_per_age_group' @@ -68,7 +67,7 @@ export const getStaticProps = createGetStaticProps( const { locale } = context; return `{ "parts": ${getPagePartsQuery('positive_tests_page')}, - "elements": ${getElementsQuery('nl', ['tested_overall', 'tested_ggd', 'tested_per_age_group', 'self_test_overall'], locale)} + "elements": ${getElementsQuery('nl', ['tested_overall', 'tested_ggd', 'tested_per_age_group'], locale)} }`; })(context); return { @@ -94,7 +93,6 @@ function PositivelyTestedPeople(props: StaticProps) { const { commonTexts, formatNumber, formatDateFromSeconds } = useIntl(); const reverseRouter = useReverseRouter(); - const [hasHideArchivedCharts, setHideArchivedCharts] = useState(false); const { metadataTexts, textNl, textShared } = useDynamicLokalizeTexts(pageText, selectLokalizeTexts); @@ -127,7 +125,7 @@ function PositivelyTestedPeople(props: StaticProps) { diff --git a/packages/cms/src/lokalize/key-mutations.csv b/packages/cms/src/lokalize/key-mutations.csv index a7c6419a8a..555c495829 100644 --- a/packages/cms/src/lokalize/key-mutations.csv +++ b/packages/cms/src/lokalize/key-mutations.csv @@ -1 +1,3 @@ timestamp,action,key,document_id,move_to +2023-04-24T11:17:35.869Z,delete,pages.positive_tests_page.shared.belangrijk_bericht,mt9hMqvnezW3fDtFvfvcu2,__ +2023-04-24T11:33:18.199Z,add,pages.positive_tests_page.shared.warning,AjemcWg1mce4pN4WDfY5e3,__ From a4a974127d30dca363d78eba85cfd6fe1e9bb1b0 Mon Sep 17 00:00:00 2001 From: AT <93994194+VWSCoronaDashboard21@users.noreply.github.com> Date: Mon, 24 Apr 2023 17:02:23 +0200 Subject: [PATCH 5/5] feature/COR-1521-vulnerable-groups-page-optimizations-2 (#4755) * feat(vulnerable-groups): removed kpi and information blocks and created InfectedLocationsTile * feat(vulnerable-groups): deleted unused sanity keys * feat(vulnerable-groups): deleted ElderlyPeople icon * feat(vulnerable-groups): archived data KPI * Revert "feat(vulnerable-groups): deleted ElderlyPeople icon" This reverts commit b659dcd2ff59847799f877a7d4029550c6a8759e. * feat(vulnerable-groups): refactored code based on pr review * WIP * feat(vulnerable-groups): replaced hospitalsTile and InfectedLocationsTile with BorderedKpiSection * feat(vulnerable-groups): replaced vaccineCoverageTile with borderedKpiSection * feat(vulnerable-groups): refactored related code * Changed the archiving of data keys back * moved BarType and AgeDataType * Renamed MappedKpiContent and KpiContent * resolved merge conflicts --------- Co-authored-by: VWSCoronaDashboard21 --- .../nl/vulnerable_tested_per_age_group.json | 26 ++-- .../components/kpi/bordered-kpi-section.tsx | 45 +++++++ .../components/kpi/components/kpi-content.tsx | 48 +++++++ packages/app/src/components/kpi/types.ts | 30 +++++ .../app/src/components/percentage-bar.tsx | 2 +- .../hospitals-tile/hospitals-tile.tsx | 72 ---------- packages/app/src/domain/hospital/index.ts | 2 - .../app/src/domain/vaccine/components/bar.tsx | 3 +- packages/app/src/domain/vaccine/index.ts | 1 - .../vaccine-coverage-tile.tsx | 124 ------------------ .../src/pages/gemeente/[code]/vaccinaties.tsx | 37 ++++-- .../kwetsbare-groepen-70-plussers.tsx | 101 ++++---------- .../pages/landelijk/patienten-in-beeld.tsx | 2 +- .../app/src/pages/landelijk/vaccinaties.tsx | 10 +- .../pages/landelijk/ziekenhuizen-en-zorg.tsx | 14 +- packages/cms/src/lokalize/key-mutations.csv | 12 ++ 16 files changed, 206 insertions(+), 323 deletions(-) create mode 100644 packages/app/src/components/kpi/bordered-kpi-section.tsx create mode 100644 packages/app/src/components/kpi/components/kpi-content.tsx create mode 100644 packages/app/src/components/kpi/types.ts delete mode 100644 packages/app/src/domain/hospital/hospitals-tile/hospitals-tile.tsx delete mode 100644 packages/app/src/domain/hospital/index.ts delete mode 100644 packages/app/src/domain/vaccine/vaccine-coverage-tile/vaccine-coverage-tile.tsx diff --git a/packages/app/schema/nl/vulnerable_tested_per_age_group.json b/packages/app/schema/nl/vulnerable_tested_per_age_group.json index ac49442559..612b548314 100644 --- a/packages/app/schema/nl/vulnerable_tested_per_age_group.json +++ b/packages/app/schema/nl/vulnerable_tested_per_age_group.json @@ -2,21 +2,17 @@ "$schema": "http://json-schema.org/draft-07/schema#", "title": "nl_vulnerable_tested_per_age_group", "type": "object", - "required":[ - "infected_age_70_plus", - "date_unix", - "date_of_insertion_unix" - ], + "required": ["infected_age_70_plus", "date_unix", "date_of_insertion_unix"], "additionalProperties": false, "properties": { - "infected_age_70_plus": { - "type": "integer" - }, - "date_unix": { - "type": "integer" - }, - "date_of_insertion_unix": { - "type": "integer" - } + "infected_age_70_plus": { + "type": "integer" + }, + "date_unix": { + "type": "integer" + }, + "date_of_insertion_unix": { + "type": "integer" + } } -} \ No newline at end of file +} diff --git a/packages/app/src/components/kpi/bordered-kpi-section.tsx b/packages/app/src/components/kpi/bordered-kpi-section.tsx new file mode 100644 index 0000000000..cf66c63b3d --- /dev/null +++ b/packages/app/src/components/kpi/bordered-kpi-section.tsx @@ -0,0 +1,45 @@ +import { colors } from '@corona-dashboard/common'; +import styled from 'styled-components'; +import { Box } from '~/components/base'; +import { mediaQueries, space } from '~/style/theme'; +import { KpiTile } from '../kpi-tile'; +import { Metadata, MetadataProps } from '../metadata'; +import { TwoKpiSection } from '../two-kpi-section'; +import { Text } from '../typography'; +import { KpiContent } from './components/kpi-content'; +import { BorderedKpiSectionProps } from './types'; + +export const BorderedKpiSection = ({ title, description, source, dateUnix, tilesData }: BorderedKpiSectionProps) => { + const metadata: MetadataProps = { + date: dateUnix, + source: source, + }; + + return ( + + {description} + + + {tilesData.map((tile, index) => ( + + ))} + + + + + ); +}; + +const KpiContentContainer = styled(Box)` + border: 1px solid ${colors.gray3}; + display: flex; + flex-direction: column; + gap: ${space[5]}; + justify-content: space-between; + padding: 24px ${space[3]}; + + @media ${mediaQueries.sm} { + flex-direction: row; + padding: 24px; + } +`; diff --git a/packages/app/src/components/kpi/components/kpi-content.tsx b/packages/app/src/components/kpi/components/kpi-content.tsx new file mode 100644 index 0000000000..4d4b3fb77e --- /dev/null +++ b/packages/app/src/components/kpi/components/kpi-content.tsx @@ -0,0 +1,48 @@ +import { Box } from '~/components/base'; +import { KpiValue } from '~/components/kpi-value'; +import { Markdown } from '~/components/markdown'; +import { BoldText } from '~/components/typography'; +import { Bar } from '~/domain/vaccine/components/bar'; +import { parseBirthyearRange } from '~/domain/vaccine/logic/parse-birthyear-range'; +import { useIntl } from '~/intl'; +import { space } from '~/style/theme'; +import { replaceVariablesInText } from '~/utils'; +import { KpiContentProps } from '../types'; + +export const KpiContent = ({ tile }: KpiContentProps) => { + const { commonTexts, formatPercentage } = useIntl(); + const parsedAgePercentage = tile.value ? `${formatPercentage(tile.value)}%` : '-'; + const parsedBirthyearRange = tile.birthyear ? parseBirthyearRange(tile.birthyear) : null; + + return ( + + {tile.title} + + + + + + {tile.bar && ( + + + + )} + + + + ); +}; diff --git a/packages/app/src/components/kpi/types.ts b/packages/app/src/components/kpi/types.ts new file mode 100644 index 0000000000..669e8fa551 --- /dev/null +++ b/packages/app/src/components/kpi/types.ts @@ -0,0 +1,30 @@ +import { DifferenceInteger } from '@corona-dashboard/common'; + +type TileData = { + description: string; + title: string; + value: number | null; + bar?: BarType; + birthyear?: string | null; + differenceValue?: DifferenceInteger; +}; + +export interface BorderedKpiSectionProps { + dateUnix: number; + description: string; + source: { + href: string; + text: string; + }; + tilesData: [TileData, TileData]; + title: string; +} + +export interface KpiContentProps { + tile: TileData; +} + +export type BarType = { + value: number; + color: string; +}; diff --git a/packages/app/src/components/percentage-bar.tsx b/packages/app/src/components/percentage-bar.tsx index 25ed7e35f8..83201f3927 100644 --- a/packages/app/src/components/percentage-bar.tsx +++ b/packages/app/src/components/percentage-bar.tsx @@ -15,7 +15,7 @@ export const PercentageBar = ({ percentage, height, color, backgroundColor = col return ( - + ); diff --git a/packages/app/src/domain/hospital/hospitals-tile/hospitals-tile.tsx b/packages/app/src/domain/hospital/hospitals-tile/hospitals-tile.tsx deleted file mode 100644 index 2aa0b535a3..0000000000 --- a/packages/app/src/domain/hospital/hospitals-tile/hospitals-tile.tsx +++ /dev/null @@ -1,72 +0,0 @@ -import { Box } from '~/components/base'; -import { KpiTile } from '~/components/kpi-tile'; -import { Metadata, MetadataProps } from '~/components/metadata'; -import { TwoKpiSection } from '~/components/two-kpi-section'; -import { BoldText, Text } from '~/components/typography'; -import styled from 'styled-components'; -import { colors, DifferenceInteger } from '@corona-dashboard/common'; -import theme, { space } from '~/style/theme'; -import { KpiValue } from '~/components/kpi-value'; -import { Markdown } from '~/components/markdown'; - -interface HospitalsTileProps { - title: string; - description: string; - source: { - text: string; - href: string; - }; - dateUnix: number; - tilesData: [TileData, TileData]; -} - -export type TileData = { - title: string; - description: string; - absoluteValue: number | null; - differenceValue?: DifferenceInteger; -}; - -export const HospitalsTile = ({ title, description, source, dateUnix, tilesData }: HospitalsTileProps) => { - const metadata: MetadataProps = { - date: dateUnix, - source: source, - }; - - return ( - - - {description} - - - {tilesData.map((tile, index) => ( - - {tile.title} - - - - - - ))} - - - - - - ); -}; - -export const KpiContent = styled(Box)` - border: 1px solid ${colors.gray3}; - color: ${colors.black}; - display: flex; - flex-direction: column; - gap: ${space[5]}; - justify-content: space-between; - padding: 24px ${space[3]}; - - @media ${theme.mediaQueries.sm} { - flex-direction: row; - padding: 24px; - } -`; diff --git a/packages/app/src/domain/hospital/index.ts b/packages/app/src/domain/hospital/index.ts deleted file mode 100644 index 0df6423563..0000000000 --- a/packages/app/src/domain/hospital/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { AdmissionsPerAgeGroup } from './admissions-per-age-group/admissions-per-age-group'; -export { HospitalsTile } from './hospitals-tile/hospitals-tile'; diff --git a/packages/app/src/domain/vaccine/components/bar.tsx b/packages/app/src/domain/vaccine/components/bar.tsx index ba3d940d2c..714d7b0f44 100644 --- a/packages/app/src/domain/vaccine/components/bar.tsx +++ b/packages/app/src/domain/vaccine/components/bar.tsx @@ -18,10 +18,8 @@ interface BarProps { export function Bar({ value, color, backgroundColor = colors.gray2, label, height = 8, showAxisValues }: BarProps) { const parsedVaccinatedLabel = isPresent(label) ? parseVaccinatedPercentageLabel(label) : undefined; - const barValue = isPresent(parsedVaccinatedLabel) ? parsedVaccinatedLabel.value : value ?? 0; const barValueSign = isPresent(parsedVaccinatedLabel) ? parsedVaccinatedLabel.sign : ''; - const { formatPercentage } = useIntl(); return ( @@ -37,6 +35,7 @@ export function Bar({ value, color, backgroundColor = colors.gray2, label, heigh ) : ( )} + {showAxisValues && ( diff --git a/packages/app/src/domain/vaccine/index.ts b/packages/app/src/domain/vaccine/index.ts index dda47aab72..308025c30a 100644 --- a/packages/app/src/domain/vaccine/index.ts +++ b/packages/app/src/domain/vaccine/index.ts @@ -8,7 +8,6 @@ export { VaccinationsShotKpiSection } from './vaccinations-shot-kpi-section'; export { VaccinationsKpiHeader } from './vaccinations-kpi-header'; export { VaccineCoverageChoropleth } from './vaccine-coverage-choropleth'; export { VaccineCoveragePerAgeGroup } from './vaccine-coverage-per-age-group'; -export { VaccineCoverageTile } from './vaccine-coverage-tile/vaccine-coverage-tile'; export { VaccineCoverageToggleTile } from './vaccine-coverage-toggle-tile'; export { VaccineDeliveryBarChart } from './vaccine-delivery-bar-chart'; export { VaccineStockPerSupplierChart } from './vaccine-stock-per-supplier-chart'; diff --git a/packages/app/src/domain/vaccine/vaccine-coverage-tile/vaccine-coverage-tile.tsx b/packages/app/src/domain/vaccine/vaccine-coverage-tile/vaccine-coverage-tile.tsx deleted file mode 100644 index 656a310c5e..0000000000 --- a/packages/app/src/domain/vaccine/vaccine-coverage-tile/vaccine-coverage-tile.tsx +++ /dev/null @@ -1,124 +0,0 @@ -import { Box } from '~/components/base'; -import { KpiTile } from '~/components/kpi-tile'; -import { KpiValue } from '~/components/kpi-value'; -import { Markdown } from '~/components/markdown'; -import { Metadata, MetadataProps } from '~/components/metadata'; -import { TwoKpiSection } from '~/components/two-kpi-section'; -import { BoldText, Text } from '~/components/typography'; -import { parseBirthyearRange } from '~/domain/vaccine/logic/parse-birthyear-range'; -import { useIntl } from '~/intl'; -import { assert } from '~/utils/assert'; -import { replaceVariablesInText } from '~/utils/replace-variables-in-text'; -import { Bar } from '../components/bar'; -import styled from 'styled-components'; -import { colors } from '@corona-dashboard/common'; -import { mediaQueries, space } from '~/style/theme'; - -type BarType = { - value: number; - color: string; -}; - -export type AgeDataType = { - value: number | null; - birthyear: string | null; - title: string; - description: string; - bar: BarType; -}; - -interface VaccineCoverageTileProps { - title: string; - description: string; - source: { - text: string; - href: string; - }; - coverageData: [AgeDataType, AgeDataType]; - dateUnix: number; -} - -export const VaccineCoverageTile = ({ title, description, source, dateUnix, coverageData }: VaccineCoverageTileProps) => { - const metadata: MetadataProps = { - date: dateUnix, - source: source, - }; - - return ( - - {description} - - - {coverageData.map((tile, index) => { - return ( - - - - ); - })} - - - - - ); -}; - -interface AgeGroupBlockProps { - data: AgeDataType; - bar: BarType; - children?: React.ReactNode; -} - -const AgeGroupBlock = ({ data, bar, children }: AgeGroupBlockProps) => { - const { commonTexts, formatPercentage } = useIntl(); - - const parsedAgePercentage = data.value ? `${formatPercentage(data.value)}%` : '-'; - - const parsedBirthyearRange = data.birthyear ? parseBirthyearRange(data.birthyear) : null; - - assert(parsedBirthyearRange, `[${AgeGroupBlock.name}] Something went wrong with parsing the birthyear: ${data.birthyear}`); - - return ( - - {data.title} - - - - - - - - {children} - - ); -}; - -const AgeGroupWrapper = styled.div` - display: flex; - justify-content: start; - overflow-wrap: break-word; - word-wrap: break-word; - hyphens: auto; - padding: 24px 16px; - - @media ${mediaQueries.xs} { - padding-inline: 24px; - } -`; - -const KpiContent = styled.div` - border: 1px solid ${colors.gray3}; - position: relative; - display: flex; - justify-content: space-between; - flex-direction: column; - color: ${colors.black}; - - @media ${mediaQueries.sm} { - flex-direction: row; - } -`; diff --git a/packages/app/src/pages/gemeente/[code]/vaccinaties.tsx b/packages/app/src/pages/gemeente/[code]/vaccinaties.tsx index 709782292c..2583cfe52b 100644 --- a/packages/app/src/pages/gemeente/[code]/vaccinaties.tsx +++ b/packages/app/src/pages/gemeente/[code]/vaccinaties.tsx @@ -3,22 +3,23 @@ import { Vaccinaties as VaccinatieIcon } from '@corona-dashboard/icons'; import { GetStaticPropsContext } from 'next'; import { useState } from 'react'; import { isDefined, isPresent } from 'ts-is-present'; -import { PageInformationBlock, TileList, Divider } from '~/components'; +import { Divider, PageInformationBlock, TileList } from '~/components'; +import { BorderedKpiSection } from '~/components/kpi/bordered-kpi-section'; +import { BarType } from '~/components/kpi/types'; import { gmCodesByVrCode, vrCodeByGmCode } from '~/data'; -import { Layout, GmLayout } from '~/domain/layout'; -import { Languages, SiteText } from '~/locale'; -import { VaccineCoverageToggleTile, VaccineCoveragePerAgeGroup, VaccineCoverageTile } from '~/domain/vaccine'; -import { AgeDataType } from '~/domain/vaccine/vaccine-coverage-tile/vaccine-coverage-tile'; +import { emptyCoverageData } from '~/data/gm/vaccinations/empty-coverage-data'; +import { GmLayout, Layout } from '~/domain/layout'; +import { VaccineCoveragePerAgeGroup, VaccineCoverageToggleTile } from '~/domain/vaccine'; +import { VaccineCoverageChoropleth } from '~/domain/vaccine/vaccine-coverage-choropleth'; import { useIntl } from '~/intl'; +import { Languages, SiteText } from '~/locale'; import { getArticleParts, getLinkParts, getPagePartsQuery } from '~/queries/get-page-parts-query'; import { createGetStaticProps, StaticProps } from '~/static-props/create-get-static-props'; -import { createGetChoroplethData, createGetContent, getLastGeneratedDate, selectGmData, getLokalizeTexts } from '~/static-props/get-data'; +import { createGetChoroplethData, createGetContent, getLastGeneratedDate, getLokalizeTexts, selectGmData } from '~/static-props/get-data'; import { ArticleParts, LinkParts, PagePartQueryResult } from '~/types/cms'; -import { assert, replaceVariablesInText, useReverseRouter, useFormatLokalizePercentage } from '~/utils'; -import { getLastInsertionDateOfPage } from '~/utils/get-last-insertion-date-of-page'; +import { assert, replaceVariablesInText, useFormatLokalizePercentage, useReverseRouter } from '~/utils'; import { useDynamicLokalizeTexts } from '~/utils/cms/use-dynamic-lokalize-texts'; -import { VaccineCoverageChoropleth } from '~/domain/vaccine/vaccine-coverage-choropleth'; -import { emptyCoverageData } from '~/data/gm/vaccinations/empty-coverage-data'; +import { getLastInsertionDateOfPage } from '~/utils/get-last-insertion-date-of-page'; const pageMetrics = ['vaccine_coverage_per_age_group', 'vaccine_coverage_per_age_group_archived', 'booster_coverage_archived_20220904']; @@ -30,6 +31,14 @@ const selectLokalizeTexts = (siteText: SiteText) => ({ type LokalizeTexts = ReturnType; +type AgeDataType = { + value: number | null; + birthyear: string | null; + title: string; + description: string; + bar: BarType; +}; + type ParsedCoverageData = { autumn2022: [AgeDataType, AgeDataType]; primarySeries: [AgeDataType, AgeDataType]; @@ -187,19 +196,19 @@ export const VaccinationsGmPage = (props: StaticProps) => warning={textGm.warning} /> {filteredVaccination.autumn2022.birthyear_range_60_plus && ( - )} - ({ @@ -57,12 +55,10 @@ export const getStaticProps = createGetStaticProps( 'difference.nursing_home__deceased_daily_archived_20230126', 'difference.vulnerable_nursing_home__infected_locations_total', 'difference.nursing_home__newly_infected_people_archived_20230126', - 'difference.vulnerable_tested_per_age_group', 'difference.vulnerable_hospital_admissions', 'vulnerable_nursing_home', 'nursing_home_archived_20230126', - 'vulnerable_hospital_admissions', - 'vulnerable_tested_per_age_group' + 'vulnerable_hospital_admissions' ), createGetChoroplethData({ vr: ({ nursing_home_archived_20230126 }) => ({ nursing_home_archived_20230126 }), @@ -109,7 +105,6 @@ function VulnerableGroups(props: StaticProps) { const vulnerableNursingHomeDataLastValue = data.vulnerable_nursing_home.last_value; const vulnerableHospitalAdmissionsData = data.vulnerable_hospital_admissions; - const vulnerableTestedPerAgeGroupData = data.vulnerable_tested_per_age_group; const ElderlyPeopleText = textShared['70_plussers']; @@ -145,91 +140,39 @@ function VulnerableGroups(props: StaticProps) { {hasActiveWarningTile && } - - - } - description={ElderlyPeopleText.pagina_toelichting} - metadata={{ - datumsText: ElderlyPeopleText.datums, - dateOrRange: vulnerableTestedPerAgeGroupData.date_unix, - dateOfInsertionUnix: vulnerableHospitalAdmissionsData.date_of_insertion_unix, - dataSources: [ElderlyPeopleText.bronnen.rivm], - }} - referenceLink={ElderlyPeopleText.reference.href} - /> - - - - {ElderlyPeopleText.positive_tested.kpi_toelichting} - - - {ElderlyPeopleText.hospital_admissions.kpi_toelichting} - - - } - description={infectedLocationsText.pagina_toelichting} - metadata={{ - datumsText: infectedLocationsText.datums, - dateOrRange: nursinghomeDataLastValue.date_unix, - dateOfInsertionUnix: nursinghomeDataLastValue.date_of_insertion_unix, - dataSources: [infectedLocationsText.bronnen.rivm], - }} - referenceLink={infectedLocationsText.reference.href} + - - - - {infectedLocationsText.kpi_toelichting} - - - - - {infectedLocationsText.barscale_toelichting} - - - ) { referenceLink={textNl.information_block.reference.href} articles={content.articles} /> - ) { ]} dateUnix={vaccineCoverageEstimatedAutumn2022.date_unix} /> - ) => { articles={content.articles} /> - ) => { )} -