From dc2ccc91f46d9684abc9a6ace5d8060cba8badd1 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sun, 2 May 2021 16:27:50 +0200
Subject: [PATCH] working on: 0.0.32 Release
---
.../admin/templates/admin/admin_tasks.html | 8 +++----
.../owid/templates/owid/owid_tasks.html | 6 ++---
.../who/templates/who/who_tasks.html | 24 ++++++-------------
.../blueprints/who/who_service_update.py | 3 +--
4 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
index e7587b2b..b3edd734 100644
--- a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
+++ b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
@@ -27,7 +27,7 @@
<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"
+ <a class="btn btn-danger btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_full_update_star_schema') }}"
role="button">Admin :: update :: star_schema :: full</a>
</div>
@@ -35,7 +35,7 @@
<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"
+ <a class="btn btn-primary btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_update_star_schema') }}"
role="button">Admin :: update :: star_schema</a>
</div>
@@ -54,7 +54,7 @@
<a class="btn btn-warning btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_update_full_dimension_tables') }}"
role="button">Admin :: update :: dimension_tables :: full</a>
- <a class="btn btn-danger btn-lg btn-block text-left"
+ <a class="btn btn-secondary btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_update_full_fact_tables') }}"
role="button">Admin :: update :: fact_tables :: full</a>
</div>
@@ -71,7 +71,7 @@
<a class="btn btn-warning btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_update_dimension_tables') }}"
role="button">Admin :: update :: dimension_tables</a>
- <a class="btn btn-danger btn-lg btn-block text-left"
+ <a class="btn btn-secondary btn-lg btn-block text-left"
href="{{ url_for( 'app_admin.url_task_admin_update_fact_tables') }}"
role="button">Admin :: update :: fact_table</a>
</div>
diff --git a/src/covid19/blueprints/owid/templates/owid/owid_tasks.html b/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
index 004fd401..b1637c07 100644
--- a/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
+++ b/src/covid19/blueprints/owid/templates/owid/owid_tasks.html
@@ -9,7 +9,7 @@
<div class="col">
<h4>Full Update</h4>
<div class="btn-group-vertical" role="group" aria-label="Views">
- <a class="btn btn-primary btn-lg btn-block text-left"
+ <a class="btn btn-danger btn-lg btn-block text-left"
href="{{ url_for( 'owid.url_task_owid_update_star_schema_initial') }}"
role="button">OWID :: Task :: update :: star_schema :: full</a>
</div>
@@ -36,7 +36,7 @@
<a class="btn btn-warning btn-lg btn-block text-left"
href="{{ url_for( 'owid.url_task_owid_update_dimension_tables_initial_only') }}"
role="button">OWID :: Task :: update :: dimension-tables :: full</a>
- <a class="btn btn-danger btn-lg btn-block text-left"
+ <a class="btn btn-secondary btn-lg btn-block text-left"
href="{{ url_for( 'owid.url_task_owid_update_fact_table_initial_only') }}"
role="button">OWID :: Task :: update :: fact-table :: full</a>
</div>
@@ -53,7 +53,7 @@
<a class="btn btn-warning btn-lg btn-block text-left"
href="{{ url_for( 'owid.url_task_owid_update_dimension_tables_incremental_only') }}"
role="button">OWID :: Task :: update :: dimension-tables</a>
- <a class="btn btn-danger btn-lg btn-block text-left"
+ <a class="btn btn-secondary btn-lg btn-block text-left"
href="{{ url_for( 'owid.url_task_owid_update_fact_table_incremental_only') }}"
role="button">OWID :: Task :: update :: fact-table</a>
</div>
diff --git a/src/covid19/blueprints/who/templates/who/who_tasks.html b/src/covid19/blueprints/who/templates/who/who_tasks.html
index 2bbe0581..ce8cbe3f 100644
--- a/src/covid19/blueprints/who/templates/who/who_tasks.html
+++ b/src/covid19/blueprints/who/templates/who/who_tasks.html
@@ -7,18 +7,13 @@
<div class="container">
<div class="row">
<div class="col">
+ <h4>Full 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( 'who.url_task_who_full_update_star_schema') }}"
- role="button">WHO :: Task :: full update :: star_schema</a>
+ role="button">WHO :: Task :: update :: star_schema :: full</a>
</div>
- <p></p>
- <div class="btn-group-vertical" role="group" aria-label="Views">
- <a class="btn btn-success btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_download_files') }}"
- role="button">WHO :: download :: files</a>
- </div>
- <p></p>
+ <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( 'who.url_task_download_files') }}"
@@ -28,25 +23,20 @@
role="button">WHO :: Task :: import :: files</a>
<a class="btn btn-warning btn-lg btn-block text-left"
href="{{ url_for( 'who.url_task_who_full_update_dimension_tables') }}"
- role="button">WHO :: Task :: full update :: dimension_tables</a>
+ role="button">WHO :: Task :: update :: dimension_tables :: full</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
href="{{ url_for( 'who.url_task_who_full_update_fact_table') }}"
- role="button">WHO :: Task :: full update :: fact-table</a>
+ role="button">WHO :: Task :: update :: fact-table :: full</a>
</div>
</div>
<div class="col">
+ <h4>Update</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_task_who_update_star_schema') }}"
role="button">WHO :: Task :: update :: star_schema</a>
</div>
- <p></p>
- <div class="btn-group-vertical" role="group" aria-label="Views">
- <a class="btn btn-success btn-lg btn-block text-left"
- href="{{ url_for( 'who.url_download_files') }}"
- role="button">WHO :: download :: files</a>
- </div>
- <p></p>
+ <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( 'who.url_task_download_files') }}"
diff --git a/src/covid19/blueprints/who/who_service_update.py b/src/covid19/blueprints/who/who_service_update.py
index 326aa3ef..2af11ac6 100644
--- a/src/covid19/blueprints/who/who_service_update.py
+++ b/src/covid19/blueprints/who/who_service_update.py
@@ -13,7 +13,6 @@ class WhoServiceUpdateBase:
self.cfg = config
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" WhoServiceUpdateBase [ready]")
- return self
class WhoServiceUpdateFull(WhoServiceUpdateBase):
@@ -154,7 +153,7 @@ class WhoServiceUpdateFull(WhoServiceUpdateBase):
self.__full_update_data()
app.logger.info(" WhoServiceUpdateFull.full_update_star_schema [done]")
app.logger.info("------------------------------------------------------------")
- return self
+ return None
class WhoServiceUpdate(WhoServiceUpdateBase):
--
GitLab