From 971c36a25e358c513be9f434a49308d9e498906a Mon Sep 17 00:00:00 2001
From: Marek Susicky <marek.susicky@sec4good.cz>
Date: Wed, 11 Oct 2023 00:14:28 +0200
Subject: [PATCH 1/6] Updating libraries and fixing errors - Part 1

---
 app/fetcher/fetcher.py              |  5 ++++-
 app/fetcher/fetcher_launcher.py     | 17 +++++++++--------
 app/fetcher/reservations_fetcher.py |  2 +-
 migrations/env.py                   |  2 ++
 requirements.txt                    |  2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/fetcher/fetcher.py b/app/fetcher/fetcher.py
index ec2e841b..8ce7e7a2 100644
--- a/app/fetcher/fetcher.py
+++ b/app/fetcher/fetcher.py
@@ -3,6 +3,7 @@
 from email import utils as eut
 from io import StringIO
 from typing import Optional
+from sqlalchemy import text
 
 import requests
 
@@ -30,7 +31,9 @@ def fetch(self, import_id: int) -> None:
         pass
 
     def _truncate(self) -> None:
-        db.engine.execute('truncate table {}'.format(self._table))
+        with db.engine.connect() as conn:
+            result = conn.execute(text('TRUNCATE table {}'.format(self._table)))
+            conn.commit()
 
     def _log_download_finished(self):
         app.logger.info(f"Fetcher '{type(self).__name__}' source file downloaded.")
diff --git a/app/fetcher/fetcher_launcher.py b/app/fetcher/fetcher_launcher.py
index 8d0db2fb..ba061005 100644
--- a/app/fetcher/fetcher_launcher.py
+++ b/app/fetcher/fetcher_launcher.py
@@ -85,15 +85,15 @@ def _init_fetchers(self, dataset: str) -> None:
         # inits requested fetchers
         if dataset == 'all':
             # self._fetchers.append(CentersFetcher())  # replaced by CentersApiFetcher
-            self._fetchers.append(CentersApiFetcher())
-            self._fetchers.append(OpeningHoursFetcher())
-            self._fetchers.append(HealthFacilitiesFetcher())
+            # self._fetchers.append(CentersApiFetcher())
+            # self._fetchers.append(OpeningHoursFetcher())
+            # self._fetchers.append(HealthFacilitiesFetcher())
             # self._fetchers.append(DistributedFetcher())       # not updated since 2022-11-29
             # self._fetchers.append(UsedFetcher())              # not updated since 2022-02-16
-            self._fetchers.append(RegistrationsFetcher())
-            self._fetchers.append(ReservationsFetcher())
+        ##    self._fetchers.append(RegistrationsFetcher())
+        ##    self._fetchers.append(ReservationsFetcher())
             # self._fetchers.append(ReservationsApiFetcher())   # API not available anymore
-            self._fetchers.append(VaccinatedFetcher())
+        ##    self._fetchers.append(VaccinatedFetcher())
             self._fetchers.append(InfectedFetcher())
             self._fetchers.append(DeathsFetcher())
             self._fetchers.append(MunicipalCharacteristicsFetcher())
@@ -264,5 +264,6 @@ def _set_import_finished(self) -> None:
 
 
 if __name__ == '__main__':
-    fetcher = FetcherLauncher()
-    fetcher.fetch(sys.argv[1])
+    with app.app_context():
+        fetcher = FetcherLauncher()
+        fetcher.fetch(sys.argv[1])
diff --git a/app/fetcher/reservations_fetcher.py b/app/fetcher/reservations_fetcher.py
index 84162ed2..43edc7a0 100644
--- a/app/fetcher/reservations_fetcher.py
+++ b/app/fetcher/reservations_fetcher.py
@@ -18,7 +18,7 @@ def __init__(self):
     def fetch(self, import_id: int) -> None:
         df = pd.read_csv(self._url)
 
-        df = df.drop(['ockovaci_misto_nazev', 'kraj_nuts_kod', 'kraj_nazev'], axis=1)
+        df = df.drop(['ockovaci_misto_nazev', 'kraj_nuts_kod', 'kraj_nazev', 'id'], axis=1)
 
         df = df.groupby(['datum', 'ockovaci_misto_id', 'kalendar_ockovani'], dropna=False).sum().reset_index()
 
diff --git a/migrations/env.py b/migrations/env.py
index 5729258e..ba726c8c 100644
--- a/migrations/env.py
+++ b/migrations/env.py
@@ -32,6 +32,7 @@
 
 exclude_tables = config.get_section('alembic:exclude').get('tables', '').split(',')
 
+
 def include_object(object, name, type_, *args, **kwargs):
     if type_ == 'table' and name in exclude_tables:
         return False
@@ -41,6 +42,7 @@ def include_object(object, name, type_, *args, **kwargs):
         else:
             return True
 
+
 def run_migrations_offline():
     """Run migrations in 'offline' mode.
 
diff --git a/requirements.txt b/requirements.txt
index 907f7185..376d06af 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,4 +18,4 @@ setuptools>=54.1.0
 alembic>=1.5.0
 urllib3>=1.26.0
 openpyxl>=3.0.0
-pandas==1.3.5
+pandas>=2.1.0

From 3714bb335256fe02a28023c2177e132f4ef46f4f Mon Sep 17 00:00:00 2001
From: Marek Susicky <marek.susicky@sec4good.cz>
Date: Thu, 12 Oct 2023 22:21:14 +0200
Subject: [PATCH 2/6] Fix - Fetchers running

---
 app/fetcher/deaths_fetcher.py   |  3 ++-
 app/fetcher/fetcher_launcher.py |  6 +++---
 app/fetcher/tests_fetcher.py    | 18 +++++++++++++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/fetcher/deaths_fetcher.py b/app/fetcher/deaths_fetcher.py
index a7bd4ebe..40a968e4 100644
--- a/app/fetcher/deaths_fetcher.py
+++ b/app/fetcher/deaths_fetcher.py
@@ -21,7 +21,8 @@ def fetch(self, import_id: int) -> None:
         df = df[['datum', 'vek', 'kraj_nuts_kod']]
 
         df['kraj_nuts_kod'] = df['kraj_nuts_kod'].fillna('-')
-
+        df = df.dropna(subset=['vek'])
+        df['vek'] = df['vek'].astype('int')
         df = df.groupby(df.columns.tolist(), dropna=False).size().reset_index(name='pocet')
 
         self._truncate()
diff --git a/app/fetcher/fetcher_launcher.py b/app/fetcher/fetcher_launcher.py
index ba061005..3e74fe30 100644
--- a/app/fetcher/fetcher_launcher.py
+++ b/app/fetcher/fetcher_launcher.py
@@ -90,10 +90,10 @@ def _init_fetchers(self, dataset: str) -> None:
             # self._fetchers.append(HealthFacilitiesFetcher())
             # self._fetchers.append(DistributedFetcher())       # not updated since 2022-11-29
             # self._fetchers.append(UsedFetcher())              # not updated since 2022-02-16
-        ##    self._fetchers.append(RegistrationsFetcher())
-        ##    self._fetchers.append(ReservationsFetcher())
+            self._fetchers.append(RegistrationsFetcher())
+            self._fetchers.append(ReservationsFetcher())
             # self._fetchers.append(ReservationsApiFetcher())   # API not available anymore
-        ##    self._fetchers.append(VaccinatedFetcher())
+            self._fetchers.append(VaccinatedFetcher())
             self._fetchers.append(InfectedFetcher())
             self._fetchers.append(DeathsFetcher())
             self._fetchers.append(MunicipalCharacteristicsFetcher())
diff --git a/app/fetcher/tests_fetcher.py b/app/fetcher/tests_fetcher.py
index 98e845ec..75d17c17 100644
--- a/app/fetcher/tests_fetcher.py
+++ b/app/fetcher/tests_fetcher.py
@@ -17,7 +17,23 @@ def __init__(self):
 
     def fetch(self, import_id: int) -> None:
         df = pd.read_csv(self._url)
-
+        df['incidence_pozitivni'] = df['incidence_pozitivni'].fillna(-1).astype(int)
+        df['pozit_typologie_test_indik_diagnosticka'] = df['pozit_typologie_test_indik_diagnosticka'].fillna(-1).astype(int)
+        df['pozit_typologie_test_indik_epidemiologicka'] = df['pozit_typologie_test_indik_epidemiologicka'].fillna(-1).astype(int)
+        df['pozit_typologie_test_indik_preventivni'] = df['pozit_typologie_test_indik_preventivni'].fillna(
+            -1).astype(int)
+        df['pozit_typologie_test_indik_ostatni'] = df['pozit_typologie_test_indik_ostatni'].fillna(-1).astype(
+            int)
+        df['PCR_pozit_sympt'] = df['PCR_pozit_sympt'].fillna(-1).astype(
+            int)
+        df['AG_pozit_symp'] = df['AG_pozit_symp'].fillna(-1).astype(
+            int)
+        df['AG_pozit_asymp_PCR_conf'] = df['AG_pozit_asymp_PCR_conf'].fillna(-1).astype(
+            int)
+        df['PCR_pozit_asymp'] = df['PCR_pozit_asymp'].fillna(-1).astype(
+            int)
+        df['PCR_pozit_sympt'] = df['PCR_pozit_sympt'].fillna(-1).astype(
+            int)
         df = df.drop(columns=['id'])
 
         df = df.rename(columns=str.lower)

From 8d18797119196a9b09766d1d67013869bfd2c5aa Mon Sep 17 00:00:00 2001
From: Marek Susicky <marek.susicky@sec4good.cz>
Date: Thu, 12 Oct 2023 23:59:03 +0200
Subject: [PATCH 3/6] Compute metrics fix - new case syntax

---
 app/etl/center_metrics_etl.py | 50 +++++++++++++++++------------------
 app/etl/cr_metrics_etl.py     | 30 ++++++++++-----------
 app/etl/kraj_metrics_etl.py   | 36 ++++++++++++-------------
 app/etl/okres_metrics_etl.py  | 20 +++++++-------
 4 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/app/etl/center_metrics_etl.py b/app/etl/center_metrics_etl.py
index a88dfed4..2c458d7f 100644
--- a/app/etl/center_metrics_etl.py
+++ b/app/etl/center_metrics_etl.py
@@ -44,9 +44,9 @@ def _compute_registrations(self):
         """Computes metrics based on registrations dataset for each vaccination center."""
         registrations = db.session.query(
             OckovaciMisto.id, func.coalesce(func.sum(OckovaniRegistrace.pocet), 0).label('registrace_celkem'),
-            func.coalesce(func.sum(case([((OckovaniRegistrace.rezervace == False) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet)], else_=0)), 0).label("registrace_fronta"),
-            func.coalesce(func.sum(case([((OckovaniRegistrace.pred_zavorou == True) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet)], else_=0)), 0).label("registrace_pred_zavorou"),
-            func.coalesce(func.sum(case([(OckovaniRegistrace.datum_rezervace >= self._date - timedelta(7), OckovaniRegistrace.pocet)], else_=0)) / 7.0, 0).label('registrace_rezervace_prumer')
+            func.coalesce(func.sum(case(((OckovaniRegistrace.rezervace == False) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet), else_=0)), 0).label("registrace_fronta"),
+            func.coalesce(func.sum(case(((OckovaniRegistrace.pred_zavorou == True) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet), else_=0)), 0).label("registrace_pred_zavorou"),
+            func.coalesce(func.sum(case((OckovaniRegistrace.datum_rezervace >= self._date - timedelta(7), OckovaniRegistrace.pocet), else_=0)) / 7.0, 0).label('registrace_rezervace_prumer')
         ).outerjoin(OckovaniRegistrace, and_(OckovaciMisto.id == OckovaniRegistrace.ockovaci_misto_id, OckovaniRegistrace.import_id == self._import_id)) \
             .group_by(OckovaciMisto.id) \
             .all()
@@ -68,15 +68,15 @@ def _compute_reservations(self):
         reservations = db.session.query(
             OckovaciMisto.id,
             func.coalesce(func.sum(OckovaniRezervace.maximalni_kapacita - OckovaniRezervace.volna_kapacita), 0).label('rezervace_celkem'),
-            func.coalesce(func.sum(case([(OckovaniRezervace.datum >= self._date, OckovaniRezervace.maximalni_kapacita - OckovaniRezervace.volna_kapacita)], else_=0)), 0).label("rezervace_cekajici"),
-            func.coalesce(func.sum(case([(and_(OckovaniRezervace.datum >= self._date, OckovaniRezervace.kalendar_ockovani == 'V1'), OckovaniRezervace.maximalni_kapacita - OckovaniRezervace.volna_kapacita)], else_=0)), 0).label("rezervace_cekajici_1"),
-            func.coalesce(func.sum(case([(and_(OckovaniRezervace.datum >= self._date, OckovaniRezervace.kalendar_ockovani == 'V2'), OckovaniRezervace.maximalni_kapacita - OckovaniRezervace.volna_kapacita)], else_=0)), 0).label("rezervace_cekajici_2"),
-            func.coalesce(func.sum(case([(and_(OckovaniRezervace.datum >= self._date, OckovaniRezervace.kalendar_ockovani == 'VN'), OckovaniRezervace.maximalni_kapacita - OckovaniRezervace.volna_kapacita)], else_=0)), 0).label("rezervace_cekajici_3"),
-            func.coalesce(func.sum(case([(OckovaniRezervace.datum == self._date, OckovaniRezervace.maximalni_kapacita)], else_=0)), 0).label("rezervace_kapacita"),
-            func.coalesce(func.sum(case([(and_(OckovaniRezervace.datum == self._date, OckovaniRezervace.kalendar_ockovani == 'V1'), OckovaniRezervace.maximalni_kapacita)], else_=0)), 0).label("rezervace_kapacita_1"),
-            func.coalesce(func.sum(case([(and_(OckovaniRezervace.datum == self._date, OckovaniRezervace.kalendar_ockovani == 'V2'), OckovaniRezervace.maximalni_kapacita)], else_=0)), 0).label("rezervace_kapacita_2"),
-            func.coalesce(func.sum(case([(and_(OckovaniRezervace.datum == self._date, OckovaniRezervace.kalendar_ockovani == 'VN'), OckovaniRezervace.maximalni_kapacita)], else_=0)), 0).label("rezervace_kapacita_3"),
-            func.min(case([(and_(OckovaniRezervace.datum >= self._date, OckovaniRezervace.kalendar_ockovani == 'V1', OckovaniRezervace.volna_kapacita > 0), OckovaniRezervace.datum)], else_=None)).label("rezervace_nejblizsi_volno")
+            func.coalesce(func.sum(case((OckovaniRezervace.datum >= self._date, OckovaniRezervace.maximalni_kapacita - OckovaniRezervace.volna_kapacita), else_=0)), 0).label("rezervace_cekajici"),
+            func.coalesce(func.sum(case((and_(OckovaniRezervace.datum >= self._date, OckovaniRezervace.kalendar_ockovani == 'V1'), OckovaniRezervace.maximalni_kapacita - OckovaniRezervace.volna_kapacita), else_=0)), 0).label("rezervace_cekajici_1"),
+            func.coalesce(func.sum(case((and_(OckovaniRezervace.datum >= self._date, OckovaniRezervace.kalendar_ockovani == 'V2'), OckovaniRezervace.maximalni_kapacita - OckovaniRezervace.volna_kapacita), else_=0)), 0).label("rezervace_cekajici_2"),
+            func.coalesce(func.sum(case((and_(OckovaniRezervace.datum >= self._date, OckovaniRezervace.kalendar_ockovani == 'VN'), OckovaniRezervace.maximalni_kapacita - OckovaniRezervace.volna_kapacita), else_=0)), 0).label("rezervace_cekajici_3"),
+            func.coalesce(func.sum(case((OckovaniRezervace.datum == self._date, OckovaniRezervace.maximalni_kapacita), else_=0)), 0).label("rezervace_kapacita"),
+            func.coalesce(func.sum(case((and_(OckovaniRezervace.datum == self._date, OckovaniRezervace.kalendar_ockovani == 'V1'), OckovaniRezervace.maximalni_kapacita), else_=0)), 0).label("rezervace_kapacita_1"),
+            func.coalesce(func.sum(case((and_(OckovaniRezervace.datum == self._date, OckovaniRezervace.kalendar_ockovani == 'V2'), OckovaniRezervace.maximalni_kapacita), else_=0)), 0).label("rezervace_kapacita_2"),
+            func.coalesce(func.sum(case((and_(OckovaniRezervace.datum == self._date, OckovaniRezervace.kalendar_ockovani == 'VN'), OckovaniRezervace.maximalni_kapacita), else_=0)), 0).label("rezervace_kapacita_3"),
+            func.min(case((and_(OckovaniRezervace.datum >= self._date, OckovaniRezervace.kalendar_ockovani == 'V1', OckovaniRezervace.volna_kapacita > 0), OckovaniRezervace.datum), else_=None)).label("rezervace_nejblizsi_volno")
         ).outerjoin(OckovaniRezervace, OckovaciMisto.id == OckovaniRezervace.ockovaci_misto_id) \
             .group_by(OckovaciMisto.id) \
             .all()
@@ -102,10 +102,10 @@ def _compute_reservations(self):
     def _compute_vaccinated(self):
         """Computes metrics based on vaccinated people dataset for each vaccination center."""
         vaccinated = db.session.query(OckovaciMisto.id, func.coalesce(func.sum(OckovaniLide.pocet), 0).label('ockovani_pocet_davek'),
-                                      func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == 1, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_castecne'),
-                                      func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == Vakcina.davky, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_plne'),
-                                      func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == 3, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_3'),
-                                      func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == 4, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_4')) \
+                                      func.coalesce(func.sum(case((OckovaniLide.poradi_davky == 1, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_castecne'),
+                                      func.coalesce(func.sum(case((OckovaniLide.poradi_davky == Vakcina.davky, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_plne'),
+                                      func.coalesce(func.sum(case((OckovaniLide.poradi_davky == 3, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_3'),
+                                      func.coalesce(func.sum(case((OckovaniLide.poradi_davky == 4, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_4')) \
                 .outerjoin(OckovaniLide, and_(OckovaciMisto.nrpzs_kod == OckovaniLide.zarizeni_kod, OckovaniLide.datum < self._date)) \
             .join(Vakcina, Vakcina.vakcina == OckovaniLide.vakcina) \
             .filter(or_(and_(OckovaciMisto.status == True, OckovaciMisto.nrpzs_kod.in_(queries.unique_nrpzs_active_subquery())),
@@ -130,9 +130,9 @@ def _compute_distributed(self):
         """Computes metrics based on distributed vaccines dataset for each vaccination center."""
         distributed = db.session.query(
             OckovaciMisto.id, (
-                    func.coalesce(func.sum(case([(and_(OckovaciMisto.id == OckovaniDistribuce.ockovaci_misto_id, OckovaniDistribuce.akce == 'Příjem'), OckovaniDistribuce.pocet_davek)], else_=0)), 0)
-                    + func.coalesce(func.sum(case([(and_(OckovaciMisto.id == OckovaniDistribuce.cilove_ockovaci_misto_id, OckovaniDistribuce.akce == 'Výdej'), OckovaniDistribuce.pocet_davek)], else_=0)), 0)
-                    - func.coalesce(func.sum(case([(and_(OckovaciMisto.id == OckovaniDistribuce.ockovaci_misto_id, OckovaniDistribuce.akce == 'Výdej'), OckovaniDistribuce.pocet_davek)], else_=0)), 0))
+                    func.coalesce(func.sum(case((and_(OckovaciMisto.id == OckovaniDistribuce.ockovaci_misto_id, OckovaniDistribuce.akce == 'Příjem'), OckovaniDistribuce.pocet_davek), else_=0)), 0)
+                    + func.coalesce(func.sum(case((and_(OckovaciMisto.id == OckovaniDistribuce.cilove_ockovaci_misto_id, OckovaniDistribuce.akce == 'Výdej'), OckovaniDistribuce.pocet_davek), else_=0)), 0)
+                    - func.coalesce(func.sum(case((and_(OckovaciMisto.id == OckovaniDistribuce.ockovaci_misto_id, OckovaniDistribuce.akce == 'Výdej'), OckovaniDistribuce.pocet_davek), else_=0)), 0))
                 .label('vakciny_prijate_pocet')
         ).outerjoin(OckovaniDistribuce, and_(
             or_(OckovaciMisto.id == OckovaniDistribuce.ockovaci_misto_id, OckovaciMisto.id == OckovaniDistribuce.cilove_ockovaci_misto_id),
@@ -230,8 +230,8 @@ def _compute_derived(self):
 
         success_ratio_7 = db.session.query(
             OckovaciMisto.id,
-            (1.0 * func.coalesce(func.sum(case([(OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet)], else_=0)), 0)
-             / case([(func.sum(OckovaniRegistrace.pocet) == 0, None)], else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_tydenni_uspesnost')
+            (1.0 * func.coalesce(func.sum(case((OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet), else_=0)), 0)
+             / case((func.sum(OckovaniRegistrace.pocet) == 0, None), else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_tydenni_uspesnost')
         ).join(OckovaniRegistrace, OckovaciMisto.id == OckovaniRegistrace.ockovaci_misto_id) \
             .filter(OckovaniRegistrace.import_id == self._import_id) \
             .filter(OckovaniRegistrace.datum >= self._date - timedelta(7)) \
@@ -247,8 +247,8 @@ def _compute_derived(self):
 
         success_ratio_14 = db.session.query(
             OckovaciMisto.id,
-            (1.0 * func.coalesce(func.sum(case([(OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet)], else_=0)), 0)
-             / case([(func.sum(OckovaniRegistrace.pocet) == 0, None)], else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_14denni_uspesnost')
+            (1.0 * func.coalesce(func.sum(case((OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet), else_=0)), 0)
+             / case((func.sum(OckovaniRegistrace.pocet) == 0, None), else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_14denni_uspesnost')
         ).join(OckovaniRegistrace, OckovaciMisto.id == OckovaniRegistrace.ockovaci_misto_id) \
             .filter(OckovaniRegistrace.import_id == self._import_id) \
             .filter(OckovaniRegistrace.datum >= self._date - timedelta(14)) \
@@ -264,8 +264,8 @@ def _compute_derived(self):
 
         success_ratio_30 = db.session.query(
             OckovaciMisto.id,
-            (1.0 * func.coalesce(func.sum(case([(OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet)], else_=0)), 0)
-             / case([(func.sum(OckovaniRegistrace.pocet) == 0, None)], else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_30denni_uspesnost')
+            (1.0 * func.coalesce(func.sum(case((OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet), else_=0)), 0)
+             / case((func.sum(OckovaniRegistrace.pocet) == 0, None), else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_30denni_uspesnost')
         ).join(OckovaniRegistrace, OckovaciMisto.id == OckovaniRegistrace.ockovaci_misto_id) \
             .filter(OckovaniRegistrace.import_id == self._import_id) \
             .filter(OckovaniRegistrace.datum >= self._date - timedelta(30)) \
diff --git a/app/etl/cr_metrics_etl.py b/app/etl/cr_metrics_etl.py
index 06502aab..316099a9 100644
--- a/app/etl/cr_metrics_etl.py
+++ b/app/etl/cr_metrics_etl.py
@@ -45,7 +45,7 @@ def _compute_population(self):
         """Computes metrics based on population for cr."""
         population = db.session.query(
             func.sum(Populace.pocet).label('pocet_obyvatel_celkem'),
-            func.sum(case([(Populace.vek >= 18, Populace.pocet)], else_=0)).label('pocet_obyvatel_dospeli')
+            func.sum(case((Populace.vek >= 18, Populace.pocet), else_=0)).label('pocet_obyvatel_dospeli')
         ).filter(Populace.orp_kod == 'CZ0') \
             .one()
 
@@ -61,9 +61,9 @@ def _compute_registrations(self):
         """Computes metrics based on registrations dataset for cr."""
         registrations = db.session.query(
             func.coalesce(func.sum(OckovaniRegistrace.pocet), 0).label('registrace_celkem'),
-            func.coalesce(func.sum(case([((OckovaniRegistrace.rezervace == False) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet)], else_=0)), 0).label("registrace_fronta"),
-            func.coalesce(func.sum(case([((OckovaniRegistrace.pred_zavorou == True) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet)], else_=0)), 0).label("registrace_pred_zavorou"),
-            func.coalesce(func.sum(case([(OckovaniRegistrace.datum_rezervace >= self._date - timedelta(7), OckovaniRegistrace.pocet)], else_=0)) / 7.0, 0).label('registrace_rezervace_prumer')
+            func.coalesce(func.sum(case(((OckovaniRegistrace.rezervace == False) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet), else_=0)), 0).label("registrace_fronta"),
+            func.coalesce(func.sum(case(((OckovaniRegistrace.pred_zavorou == True) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet), else_=0)), 0).label("registrace_pred_zavorou"),
+            func.coalesce(func.sum(case((OckovaniRegistrace.datum_rezervace >= self._date - timedelta(7), OckovaniRegistrace.pocet), else_=0)) / 7.0, 0).label('registrace_rezervace_prumer')
         ).filter(OckovaniRegistrace.import_id == self._import_id) \
             .one()
 
@@ -111,10 +111,10 @@ def _compute_vaccinated(self):
         """Computes metrics based on vaccinated people dataset for cr."""
         vaccinated = db.session.query(
             func.coalesce(func.sum(OckovaniLide.pocet), 0).label('ockovani_pocet_davek'),
-            func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == 1, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_castecne'),
-            func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == Vakcina.davky, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_plne'),
-            func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == 3, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_3'),
-            func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == 4, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_4')
+            func.coalesce(func.sum(case((OckovaniLide.poradi_davky == 1, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_castecne'),
+            func.coalesce(func.sum(case((OckovaniLide.poradi_davky == Vakcina.davky, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_plne'),
+            func.coalesce(func.sum(case((OckovaniLide.poradi_davky == 3, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_3'),
+            func.coalesce(func.sum(case((OckovaniLide.poradi_davky == 4, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_4')
         ).join(Vakcina, Vakcina.vakcina == OckovaniLide.vakcina) \
             .filter(OckovaniLide.datum < self._date) \
             .one()
@@ -133,7 +133,7 @@ def _compute_vaccinated(self):
     def _compute_distributed(self):
         """Computes metrics based on distributed vaccines dataset for cr."""
         distributed = db.session.query(
-            func.sum(case([(OckovaniDistribuce.akce == 'Příjem', OckovaniDistribuce.pocet_davek)], else_=0)).label('vakciny_prijate_pocet')
+            func.sum(case((OckovaniDistribuce.akce == 'Příjem', OckovaniDistribuce.pocet_davek), else_=0)).label('vakciny_prijate_pocet')
         ).filter(OckovaniDistribuce.datum < self._date) \
             .one()
 
@@ -189,8 +189,8 @@ def _compute_derived(self):
         ))
 
         success_ratio_7 = db.session.query(
-            (1.0 * func.coalesce(func.sum(case([(OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet)], else_=0)), 0)
-             / case([(func.sum(OckovaniRegistrace.pocet) == 0, None)], else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_tydenni_uspesnost')
+            (1.0 * func.coalesce(func.sum(case((OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet), else_=0)), 0)
+             / case((func.sum(OckovaniRegistrace.pocet) == 0, None), else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_tydenni_uspesnost')
         ).filter(OckovaniRegistrace.import_id == self._import_id) \
             .filter(OckovaniRegistrace.datum >= self._date - timedelta(7)) \
             .one()
@@ -201,8 +201,8 @@ def _compute_derived(self):
         ))
 
         success_ratio_14 = db.session.query(
-            (1.0 * func.coalesce(func.sum(case([(OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet)], else_=0)), 0)
-             / case([(func.sum(OckovaniRegistrace.pocet) == 0, None)], else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_14denni_uspesnost')
+            (1.0 * func.coalesce(func.sum(case((OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet), else_=0)), 0)
+             / case((func.sum(OckovaniRegistrace.pocet) == 0, None), else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_14denni_uspesnost')
         ).filter(OckovaniRegistrace.import_id == self._import_id) \
             .filter(OckovaniRegistrace.datum >= self._date - timedelta(14)) \
             .one()
@@ -213,8 +213,8 @@ def _compute_derived(self):
         ))
 
         success_ratio_30 = db.session.query(
-            (1.0 * func.coalesce(func.sum(case([(OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet)], else_=0)), 0)
-             / case([(func.sum(OckovaniRegistrace.pocet) == 0, None)], else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_30denni_uspesnost')
+            (1.0 * func.coalesce(func.sum(case((OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet), else_=0)), 0)
+             / case((func.sum(OckovaniRegistrace.pocet) == 0, None), else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_30denni_uspesnost')
         ).filter(OckovaniRegistrace.import_id == self._import_id) \
             .filter(OckovaniRegistrace.datum >= self._date - timedelta(30)) \
             .one()
diff --git a/app/etl/kraj_metrics_etl.py b/app/etl/kraj_metrics_etl.py
index 2ac8e26a..2729312e 100644
--- a/app/etl/kraj_metrics_etl.py
+++ b/app/etl/kraj_metrics_etl.py
@@ -45,7 +45,7 @@ def _compute_population(self):
         """Computes metrics based on population for each kraj."""
         population = db.session.query(
             Kraj.id, func.sum(Populace.pocet).label('pocet_obyvatel_celkem'),
-            func.sum(case([(Populace.vek >= 18, Populace.pocet)], else_=0)).label('pocet_obyvatel_dospeli')
+            func.sum(case((Populace.vek >= 18, Populace.pocet), else_=0)).label('pocet_obyvatel_dospeli')
         ).join(Populace, Populace.orp_kod == Kraj.id) \
             .group_by(Kraj.id)
 
@@ -63,9 +63,9 @@ def _compute_registrations(self):
         """Computes metrics based on registrations dataset for each kraj."""
         registrations = db.session.query(
             Okres.kraj_id, func.coalesce(func.sum(OckovaniRegistrace.pocet), 0).label('registrace_celkem'),
-            func.coalesce(func.sum(case([((OckovaniRegistrace.rezervace == False) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet)], else_=0)), 0).label("registrace_fronta"),
-            func.coalesce(func.sum(case([((OckovaniRegistrace.pred_zavorou == True) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet)], else_=0)), 0).label("registrace_pred_zavorou"),
-            func.coalesce(func.sum(case([(OckovaniRegistrace.datum_rezervace >= self._date - timedelta(7), OckovaniRegistrace.pocet)], else_=0)) / 7.0, 0).label('registrace_rezervace_prumer')
+            func.coalesce(func.sum(case(((OckovaniRegistrace.rezervace == False) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet), else_=0)), 0).label("registrace_fronta"),
+            func.coalesce(func.sum(case(((OckovaniRegistrace.pred_zavorou == True) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet), else_=0)), 0).label("registrace_pred_zavorou"),
+            func.coalesce(func.sum(case((OckovaniRegistrace.datum_rezervace >= self._date - timedelta(7), OckovaniRegistrace.pocet), else_=0)) / 7.0, 0).label('registrace_rezervace_prumer')
         ).join(OckovaciMisto, OckovaciMisto.okres_id == Okres.id) \
             .outerjoin(OckovaniRegistrace, and_(OckovaciMisto.id == OckovaniRegistrace.ockovaci_misto_id, OckovaniRegistrace.import_id == self._import_id)) \
             .group_by(Okres.kraj_id) \
@@ -125,10 +125,10 @@ def _compute_vaccinated(self):
         """Computes metrics based on vaccinated people dataset for each kraj."""
         vaccinated = db.session.query(
             Kraj.id, func.coalesce(func.sum(OckovaniLide.pocet), 0).label('ockovani_pocet_davek'),
-            func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == 1, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_castecne'),
-            func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == Vakcina.davky, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_plne'),
-            func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == 3, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_3'),
-            func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == 4, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_4')
+            func.coalesce(func.sum(case((OckovaniLide.poradi_davky == 1, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_castecne'),
+            func.coalesce(func.sum(case((OckovaniLide.poradi_davky == Vakcina.davky, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_plne'),
+            func.coalesce(func.sum(case((OckovaniLide.poradi_davky == 3, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_3'),
+            func.coalesce(func.sum(case((OckovaniLide.poradi_davky == 4, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_4')
         ).outerjoin(OckovaniLide, and_(OckovaniLide.kraj_nuts_kod == Kraj.id, OckovaniLide.datum < self._date)) \
             .join(Vakcina, Vakcina.vakcina == OckovaniLide.vakcina) \
             .group_by(Kraj.id) \
@@ -147,10 +147,10 @@ def _compute_vaccinated(self):
 
         vaccinated_bydl = db.session.query(
             Kraj.id,
-            func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == 1, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_castecne_bydl'),
-            func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == Vakcina.davky, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_plne_bydl'),
-            func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == 3, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_3_bydl'),
-            func.coalesce(func.sum(case([(OckovaniLide.poradi_davky == 4, OckovaniLide.pocet)], else_=0)), 0).label('ockovani_pocet_4_bydl')
+            func.coalesce(func.sum(case((OckovaniLide.poradi_davky == 1, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_castecne_bydl'),
+            func.coalesce(func.sum(case((OckovaniLide.poradi_davky == Vakcina.davky, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_plne_bydl'),
+            func.coalesce(func.sum(case((OckovaniLide.poradi_davky == 3, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_3_bydl'),
+            func.coalesce(func.sum(case((OckovaniLide.poradi_davky == 4, OckovaniLide.pocet), else_=0)), 0).label('ockovani_pocet_4_bydl')
         ).outerjoin(OckovaniLide, and_(OckovaniLide.kraj_bydl_nuts == Kraj.id, OckovaniLide.datum < self._date)) \
             .join(Vakcina, Vakcina.vakcina == OckovaniLide.vakcina) \
             .group_by(Kraj.id) \
@@ -276,8 +276,8 @@ def _compute_derived(self):
 
         success_ratio_7 = db.session.query(
             Kraj.id,
-            (1.0 * func.coalesce(func.sum(case([(OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet)], else_=0)), 0)
-             / case([(func.sum(OckovaniRegistrace.pocet) == 0, None)], else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_tydenni_uspesnost')
+            (1.0 * func.coalesce(func.sum(case((OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet), else_=0)), 0)
+             / case((func.sum(OckovaniRegistrace.pocet) == 0, None), else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_tydenni_uspesnost')
         ).join(Okres, Okres.kraj_id == Kraj.id) \
             .join(OckovaciMisto, (OckovaciMisto.okres_id == Okres.id)) \
             .join(OckovaniRegistrace, OckovaciMisto.id == OckovaniRegistrace.ockovaci_misto_id) \
@@ -295,8 +295,8 @@ def _compute_derived(self):
 
         success_ratio_14 = db.session.query(
             Kraj.id,
-            (1.0 * func.coalesce(func.sum(case([(OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet)], else_=0)), 0)
-             / case([(func.sum(OckovaniRegistrace.pocet) == 0, None)], else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_14denni_uspesnost')
+            (1.0 * func.coalesce(func.sum(case((OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet), else_=0)), 0)
+             / case((func.sum(OckovaniRegistrace.pocet) == 0, None), else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_14denni_uspesnost')
         ).join(Okres, Okres.kraj_id == Kraj.id) \
             .join(OckovaciMisto, (OckovaciMisto.okres_id == Okres.id)) \
             .join(OckovaniRegistrace, OckovaciMisto.id == OckovaniRegistrace.ockovaci_misto_id) \
@@ -314,8 +314,8 @@ def _compute_derived(self):
 
         success_ratio_30 = db.session.query(
             Kraj.id,
-            (1.0 * func.coalesce(func.sum(case([(OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet)], else_=0)), 0)
-             / case([(func.sum(OckovaniRegistrace.pocet) == 0, None)], else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_30denni_uspesnost')
+            (1.0 * func.coalesce(func.sum(case((OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet), else_=0)), 0)
+             / case((func.sum(OckovaniRegistrace.pocet) == 0, None), else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_30denni_uspesnost')
         ).join(Okres, Okres.kraj_id == Kraj.id) \
             .join(OckovaciMisto, (OckovaciMisto.okres_id == Okres.id)) \
             .join(OckovaniRegistrace, OckovaciMisto.id == OckovaniRegistrace.ockovaci_misto_id) \
diff --git a/app/etl/okres_metrics_etl.py b/app/etl/okres_metrics_etl.py
index 82e69963..e7154438 100644
--- a/app/etl/okres_metrics_etl.py
+++ b/app/etl/okres_metrics_etl.py
@@ -43,7 +43,7 @@ def _compute_population(self):
         """Computes metrics based on population for each okres."""
         population = db.session.query(
             Okres.id, func.sum(Populace.pocet).label('pocet_obyvatel_celkem'),
-            func.sum(case([(Populace.vek >= 18, Populace.pocet)], else_=0)).label('pocet_obyvatel_dospeli')
+            func.sum(case((Populace.vek >= 18, Populace.pocet), else_=0)).label('pocet_obyvatel_dospeli')
         ).join(Populace, Populace.orp_kod == Okres.id) \
             .group_by(Okres.id)
 
@@ -61,9 +61,9 @@ def _compute_registrations(self):
         """Computes metrics based on registrations dataset for each okres."""
         registrations = db.session.query(
             OckovaciMisto.okres_id, func.coalesce(func.sum(OckovaniRegistrace.pocet), 0).label('registrace_celkem'),
-            func.coalesce(func.sum(case([((OckovaniRegistrace.rezervace == False) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet)], else_=0)), 0).label("registrace_fronta"),
-            func.coalesce(func.sum(case([((OckovaniRegistrace.pred_zavorou == True) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet)], else_=0)), 0).label("registrace_pred_zavorou"),
-            func.coalesce(func.sum(case([(OckovaniRegistrace.datum_rezervace >= self._date - timedelta(7), OckovaniRegistrace.pocet)], else_=0)) / 7.0, 0).label('registrace_rezervace_prumer')
+            func.coalesce(func.sum(case(((OckovaniRegistrace.rezervace == False) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet), else_=0)), 0).label("registrace_fronta"),
+            func.coalesce(func.sum(case(((OckovaniRegistrace.pred_zavorou == True) & (OckovaniRegistrace.ockovani < 1), OckovaniRegistrace.pocet), else_=0)), 0).label("registrace_pred_zavorou"),
+            func.coalesce(func.sum(case((OckovaniRegistrace.datum_rezervace >= self._date - timedelta(7), OckovaniRegistrace.pocet), else_=0)) / 7.0, 0).label('registrace_rezervace_prumer')
         ).outerjoin(OckovaniRegistrace, and_(OckovaciMisto.id == OckovaniRegistrace.ockovaci_misto_id, OckovaniRegistrace.import_id == self._import_id)) \
             .filter(OckovaciMisto.okres_id != None) \
             .group_by(OckovaciMisto.okres_id) \
@@ -222,8 +222,8 @@ def _compute_derived(self):
 
         success_ratio_7 = db.session.query(
             Okres.id,
-            (1.0 * func.coalesce(func.sum(case([(OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet)], else_=0)), 0)
-             / case([(func.sum(OckovaniRegistrace.pocet) == 0, None)], else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_tydenni_uspesnost')
+            (1.0 * func.coalesce(func.sum(case((OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet), else_=0)), 0)
+             / case((func.sum(OckovaniRegistrace.pocet) == 0, None), else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_tydenni_uspesnost')
         ).join(OckovaciMisto, (OckovaciMisto.okres_id == Okres.id)) \
             .join(OckovaniRegistrace, OckovaciMisto.id == OckovaniRegistrace.ockovaci_misto_id) \
             .filter(OckovaniRegistrace.import_id == self._import_id) \
@@ -240,8 +240,8 @@ def _compute_derived(self):
 
         success_ratio_14 = db.session.query(
             Okres.id,
-            (1.0 * func.coalesce(func.sum(case([(OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet)], else_=0)), 0)
-             / case([(func.sum(OckovaniRegistrace.pocet) == 0, None)], else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_14denni_uspesnost')
+            (1.0 * func.coalesce(func.sum(case((OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet), else_=0)), 0)
+             / case((func.sum(OckovaniRegistrace.pocet) == 0, None), else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_14denni_uspesnost')
         ).join(OckovaciMisto, (OckovaciMisto.okres_id == Okres.id)) \
             .join(OckovaniRegistrace, OckovaciMisto.id == OckovaniRegistrace.ockovaci_misto_id) \
             .filter(OckovaniRegistrace.import_id == self._import_id) \
@@ -258,8 +258,8 @@ def _compute_derived(self):
 
         success_ratio_30 = db.session.query(
             Okres.id,
-            (1.0 * func.coalesce(func.sum(case([(OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet)], else_=0)), 0)
-             / case([(func.sum(OckovaniRegistrace.pocet) == 0, None)], else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_30denni_uspesnost')
+            (1.0 * func.coalesce(func.sum(case((OckovaniRegistrace.rezervace == True, OckovaniRegistrace.pocet), else_=0)), 0)
+             / case((func.sum(OckovaniRegistrace.pocet) == 0, None), else_=func.sum(OckovaniRegistrace.pocet))).label('registrace_30denni_uspesnost')
         ).join(OckovaciMisto, (OckovaciMisto.okres_id == Okres.id)) \
             .join(OckovaniRegistrace, OckovaciMisto.id == OckovaniRegistrace.ockovaci_misto_id) \
             .filter(OckovaniRegistrace.import_id == self._import_id) \

From ad2bbe8c08525acf06ca1f0e2b42b3c3521a3b2a Mon Sep 17 00:00:00 2001
From: Marek Susicky <marek.susicky@sec4good.cz>
Date: Fri, 13 Oct 2023 16:05:56 +0200
Subject: [PATCH 4/6] Oprava dataframe pro rolling

---
 app/queries.py          | 69 +++++++++++++++++++++++++++--------------
 app/templates/base.html |  2 +-
 2 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/app/queries.py b/app/queries.py
index 689f31d8..5a9baa38 100644
--- a/app/queries.py
+++ b/app/queries.py
@@ -192,7 +192,8 @@ def find_free_vaccines_available(nrpzs_kod=None, okres_id=None, kraj_id=None):
                             PrakticiKapacity.kontakt_email, PrakticiKapacity.expirace, PrakticiKapacity.poznamka,
                             PrakticiKapacity.kraj, ZdravotnickeStredisko.nrpzs_kod, ZdravotnickeStredisko.latitude,
                             ZdravotnickeStredisko.longitude) \
-        .outerjoin(ZdravotnickeStredisko, ZdravotnickeStredisko.zdravotnicke_zarizeni_kod == PrakticiKapacity.zdravotnicke_zarizeni_kod) \
+        .outerjoin(ZdravotnickeStredisko,
+                   ZdravotnickeStredisko.zdravotnicke_zarizeni_kod == PrakticiKapacity.zdravotnicke_zarizeni_kod) \
         .filter(or_(func.left(PrakticiKapacity.zdravotnicke_zarizeni_kod, 11) == nrpzs_kod, nrpzs_kod is None)) \
         .filter(or_(ZdravotnickeStredisko.okres_kod == okres_id, okres_id is None)) \
         .filter(or_(ZdravotnickeStredisko.kraj_kod == kraj_id, kraj_id is None)) \
@@ -477,17 +478,21 @@ def count_registrations(filter_column, filter_value):
     df['fronta_pocet'] = df[['pocet']].where(df['rezervace'] == False).fillna(0).astype('int')
     df['fronta_cekani'] = (df['dnes'] - df['datum']).astype('timedelta64[ns]').dt.days
     df['fronta_pocet_x_cekani'] = df['fronta_pocet'] * df['fronta_cekani']
-    df['s_terminem_pocet'] = df[['pocet']].where((df['rezervace'] == True) & (df['ockovani'] < 1)).fillna(0).astype('int')
+    df['s_terminem_pocet'] = df[['pocet']].where((df['rezervace'] == True) & (df['ockovani'] < 1)).fillna(0).astype(
+        'int')
     df['registrace_7'] = df[['pocet']].where(df['datum'] >= get_import_date() - timedelta(7))
-    df['registrace_7_rez'] = df[['pocet']].where((df['rezervace'] == True) & (df['datum'] >= get_import_date() - timedelta(7)))
+    df['registrace_7_rez'] = df[['pocet']].where(
+        (df['rezervace'] == True) & (df['datum'] >= get_import_date() - timedelta(7)))
     # df['registrace_14'] = df[['pocet']].where(df['datum'] >= get_import_date() - timedelta(14))
     # df['registrace_14_rez'] = df[['pocet']].where((df['rezervace'] == True) & (df['datum'] >= get_import_date() - timedelta(14)))
     # df['registrace_30'] = df[['pocet']].where(df['datum'] >= get_import_date() - timedelta(30))
     # df['registrace_30_rez'] = df[['pocet']].where((df['rezervace'] == True) & (df['datum'] >= get_import_date() - timedelta(30)))
     df['rezervace_7_cekani'] = (df['datum_rezervace_fix'] - df['datum']).astype('timedelta64[ns]').dt.days
-    df['rezervace_7_pocet'] = df[['pocet']].where((df['rezervace'] == True) & (df['datum_rezervace_fix'] >= get_import_date() - timedelta(7)))
+    df['rezervace_7_pocet'] = df[['pocet']].where(
+        (df['rezervace'] == True) & (df['datum_rezervace_fix'] >= get_import_date() - timedelta(7)))
     df['rezervace_7_pocet_x_cekani'] = df['rezervace_7_cekani'] * df['rezervace_7_pocet']
-    df['rezervace_14_pocet'] = df[['pocet']].where((df['rezervace'] == True) & (df['datum_rezervace_fix'] >= get_import_date() - timedelta(14)))
+    df['rezervace_14_pocet'] = df[['pocet']].where(
+        (df['rezervace'] == True) & (df['datum_rezervace_fix'] >= get_import_date() - timedelta(14)))
 
     df = df.groupby(['vekova_skupina', 'povolani']).sum()
 
@@ -501,9 +506,12 @@ def count_registrations(filter_column, filter_value):
     # df['registrace_30'] = df['registrace_30'].astype('int')
     # df['registrace_30_rez'] = df['registrace_30_rez'].astype('int')
     df['fronta_prumer_cekani'] = ((df['fronta_pocet_x_cekani'] / df['fronta_pocet']) / 7).replace({np.nan: None})
-    df['rezervace_prumer_cekani'] = ((df['rezervace_7_pocet_x_cekani'] / df['rezervace_7_pocet']) / 7).replace({np.nan: None})
+    df['rezervace_prumer_cekani'] = ((df['rezervace_7_pocet_x_cekani'] / df['rezervace_7_pocet']) / 7).replace(
+        {np.nan: None})
 
-    df = df[(df['fronta_pocet'] > 0) | df['fronta_prumer_cekani'].notnull() | df['rezervace_prumer_cekani'].notnull() | df['uspesnost_7'].notnull()]
+    df = df[
+        (df['fronta_pocet'] > 0) | df['fronta_prumer_cekani'].notnull() | df['rezervace_prumer_cekani'].notnull() | df[
+            'uspesnost_7'].notnull()]
 
     return df.reset_index().sort_values(by=['vekova_skupina', 'povolani'])
 
@@ -822,7 +830,8 @@ def count_free_slots(center_id=None):
 
 
 def count_vaccinated_week():
-    return db.session.query(column('datum'), column('pocet_1'), column('pocet_2'), column('pocet_3'), column('pocet_4'), column('pocet_celkem')).from_statement(text(
+    return db.session.query(column('datum'), column('pocet_1'), column('pocet_2'), column('pocet_3'), column('pocet_4'),
+                            column('pocet_celkem')).from_statement(text(
         f"""
         select datum, 
             sum(case when poradi_davky = 1 then pocet else 0 end) pocet_1, 
@@ -1009,7 +1018,8 @@ def count_vaccinated_unvaccinated_comparison_age():
                 .replace({np.nan: 0})
 
         for g in ['plne', 'posilujici']:
-            df_norm[d + '_' + g + '_ratio'] = (df_norm[d + '_bez_norm'] / df_norm[d + '_' + g + '_norm']).replace({np.inf: np.nan})
+            df_norm[d + '_' + g + '_ratio'] = (df_norm[d + '_bez_norm'] / df_norm[d + '_' + g + '_norm']).replace(
+                {np.inf: np.nan})
             df_norm.loc[df_norm['populace_' + g + '_zastoupeni'] < 0.05, d + '_' + g + '_ratio'] = np.nan
             df_norm[d + '_' + g + '_ratio'] = df_norm[d + '_' + g + '_ratio'].replace({np.nan: None})
 
@@ -1297,9 +1307,8 @@ def get_infected_graph_data():
         {'0-11': '0-17', '12-15': '0-17', '16-17': '0-17', '18-24': '18-29', '25-29': '18-29', '30-34': '30-39',
          '35-39': '30-39', '40-44': '40-49', '45-49': '40-49', '50-54': '50-59', '55-59': '50-59', '60-64': '60-69',
          '65-69': '60-69', '70-74': '70-79', '75-79': '70-79'})
-
     df = df.groupby(['vekova_skupina_grp', 'datum']).sum()
-    df_sum = df.rolling(7).sum()
+    df_sum = df[['pocet_vek', 'pocet_nakazeni']].rolling(7).sum()
 
     df_sum['pocet_nakazeni_norm'] = ((df_sum['pocet_nakazeni'] / df_sum['pocet_vek']) * 100000)
 
@@ -1350,7 +1359,7 @@ def get_deaths_graph_data():
          '65-69': '60-69', '70-74': '70-79', '75-79': '70-79'})
 
     df = df.groupby(['vekova_skupina_grp', 'datum']).sum()
-    df_sum = df.rolling(7).sum()
+    df_sum = df[['pocet_vek', 'pocet_umrti']].rolling(7).sum()
 
     df_sum['pocet_umrti_norm'] = ((df_sum['pocet_umrti'] / df_sum['pocet_vek']) * 100000)
 
@@ -1375,11 +1384,15 @@ def get_tests_graph_data():
     df = df.set_index('datum')
     df_sum = df.rolling(7).sum()
 
-    df_sum['pozitivita_diagnosticka'] = (df_sum['pozit_typologie_test_indik_diagnosticka'] / df_sum['typologie_test_indik_diagnosticka']) * 100
-    df_sum['pozitivita_epidemiologicka'] = (df_sum['pozit_typologie_test_indik_epidemiologicka'] / df_sum['typologie_test_indik_epidemiologicka']) * 100
-    df_sum['pozitivita_preventivni'] = (df_sum['pozit_typologie_test_indik_preventivni'] / df_sum['typologie_test_indik_preventivni']) * 100
+    df_sum['pozitivita_diagnosticka'] = (df_sum['pozit_typologie_test_indik_diagnosticka'] / df_sum[
+        'typologie_test_indik_diagnosticka']) * 100
+    df_sum['pozitivita_epidemiologicka'] = (df_sum['pozit_typologie_test_indik_epidemiologicka'] / df_sum[
+        'typologie_test_indik_epidemiologicka']) * 100
+    df_sum['pozitivita_preventivni'] = (df_sum['pozit_typologie_test_indik_preventivni'] / df_sum[
+        'typologie_test_indik_preventivni']) * 100
 
-    df = pd.merge(df_sum[['pozitivita_diagnosticka', 'pozitivita_epidemiologicka', 'pozitivita_preventivni']], df, left_index=True, right_index=True)
+    df = pd.merge(df_sum[['pozitivita_diagnosticka', 'pozitivita_epidemiologicka', 'pozitivita_preventivni']], df,
+                  left_index=True, right_index=True)
 
     df = df[df.index >= df.index.min() + timedelta(7)]
 
@@ -1457,18 +1470,26 @@ def get_tests_orp_graph_data():
 
 
 def get_hospital_capacities_graph_data():
-    capacities = pd.read_sql_query(f"select * from kapacity_nemocnic where datum < '{get_import_date()}'", db.engine).fillna(0)
-    capacities['luzka_standard_kyslik_kapacita_volna_covid_pozitivni'] += capacities['inf_luzka_kyslik_kapacita_volna_covid_pozitivni']
-    capacities['luzka_standard_kyslik_kapacita_volna_covid_negativni'] += capacities['inf_luzka_kyslik_kapacita_volna_covid_negativni']
+    capacities = pd.read_sql_query(f"select * from kapacity_nemocnic where datum < '{get_import_date()}'",
+                                   db.engine).fillna(0)
+    capacities['luzka_standard_kyslik_kapacita_volna_covid_pozitivni'] += capacities[
+        'inf_luzka_kyslik_kapacita_volna_covid_pozitivni']
+    capacities['luzka_standard_kyslik_kapacita_volna_covid_negativni'] += capacities[
+        'inf_luzka_kyslik_kapacita_volna_covid_negativni']
     capacities['luzka_standard_kyslik_kapacita_celkem'] += capacities['inf_luzka_kyslik_kapacita_celkem']
-    capacities['luzka_hfno_cpap_kapacita_volna_covid_pozitivni'] += capacities['inf_luzka_hfno_kapacita_volna_covid_pozitivni']
-    capacities['luzka_hfno_cpap_kapacita_volna_covid_negativni'] += capacities['inf_luzka_hfno_kapacita_volna_covid_negativni']
+    capacities['luzka_hfno_cpap_kapacita_volna_covid_pozitivni'] += capacities[
+        'inf_luzka_hfno_kapacita_volna_covid_pozitivni']
+    capacities['luzka_hfno_cpap_kapacita_volna_covid_negativni'] += capacities[
+        'inf_luzka_hfno_kapacita_volna_covid_negativni']
     capacities['luzka_hfno_cpap_kapacita_celkem'] += capacities['inf_luzka_hfno_kapacita_celkem']
-    capacities['luzka_upv_niv_kapacita_volna_covid_pozitivni'] += capacities['inf_luzka_upv_kapacita_volna_covid_pozitivni']
-    capacities['luzka_upv_niv_kapacita_volna_covid_negativni'] += capacities['inf_luzka_upv_kapacita_volna_covid_negativni']
+    capacities['luzka_upv_niv_kapacita_volna_covid_pozitivni'] += capacities[
+        'inf_luzka_upv_kapacita_volna_covid_pozitivni']
+    capacities['luzka_upv_niv_kapacita_volna_covid_negativni'] += capacities[
+        'inf_luzka_upv_kapacita_volna_covid_negativni']
     capacities['luzka_upv_niv_kapacita_celkem'] += capacities['inf_luzka_upv_kapacita_celkem']
 
-    capacities_21 = pd.read_sql_query("select * from kapacity_nemocnic_21 where datum >= '2021-03-30'", db.engine).fillna(0)
+    capacities_21 = pd.read_sql_query("select * from kapacity_nemocnic_21 where datum >= '2021-03-30'",
+                                      db.engine).fillna(0)
 
     capacities_20 = pd.read_sql_query("select * from kapacity_nemocnic_20", db.engine).fillna(0)
 
diff --git a/app/templates/base.html b/app/templates/base.html
index da84f4ad..bca7a7c5 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -101,7 +101,7 @@
             <div class="alert alert-danger" role="alert">
                 <p class="mb-0">
                     Čas poslední aktualizace: <strong>{{ last_update }}</strong>.
-                    POZOR! - Aktualizace webu byla 8. 7. 2023 ukončena.
+                    POZOR! - Momentálně obnovený pilotní provoz, na webu mohou být chyby.
                 </p>
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
                     <span aria-hidden="true">&times;</span>

From 4d7c19702659e6fca2c7259e8f3af1f06e7962da Mon Sep 17 00:00:00 2001
From: Marek Susicky <marek.susicky@sec4good.cz>
Date: Tue, 24 Oct 2023 00:01:15 +0200
Subject: [PATCH 5/6] Aktualizace, pridani loga

---
 app/static/img/sec4good_mungo_logo_tmave.png | Bin 0 -> 26396 bytes
 app/templates/base.html                      |   6 +++---
 app/templates/index.html                     |   3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 app/static/img/sec4good_mungo_logo_tmave.png

diff --git a/app/static/img/sec4good_mungo_logo_tmave.png b/app/static/img/sec4good_mungo_logo_tmave.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ddad8219752b131e3ca9b73cdb2e553ba5a6da3
GIT binary patch
literal 26396
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
NMVP8wrHpaF{{TFnc0>RG

literal 0
HcmV?d00001

diff --git a/app/templates/base.html b/app/templates/base.html
index bca7a7c5..6f88f9e2 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -123,7 +123,7 @@
                 a od Centrálního řídícího týmu COVID-19 (CŘT).
             </p>
             <p class="mb-1">
-                Vydavatel: ČVUT, Fakulta informačních technologií, Praha ve spolupráci s firmou Profinit EU, s.r.o., Praha, 2021.<br />
+                Vydavatel: ČVUT, Fakulta informačních technologií, Praha ve spolupráci s firmou Sec4good, s.r.o., Praha, 2023.<br />
                 Citace: Sušický M., Staněk J. <i>COVID-19 očkování</i> [online]. Praha: ČVUT, Fakulta informačních technologií, 2021 [cit. {{ now | format_date_en }}]. ISSN 2787-9925. Dostupné z https://ockovani.opendatalab.cz
             </p>
             <p class="mb-0 font-italic">
@@ -141,8 +141,8 @@
                 <img src="{{ url_for('static',filename='img/FIT_logo.png') }}">
             </a>
             &nbsp;
-            <a href="https://profinit.eu/" target="_blank">
-                <img src="{{ url_for('static',filename='img/PROFINIT_logo.png') }}">
+            <a href="https://www.sec4good.cz/" target="_blank">
+                <img src="{{ url_for('static',filename='img/sec4good_mungo_logo_tmave.png') }}" style="width: 185px;">
             </a>
         </div>
     </div>
diff --git a/app/templates/index.html b/app/templates/index.html
index 31738812..2e8abbd8 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -115,6 +115,9 @@ <h2>COVID-19 data o očkování</h2>
     <div class="col">
         <h3>Aktuality a důležité informace</h3>
         <ul class="timeline text-justify">        
+            {{ zprava('Znovuspuštění aktualizace webu', '13. 10. 2023',
+            'Aktualizace webu byla 13. 10. 2023 znovu zahájena, zatím v pilotním režimu.') }}
+
             {{ zprava('Ukončení aktualizace webu', '1. 7. 2023',
             'Aktualizace webu byla 1. 7. 2023 ukončena.') }}
 

From d4de0fd78cb66f651480a0f95da7289c53bfb2f0 Mon Sep 17 00:00:00 2001
From: Marek Susicky <marek.susicky@sec4good.cz>
Date: Wed, 25 Oct 2023 00:04:17 +0200
Subject: [PATCH 6/6] Fix for new behaviour of groupby pandas

---
 app/queries.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/queries.py b/app/queries.py
index 5a9baa38..0a5785ab 100644
--- a/app/queries.py
+++ b/app/queries.py
@@ -494,7 +494,7 @@ def count_registrations(filter_column, filter_value):
     df['rezervace_14_pocet'] = df[['pocet']].where(
         (df['rezervace'] == True) & (df['datum_rezervace_fix'] >= get_import_date() - timedelta(14)))
 
-    df = df.groupby(['vekova_skupina', 'povolani']).sum()
+    df = df.groupby(['vekova_skupina', 'povolani'], group_keys=False, level=0).sum()
 
     df['uspesnost_7'] = ((df['registrace_7_rez'] / df['registrace_7']) * 100).replace({np.nan: None})
     # df['uspesnost_14'] = ((df['registrace_14_rez'] / df['registrace_14']) * 100).replace({np.nan: None})