From a3317c7fc82c4e59904ab7367a6b56291517112c Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sun, 7 Feb 2021 17:00:17 +0100
Subject: [PATCH] dev for Milestone 0.0.14
---
.../who/templates/who/who_tasks.html | 22 +++++++++++--------
src/covid19/blueprints/who/who_views.py | 18 ++++++---------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/covid19/blueprints/who/templates/who/who_tasks.html b/src/covid19/blueprints/who/templates/who/who_tasks.html
index 8650161a..3b3bdbc8 100644
--- a/src/covid19/blueprints/who/templates/who/who_tasks.html
+++ b/src/covid19/blueprints/who/templates/who/who_tasks.html
@@ -10,16 +10,20 @@
{% block main_container %}
<div class="row">
- <div class="btn-group" role="group" aria-label="Views">
- <a class="btn btn-secondary btn-lg" href="/who/task/update/star_schema/initial" role="button">WHO :: Task :: update :: star_schema :: initial</a>
- <a class="btn btn-secondary btn-lg" href="/who/task/update/star_schema/incremental" role="button">WHO :: Task :: update :: star_schema :: incremental</a>
+ <div class="col">
+ <div class="btn-group-vertical" role="group" aria-label="Views">
+ <a class="btn btn-primary btn-lg btn-block text-left" href="/who/task/update/star_schema/initial" role="button">WHO :: Task :: update :: star_schema :: initial</a>
+ <a class="btn btn-primary btn-lg btn-block text-left" href="/who/task/update/star_schema/incremental" role="button">WHO :: Task :: update :: star_schema :: incremental</a>
+ </div>
</div>
- <div class="btn-group" role="group" aria-label="Views">
- <a class="btn btn-secondary btn-lg" href="/who/task/download/only" role="button">WHO :: Task :: download :: only</a>
- <a class="btn btn-secondary btn-lg" href="/who/task/import/only" role="button">WHO :: Task :: import :: only</a>
- <a class="btn btn-secondary btn-lg" href="/who/task/update/dimension-tables/only" role="button">WHO :: Task :: update :: dimension-tables : only</a>
- <a class="btn btn-secondary btn-lg" href="/who/task/update/fact-table/incremental/only" role="button">WHO :: Task :: update :: fact-table :: only :: incremental</a>
- <a class="btn btn-secondary btn-lg" href="/who/task/update/fact-table/initial/only" role="button">WHO :: Task :: update :: fact-table :: only :: initial</a>
+ <div class="col">
+ <div class="btn-group-vertical" role="group" aria-label="Views">
+ <a class="btn btn-secondary btn-lg btn-block text-left" href="/who/task/download/only" role="button">WHO :: Task :: download :: only</a>
+ <a class="btn btn-secondary btn-lg btn-block text-left" href="/who/task/import/only" role="button">WHO :: Task :: import :: only</a>
+ <a class="btn btn-secondary btn-lg btn-block text-left" href="/who/task/update/dimension-tables/only" role="button">WHO :: Task :: update :: dimension-tables : only</a>
+ <a class="btn btn-secondary btn-lg btn-block text-left" href="/who/task/update/fact-table/incremental/only" role="button">WHO :: Task :: update :: fact-table :: only :: incremental</a>
+ <a class="btn btn-secondary btn-lg btn-block text-left" href="/who/task/update/fact-table/initial/only" role="button">WHO :: Task :: update :: fact-table :: only :: initial</a>
+ </div>
</div>
</div>
{% endblock %}
diff --git a/src/covid19/blueprints/who/who_views.py b/src/covid19/blueprints/who/who_views.py
index bb4d7f5d..c067aa7e 100644
--- a/src/covid19/blueprints/who/who_views.py
+++ b/src/covid19/blueprints/who/who_views.py
@@ -119,7 +119,7 @@ def url_task_who_download_only():
who_service.run_download_only()
flash("who_service.run_download_only ok")
app.logger.info("url_who_task_download_only [done]")
- return redirect(url_for('url_who_tasks'))
+ return redirect(url_for('who.url_who_tasks'))
@app_who.route('/task/import/only')
@@ -129,7 +129,7 @@ def url_task_who_import_only():
flash("who_service.run_update started")
flash(message="long running background task started", category="warning")
app.logger.info("url_who_update_run [done]")
- return redirect(url_for('url_who_tasks'))
+ return redirect(url_for('who.url_who_tasks'))
@app_who.route('/task/update/dimension-tables/only')
@@ -139,31 +139,27 @@ def url_task_who_update_dimension_tables_only():
flash("task_who_update_dimension_tables_only started")
flash(message="long running background task started", category="warning")
app.logger.info("url_task_who_update_dimension_tables_only [done]")
- return redirect(url_for('url_who_tasks'))
+ return redirect(url_for('who.url_who_tasks'))
@app_who.route('/task/update/fact-table/incremental/only')
def url_task_who_update_fact_table_incremental_only():
app.logger.info("url_task_who_update_fact_table_incremental_only [start]")
- who_service.run_download_only()
- flash("who_service.run_download_only ok")
task_who_update_fact_table_incremental_only.apply_async()
flash("task_who_update_fact_table_incremental_only started")
flash(message="long running background task started", category="warning")
app.logger.info("url_task_who_update_fact_table_incremental_only [done]")
- return redirect(url_for('url_who_tasks'))
+ return redirect(url_for('who.url_who_tasks'))
@app_who.route('/task/update/fact-table/initial/only')
def url_task_who_update_fact_table_initial_only():
app.logger.info("url_task_who_update_fact_table_initial_only [start]")
- who_service.run_download_only()
- flash("who_service.who_service_download.download_file ok")
task_who_update_fact_table_initial_only.apply_async()
flash("task_who_update_fact_table_initial_only started")
flash(message="long running background task started", category="warning")
app.logger.info("url_who_task_update_full [done]")
- return redirect(url_for('url_who_tasks'))
+ return redirect(url_for('who.url_who_tasks'))
@app_who.route('/task/update/star_schema/initial')
@@ -175,7 +171,7 @@ def url_task_who_update_star_schema_initial():
flash("task_who_update_star_schema_initial started")
flash(message="long running background task started", category="warning")
app.logger.info("url_who_task_update_full [done]")
- return redirect(url_for('url_who_tasks'))
+ return redirect(url_for('who.url_who_tasks'))
@app_who.route('/task/update/star_schema/incremental')
@@ -187,7 +183,7 @@ def url_task_who_update_star_schema_incremental():
flash("task_who_run_update_full started")
flash(message="long running background task started", category="warning")
app.logger.info("url_task_who_update_star_schema_incremental [done]")
- return redirect(url_for('url_who_tasks'))
+ return redirect(url_for('who.url_who_tasks'))
@app_who.route('/info')
--
GitLab