From c1126e07fbdefb09a525c6baa927cb38b8ccf713 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sun, 2 May 2021 14:50:55 +0200
Subject: [PATCH] working on: 0.0.32 Release
---
src/covid19/blueprints/admin/admin_views.py | 12 ++++-----
.../admin/templates/admin/admin_tasks.html | 27 ++++++++-----------
src/covid19/blueprints/who/who_service.py | 16 +++++++++++
src/covid19/static/css/covid19python.css | 5 ++++
4 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py
index 309f4571..8abdb170 100644
--- a/src/covid19/blueprints/admin/admin_views.py
+++ b/src/covid19/blueprints/admin/admin_views.py
@@ -149,12 +149,12 @@ def task_admin_update_fact_table_incremental_only(self):
logger.info("------------------------------------------------------------")
logger.info(" task_admin_update_fact_table_incremental_only [start] ")
logger.info("------------------------------------------------------------")
- who_service.update_fact_table_only()
- ecdc_service.update_fact_table_only()
- owid_service.update_fact_table_only()
- rki_vaccination_service.update_fact_table_only()
- # rki_service_bundeslaender.update_fact_table_incremental_only()
- # rki_service_landkreise.update_fact_table_incremental_only()
+ who_service.service_update.update_fact_table()
+ ecdc_service.service_update.update_fact_table()
+ owid_service.service_update.update_fact_table()
+ rki_vaccination_service.service_update.update_fact_table()
+ # rki_service_bundeslaender.service_update.update_fact_table()
+ # rki_service_landkreise.service_update.update_fact_table()
logger.info("------------------------------------------------------------")
logger.info(" task_admin_update_fact_table_incremental_only [done] ")
logger.info("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
index 4a18f286..8d317875 100644
--- a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
+++ b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
@@ -23,6 +23,7 @@
</div>
<div class="row">
<div class="col">
+ <h4>full update</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-secondary btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_full_update_star_schema') }}"
@@ -30,6 +31,7 @@
</div>
</div>
<div class="col">
+ <h4>update</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-danger btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_update_star_schema') }}"
@@ -39,6 +41,7 @@
</div>
<div class="row">
<div class="col">
+ <h4>full update</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-success btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_download_all_files') }}"
@@ -55,6 +58,7 @@
</div>
</div>
<div class="col">
+ <h4>update</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-success btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_download_all_files') }}"
@@ -73,18 +77,19 @@
</div>
<div class="row">
<div class="col">
+ <h4>System Test</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-warning btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_alive_message') }}"
role="button">Admin :: alive message</a>
</div>
- <p></p>
+ <h4>Database</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-secondary btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_database_dropcreate') }}"
role="button">Admin :: database :: drop_create :: only</a>
</div>
- <p></p>
+ <h4>Database</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-primary btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_database_dump') }}"
@@ -93,13 +98,13 @@
href="{{ url_for( 'app_admin.url_task_admin_database_dump_reimport') }}"
role="button">Admin :: database :: dump :: reimport</a>
</div>
- <p></p>
+ <h4>Database CRUD</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-secondary btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_admin_index') }}"
- role="button">Admin :: database :: Flask Admin</a>
+ role="button">Admin :: database :: CRUD :: Flask Admin</a>
</div>
- <p></p>
+ <h4>Test</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-primary btn-lg btn-block text-left"
href="{{ url_for( 'who.url_who_mytest') }}"
@@ -107,22 +112,12 @@
</div>
</div>
<div class="col">
- <p></p>
+ <h4>Data Source Files Downloads</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
- <a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_task_admin_database_dump') }}"
- role="button">Admin :: database :: dump</a>
<a class="btn btn-success btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_download_all_files') }}"
role="button">Admin :: all_files :: download</a>
- <a class="btn btn-danger btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_task_admin_update_star_schema') }}"
- role="button">Admin :: all_files :: update star_schema :: incremental</a>
- <a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'app_admin.url_task_admin_full_update_star_schema') }}"
- role="button">Admin :: all_files :: update star_schema :: initial</a>
</div>
- <p></p>
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/who/who_service.py b/src/covid19/blueprints/who/who_service.py
index 849f2812..a3464424 100644
--- a/src/covid19/blueprints/who/who_service.py
+++ b/src/covid19/blueprints/who/who_service.py
@@ -59,6 +59,22 @@ class WhoService:
self.service_update_full.full_update_star_schema()
return self
+ def run_update_star_schema_initial(self):
+ self.service_import.import_file()
+ self.service_update_full.full_update_star_schema()
+ return self
+ def run_update_star_schema_incremental(self):
+ self.service_import.import_file()
+ self.service_update.update_star_schema()
+ return self
+
+ def pretask_database_drop_create(self):
+ flash("self.service_download.download_file() start")
+ app.logger.info("self.service_download.download_file() start")
+ self.service_download.download_file()
+ app.logger.info("self.service_download.download_file() done")
+ flash("self.service_download.download_file() done")
+ return self
diff --git a/src/covid19/static/css/covid19python.css b/src/covid19/static/css/covid19python.css
index 1d507175..84a46c92 100644
--- a/src/covid19/static/css/covid19python.css
+++ b/src/covid19/static/css/covid19python.css
@@ -1,2 +1,7 @@
/* (c) 2021 Thomas Woehlke <https://github.com/thomaswoehlke> */
+col,
+btn-group-vertical {
+ padding: 1rem;
+}
+
--
GitLab