From f241525b9e53cff44024ddacfcc0b86dfdbdb2b7 Mon Sep 17 00:00:00 2001 From: Anna Wendler <106674756+annawendler@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:36:58 +0200 Subject: [PATCH 1/5] initial data with four compartments --- backend/src/api/fixtures/initial_data.py | 37 +++++------------------- 1 file changed, 8 insertions(+), 29 deletions(-) diff --git a/backend/src/api/fixtures/initial_data.py b/backend/src/api/fixtures/initial_data.py index d1ebacf5..f5f0113c 100644 --- a/backend/src/api/fixtures/initial_data.py +++ b/backend/src/api/fixtures/initial_data.py @@ -411,7 +411,7 @@ ("restriction_4", "Restriction 4") ] -PARAMETERS = [ +PARAMETERS = [ "IncubationTime", "SerialInterval", "InfectiousTimeMild", @@ -440,30 +440,9 @@ ] COMPARTMENTS = [ - "Susceptible", - "SusceptibleV1", - "Exposed", - "ExposedV1", - "ExposedV2", - "Carrier", - "CarrierV1", - "CarrierV2", - "CarrierT", - "CarrierTV1", - "CarrierTV2", + "MildInfections", "Infected", - "InfectedV1", - "InfectedV2", - "InfectedT", - "InfectedTV1", - "InfectedTV2", "Hospitalized", - "HospitalizedV1", - "HospitalizedV2", - "ICU", - "ICUV1", - "ICUV2", - "Recovered", "Dead" ] @@ -473,12 +452,12 @@ ] GROUPS = [ - ("age_0", "age", "Ages bewteen 0-4 years" ), - ("age_1", "age", "Ages between 5-14 years" ), - ("age_2", "age", "Ages between 15-34 years" ), - ("age_3", "age", "Ages between 35-59 years" ), - ("age_4", "age", "Ages between 60-79 years" ), - ("age_5", "age", "Ages above 80" ), + ("age_0", "age", "Ages bewteen 0-4 years"), + ("age_1", "age", "Ages between 5-14 years"), + ("age_2", "age", "Ages between 15-34 years"), + ("age_3", "age", "Ages between 35-59 years"), + ("age_4", "age", "Ages between 60-79 years"), + ("age_5", "age", "Ages above 80"), ("total", "age", "All ages"), ("female", "gender", "Female"), ("male", "gender", "Male") From 67f253c37ec1bc84f1e9ebe575930c6289a161e6 Mon Sep 17 00:00:00 2001 From: Anna Wendler <106674756+annawendler@users.noreply.github.com> Date: Wed, 4 Oct 2023 17:47:20 +0200 Subject: [PATCH 2/5] add .env files --- backend/.env | 29 +++++++++++++++++++++++++++++ frontend/.env | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 backend/.env create mode 100644 frontend/.env diff --git a/backend/.env b/backend/.env new file mode 100644 index 00000000..d040e7f7 --- /dev/null +++ b/backend/.env @@ -0,0 +1,29 @@ +#################################### +# Django setup # +#################################### +SITE_URL=http://localhost:8000 +DJANGO_SETTINGS_MODULE=src.config.local +DJANGO_DEBUG=True +# TEMPORARY SECRET - DO NOT USE THIS +DJANGO_SECRET_KEY='#p7&kxb7y^yq8ahfw5%$xh=f8=&1y*5+a5($8w_f7kw!-qig(j' + + +#################################### +# Database setup # +#################################### +DB_NAME=esid_api +DB_USER=esid +DB_PASSWORD=password +DB_HOST=db +DB_PORT=5432 + + +#################################### +# pgAdmin setup # +# # +# This part can be removed if you # +# do not use the provided # +# docker-compose setup # +#################################### +PGADMIN_EMAIL=admin@admin.com +PGADMIN_PASSWORD=root diff --git a/frontend/.env b/frontend/.env new file mode 100644 index 00000000..f4f1594c --- /dev/null +++ b/frontend/.env @@ -0,0 +1,2 @@ +# This is for development only. For production you need to replace this with the actual URL. +API_URL=http://localhost:8000 \ No newline at end of file From d32d04ba3dc47b9c61e2f7831671c6a5c4305f43 Mon Sep 17 00:00:00 2001 From: Anna Wendler <106674756+annawendler@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:02:25 +0200 Subject: [PATCH 3/5] remove .env files --- backend/.env | 29 ----------------------------- frontend/.env | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 backend/.env delete mode 100644 frontend/.env diff --git a/backend/.env b/backend/.env deleted file mode 100644 index d040e7f7..00000000 --- a/backend/.env +++ /dev/null @@ -1,29 +0,0 @@ -#################################### -# Django setup # -#################################### -SITE_URL=http://localhost:8000 -DJANGO_SETTINGS_MODULE=src.config.local -DJANGO_DEBUG=True -# TEMPORARY SECRET - DO NOT USE THIS -DJANGO_SECRET_KEY='#p7&kxb7y^yq8ahfw5%$xh=f8=&1y*5+a5($8w_f7kw!-qig(j' - - -#################################### -# Database setup # -#################################### -DB_NAME=esid_api -DB_USER=esid -DB_PASSWORD=password -DB_HOST=db -DB_PORT=5432 - - -#################################### -# pgAdmin setup # -# # -# This part can be removed if you # -# do not use the provided # -# docker-compose setup # -#################################### -PGADMIN_EMAIL=admin@admin.com -PGADMIN_PASSWORD=root diff --git a/frontend/.env b/frontend/.env deleted file mode 100644 index f4f1594c..00000000 --- a/frontend/.env +++ /dev/null @@ -1,2 +0,0 @@ -# This is for development only. For production you need to replace this with the actual URL. -API_URL=http://localhost:8000 \ No newline at end of file From 72bd817e4efad30f5c4822e5f0c18f563f69352a Mon Sep 17 00:00:00 2001 From: Anna Wendler <106674756+annawendler@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:21:45 +0200 Subject: [PATCH 4/5] Formatting --- backend/src/api/fixtures/initial_data.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/src/api/fixtures/initial_data.py b/backend/src/api/fixtures/initial_data.py index f5f0113c..75eeeefc 100644 --- a/backend/src/api/fixtures/initial_data.py +++ b/backend/src/api/fixtures/initial_data.py @@ -411,7 +411,7 @@ ("restriction_4", "Restriction 4") ] -PARAMETERS = [ +PARAMETERS = [ "IncubationTime", "SerialInterval", "InfectiousTimeMild", @@ -452,12 +452,12 @@ ] GROUPS = [ - ("age_0", "age", "Ages bewteen 0-4 years"), - ("age_1", "age", "Ages between 5-14 years"), - ("age_2", "age", "Ages between 15-34 years"), - ("age_3", "age", "Ages between 35-59 years"), - ("age_4", "age", "Ages between 60-79 years"), - ("age_5", "age", "Ages above 80"), + ("age_0", "age", "Ages bewteen 0-4 years" ), + ("age_1", "age", "Ages between 5-14 years" ), + ("age_2", "age", "Ages between 15-34 years" ), + ("age_3", "age", "Ages between 35-59 years" ), + ("age_4", "age", "Ages between 60-79 years" ), + ("age_5", "age", "Ages above 80" ), ("total", "age", "All ages"), ("female", "gender", "Female"), ("male", "gender", "Male") From 379fe4770246c0939b15952f6ed24a7955e206bf Mon Sep 17 00:00:00 2001 From: Anna Wendler <106674756+annawendler@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:36:16 +0200 Subject: [PATCH 5/5] Add changes to changelog --- frontend/docs/changelog/changelog-de.md | 1 + frontend/docs/changelog/changelog-en.md | 1 + 2 files changed, 2 insertions(+) diff --git a/frontend/docs/changelog/changelog-de.md b/frontend/docs/changelog/changelog-de.md index 2b25e33a..614b2318 100644 --- a/frontend/docs/changelog/changelog-de.md +++ b/frontend/docs/changelog/changelog-de.md @@ -29,6 +29,7 @@ - Es ist jetzt möglich einen beliebigen Tag mit Daten auszuwählen. - "Falldaten" wurde in "Geschätzte Fälle" umbenannt und neue Übersetzungen für neue Infektionszustände wurden hinzugefügt. - Die Textgröße in Tooltips wurden zur besseren Lesbarkeit angepasst. +- Es werden nur noch vier aggregierte Kompartimente angezeigt. ### Fehlerbehebungen diff --git a/frontend/docs/changelog/changelog-en.md b/frontend/docs/changelog/changelog-en.md index edbe6bd6..30e32fa4 100644 --- a/frontend/docs/changelog/changelog-en.md +++ b/frontend/docs/changelog/changelog-en.md @@ -29,6 +29,7 @@ - It is now possible to set the date to any day containing data. - "Case Data" was renamed to "Estimated Cases" and new translations for new infection states were added. - The text size in tooltips was adjusted to improve readability. +- Only four aggregated compartments are displayed. ### Bug fixes