From 40db7a6b9ec82ca2597cadcc80eef7b5344c4103 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 4 May 2021 20:04:20 +0200
Subject: [PATCH] working on: 0.0.33 Release
---
src/covid19/blueprints/ecdc/ecdc_views.py | 78 +++++++++++--------
.../ecdc/templates/ecdc/ecdc_tasks.html | 20 ++---
2 files changed, 55 insertions(+), 43 deletions(-)
diff --git a/src/covid19/blueprints/ecdc/ecdc_views.py b/src/covid19/blueprints/ecdc/ecdc_views.py
index a7e011ed..535d80f7 100644
--- a/src/covid19/blueprints/ecdc/ecdc_views.py
+++ b/src/covid19/blueprints/ecdc/ecdc_views.py
@@ -283,59 +283,71 @@ def task_ecdc_update_star_schema_initial(self):
# ----------------------------------------------------------------------------------------------------------------
-# TODO: #163 implement url_ecdc_task_update_star_schema_initial in europe_views.py
-@app_ecdc.route('/task/update/star_schema/initial')
-def url_ecdc_task_update_star_schema_initial():
- flash("url_ecdc_task_update_star_schema_initial started")
- ecdc_service.run_download_only()
- task_ecdc_update_star_schema_initial.apply_async()
- return redirect(url_for('ecdc.url_ecdc_tasks'))
-
-
-# TODO: #164 implement url_ecdc_task_update_starschema_incremental in europe_views.py
-@app_ecdc.route('/task/update/star_schema/incremental')
-def url_ecdc_task_update_starschema_incremental():
- flash("url_ecdc_task_update_starschema_incremental started")
- ecdc_service.run_download_only()
- task_ecdc_update_star_schema_incremental.apply_async()
- return redirect(url_for('ecdc.url_ecdc_tasks'))
-
-
# TODO: #165 implement url_ecdc_task_download_only in europe_views.py
-@app_ecdc.route('/task/download/only')
-def url_ecdc_task_download_only():
- flash("url_ecdc_task_download_only started")
+@app_ecdc.route('/task/download')
+def url_ecdc_task_download():
+ flash("url_ecdc_task_download started")
ecdc_service.run_download_only()
return redirect(url_for('ecdc.url_ecdc_tasks'))
# TODO: #166 implement url_ecdc_task_import_only in europe_views.py
-@app_ecdc.route('/task/import/only')
-def url_ecdc_task_import_only():
- flash("url_ecdc_task_import_only started")
+@app_ecdc.route('/task/import')
+def url_ecdc_task_import():
+ flash("url_ecdc_task_import started")
task_ecdc_import_only.apply_async()
return redirect(url_for('ecdc.url_ecdc_tasks'))
# TODO: #167 implement url_ecdc_task_update_dimensiontables_only in europe_views.py
-@app_ecdc.route('/task/update/dimension-tables/only')
-def url_ecdc_task_update_dimensiontables_only():
- flash("url_ecdc_task_update_dimensiontables_only started")
+@app_ecdc.route('/task/update/dimension-tables')
+def url_ecdc_task_update_dimensiontables():
+ flash("url_ecdc_task_update_dimensiontables started")
task_ecdc_update_dimension_tables_only.apply_async()
return redirect(url_for('ecdc.url_ecdc_tasks'))
+# TODO: #167 implement url_ecdc_task_update_dimensiontables_only in europe_views.py
+@app_ecdc.route('/task/update/full/dimension-tables')
+def url_ecdc_task_full_update_dimensiontables():
+ flash("url_ecdc_task_full_update_dimensiontables started")
+ task_ecdc_update_dimension_tables_only.apply_async()
+ return redirect(url_for('ecdc.url_ecdc_tasks'))
+
+
+# url_ecdc_task_update_facttable_incremental_only
# TODO: #168 implement url_ecdc_task_update_facttable_incremental_only in europe_views.py
-@app_ecdc.route('/task/update/fact-table/incremental/only')
-def url_ecdc_task_update_facttable_incremental_only():
- flash("url_ecdc_task_update_facttable_incremental_only started")
+@app_ecdc.route('/task/update/fact-table')
+def url_ecdc_task_update_facttable():
+ flash("url_ecdc_task_update_facttable started")
task_ecdc_update_fact_table_incremental_only.apply_async()
return redirect(url_for('ecdc.url_ecdc_tasks'))
+# url_ecdc_task_update_facttable_initial_only
# TODO: #169 implement url_ecdc_task_update_facttable_initial_only in europe_views.py
-@app_ecdc.route('/task/update/fact-table/initial/only')
-def url_ecdc_task_update_facttable_initial_only():
- flash("url_ecdc_task_update_facttable_initial_only started")
+@app_ecdc.route('/task/full/update/fact-table')
+def url_ecdc_task_full_update_facttable():
+ flash("url_ecdc_task_full_update_facttable started")
task_ecdc_update_fact_table_initial_only.apply_async()
return redirect(url_for('ecdc.url_ecdc_tasks'))
+
+
+# url_ecdc_task_update_star_schema_initial
+# TODO: #163 implement url_ecdc_task_update_star_schema_initial in europe_views.py
+@app_ecdc.route('/task/update/full/star_schema')
+def url_ecdc_task_full_update_star_schema():
+ flash("url_ecdc_task_full_update_star_schema started")
+ ecdc_service.run_download_only()
+ task_ecdc_update_star_schema_initial.apply_async()
+ return redirect(url_for('ecdc.url_ecdc_tasks'))
+
+
+# url_ecdc_task_update_starschema_incremental
+# TODO: #164 implement url_ecdc_task_update_starschema_incremental in europe_views.py
+@app_ecdc.route('/task/update/star_schema')
+def url_ecdc_task_update_starschema():
+ flash("url_ecdc_task_update_starschema started")
+ ecdc_service.run_download_only()
+ task_ecdc_update_star_schema_incremental.apply_async()
+ return redirect(url_for('ecdc.url_ecdc_tasks'))
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html
index 5a5a304c..c1b73865 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_tasks.html
@@ -9,14 +9,14 @@
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-danger btn-lg btn-block text-left"
- href="{{ url_for( 'ecdc.url_ecdc_task_update_star_schema_initial') }}"
+ href="{{ url_for( 'ecdc.url_ecdc_task_full_update_star_schema') }}"
role="button">ECDC :: Task :: update :: star_schema :: full</a>
</div>
</div>
<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="{{ url_for( 'ecdc.url_ecdc_task_update_starschema_incremental') }}"
+ href="{{ url_for( 'ecdc.url_ecdc_task_update_starschema') }}"
role="button">ECDC :: Task :: update :: star_schema</a>
</div>
</div>
@@ -26,32 +26,32 @@
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-success btn-lg btn-block text-left"
- href="{{ url_for( 'ecdc.url_ecdc_task_download_only') }}"
+ href="{{ url_for( 'ecdc.url_ecdc_task_download') }}"
role="button">ECDC :: Task :: download</a>
<a class="btn btn-info btn-lg btn-block text-left"
- href="{{ url_for( 'ecdc.url_ecdc_task_import_only') }}"
+ href="{{ url_for( 'ecdc.url_ecdc_task_import') }}"
role="button">ECDC :: Task :: import</a>
<a class="btn btn-warning btn-lg btn-block text-left"
- href="{{ url_for( 'ecdc.url_ecdc_task_update_dimensiontables_only') }}"
+ href="{{ url_for( 'ecdc.url_ecdc_task_full_update_dimensiontables') }}"
role="button">ECDC :: Task :: update :: dimension-tables :: full</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'ecdc.url_ecdc_task_update_facttable_initial_only') }}"
+ href="{{ url_for( 'ecdc.url_ecdc_task_full_update_facttable') }}"
role="button">ECDC :: Task :: update :: fact-table :: full</a>
</div>
</div>
<div class="col">
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-success btn-lg btn-block text-left"
- href="{{ url_for( 'ecdc.url_ecdc_task_download_only') }}"
+ href="{{ url_for( 'ecdc.url_ecdc_task_download') }}"
role="button">ECDC :: Task :: download</a>
<a class="btn btn-info btn-lg btn-block text-left"
- href="{{ url_for( 'ecdc.url_ecdc_task_import_only') }}"
+ href="{{ url_for( 'ecdc.url_ecdc_task_import') }}"
role="button">ECDC :: Task :: import</a>
<a class="btn btn-warning btn-lg btn-block text-left"
- href="{{ url_for( 'ecdc.url_ecdc_task_update_dimensiontables_only') }}"
+ href="{{ url_for( 'ecdc.url_ecdc_task_update_dimensiontables') }}"
role="button">ECDC :: Task :: update :: dimension-tables</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'ecdc.url_ecdc_task_update_facttable_incremental_only') }}"
+ href="{{ url_for( 'ecdc.url_ecdc_task_update_facttable') }}"
role="button">ECDC :: Task :: update :: fact-table</a>
</div>
</div>
--
GitLab