Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
feat/ COR-1468 archived page and archived metrics (#4816)
Browse files Browse the repository at this point in the history
* feat: archived page and archived metrics

* fix: removed Page Information Block and divider

* fix: protos metrics  validation

* fix: removing unnecessary title archived suffix

* fix: removed unnecessary title suffix

---------

Co-authored-by: VWSCoronaDashboard27 <[email protected]>
  • Loading branch information
DariaKwork and VWSCoronaDashboard27 authored Jul 18, 2023
1 parent 9c0f561 commit 5e9902c
Show file tree
Hide file tree
Showing 13 changed files with 249 additions and 234 deletions.
20 changes: 19 additions & 1 deletion packages/app/schema/archived_nl/__difference.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,29 @@
"title": "archived_nl_difference",
"type": "object",
"properties": {
"nursing_home__deceased_daily_archived_20230126": {
"$ref": "#/definitions/diff_integer"
},
"vulnerable_nursing_home__infected_locations_total_archived_20230711": {
"$ref": "#/definitions/diff_integer"
},
"nursing_home__newly_infected_people_archived_20230126": {
"$ref": "#/definitions/diff_integer"
},
"vulnerable_hospital_admissions_archived_20230711": {
"$ref": "#/definitions/diff_integer"
},
"reproduction__index_average_archived_20230711": {
"$ref": "#/definitions/diff_decimal"
}
},
"required": ["reproduction__index_average_archived_20230711"],
"required": [
"nursing_home__deceased_daily_archived_20230126",
"vulnerable_nursing_home__infected_locations_total_archived_20230711",
"nursing_home__newly_infected_people_archived_20230126",
"vulnerable_hospital_admissions_archived_20230711",
"reproduction__index_average_archived_20230711"
],
"additionalProperties": false,
"definitions": {
"diff_integer": {
Expand Down
12 changes: 12 additions & 0 deletions packages/app/schema/archived_nl/__index.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"behavior_annotations_archived_20230412",
"behavior_per_age_group_archived_20230411",
"doctor_archived_20210903",
"nursing_home_archived_20230126",
"sewer_archived_20230623",
"vulnerable_hospital_admissions_archived_20230711",
"vulnerable_nursing_home_archived_20230711",
"reproduction_archived_20230711"
],
"additionalProperties": false,
Expand Down Expand Up @@ -44,9 +47,18 @@
"doctor_archived_20210903": {
"$ref": "doctor.json"
},
"nursing_home_archived_20230126": {
"$ref": "nursing_home.json"
},
"sewer_archived_20230623": {
"$ref": "sewer.json"
},
"vulnerable_nursing_home_archived_20230711": {
"$ref": "vulnerable_nursing_home.json"
},
"vulnerable_hospital_admissions_archived_20230711": {
"$ref": "vulnerable_hospital_admissions.json"
},
"reproduction_archived_20230711": {
"$ref": "reproduction.json"
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "nl_nursing_home_archived_20230126",
"title": "nl_nursing_home",
"type": "object",
"properties": {
"values": {
Expand Down
16 changes: 3 additions & 13 deletions packages/app/schema/nl/__difference.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,12 @@
"sewer__average": {
"$ref": "#/definitions/diff_integer"
},
"vulnerable_nursing_home__infected_locations_total": {
"$ref": "#/definitions/diff_integer"
},
"nursing_home__newly_infected_people_archived_20230126": {
"$ref": "#/definitions/diff_integer"
},
"nursing_home__deceased_daily_archived_20230126": {
"$ref": "#/definitions/diff_integer"
},
"vulnerable_tested_per_age_group": {
"$ref": "#/definitions/diff_integer"
},
"reproduction__index_average": {
"$ref": "#/definitions/diff_decimal"
},
"vulnerable_hospital_admissions": {
"$ref": "#/definitions/diff_integer"
},
Expand All @@ -63,11 +57,7 @@
"intensive_care_nice__admissions_on_date_of_reporting_moving_average",
"intensive_care_lcps__beds_occupied_covid",
"sewer__average",
"nursing_home__newly_infected_people_archived_20230126",
"nursing_home__deceased_daily_archived_20230126",
"vulnerable_nursing_home__infected_locations_total",
"vulnerable_tested_per_age_group",
"vulnerable_hospital_admissions",
"deceased_rivm__covid_daily_archived_20221231"
],
"additionalProperties": false,
Expand Down
12 changes: 0 additions & 12 deletions packages/app/schema/nl/__index.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@
"intensive_care_nice_per_age_group",
"last_generated",
"name",
"vulnerable_nursing_home",
"nursing_home_archived_20230126",
"vulnerable_tested_per_age_group",
"vulnerable_hospital_admissions",
"proto_name",
"self_test_overall",
"sewer",
Expand Down Expand Up @@ -127,18 +124,9 @@
"tested_ggd_archived": {
"$ref": "tested_ggd_archived.json"
},
"nursing_home_archived_20230126": {
"$ref": "nursing_home_archived_20230126.json"
},
"vulnerable_nursing_home": {
"$ref": "vulnerable_nursing_home.json"
},
"vulnerable_tested_per_age_group": {
"$ref": "vulnerable_tested_per_age_group.json"
},
"vulnerable_hospital_admissions": {
"$ref": "vulnerable_hospital_admissions.json"
},
"disability_care_archived_20230126": {
"$ref": "disability_care_archived_20230126.json"
},
Expand Down
14 changes: 12 additions & 2 deletions packages/app/src/domain/layout/nl-layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,21 @@ export function NlLayout(props: NlLayoutProps) {
layout: 'nl',
map: [
['development_of_the_virus', ['sewage_measurement', 'tests', 'variants', 'mortality']],
['consequences_for_healthcare', ['hospitals_and_care', 'patients', 'nursing_home_care']],
['consequences_for_healthcare', ['hospitals_and_care', 'patients']],
['actions_to_take', ['vaccinations']],
[
'archived_metrics',
['reproduction_number', 'compliance', 'positive_tests', 'disabled_care', 'elderly_at_home', 'coronamelder_app', 'infectious_people', 'general_practitioner_suspicions'],
[
'nursing_home_care',
'reproduction_number',
'compliance',
'positive_tests',
'disabled_care',
'elderly_at_home',
'coronamelder_app',
'infectious_people',
'general_practitioner_suspicions',
],
],
],
});
Expand Down
Loading

0 comments on commit 5e9902c

Please sign in to comment.