From e5707954d381ea79fb338bc5fbbd49244fee2241 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 30 Jan 2021 21:56:49 +0100
Subject: [PATCH] ### 0.0.13 Release * Fixed #49
EuropeServiceUpdate.__update_data_short() (wontfix) * Fixed #52 download
vaccination timeline data file * Fixed #53 import vaccination timeline data
file into db * Fixed #54 /vaccination/imported * Fixed #57 frontend: use npm
for handling 3rdParty css and javascript modules like jQuery, Bootstrap *
Fixed #58 frontend: remove jumbotron from all pageheader, put jumbotron as
main content on home page * Fixed #47 major refactoring: Routes from app.py
to org...who,europe,... (Doublette von #65) * Fixed #48 major refactoring:
Tasks from server_mq.py to org...who,europe,... (Doublette von #65) * Fixed
#64 major refactoring: create two packages: for web app and for celery worker
* Issue #65 major refactoring: add flask-blueprints for admin, common,
europe, rki, vaccination, who
### 0.0.14 Release
* Issue #66 frontend: migrate to Bootstrap Theme sb-admin-angular
* Issue #67 implement Flask-Login
### 0.0.15 Release
* Issue #5 Visual Graphs for Data per Countries order by Date
* Issue #59 frontend: add correct breadcrumb to every page
* Issue #60 frontend: better design for tables
* Issue #61 frontend: better design for navtabs
* Issue #62 frontend: better design for pages
* Issue #63 frontend: add footer design
### 0.0.16 Release
* Issue #28 /admin/database/import
* Issue #39 SQLalchemy instead of SQL: AllModelClasses.remove_all()
* Issue #40 SQLalchemy instead of SQL: EuropeDataImportTable.get_date_rep()
* Issue #41 SQLalchemy instead of SQL: EuropeDataImportTable.get_countries_of_continent()
* Issue #42 SQLalchemy instead of SQL: WhoGlobalDataImportTable.get_new_dates_as_array()
---
covid19/blueprints/admin/admin_views.py | 24 +++++++++++------------
covid19/blueprints/europe/europe_views.py | 24 +++++++++++------------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/covid19/blueprints/admin/admin_views.py b/covid19/blueprints/admin/admin_views.py
index dbf157a0..98e5a117 100644
--- a/covid19/blueprints/admin/admin_views.py
+++ b/covid19/blueprints/admin/admin_views.py
@@ -50,50 +50,50 @@ def task_admin_database_drop_create(self):
return result
-@app_admin.route('/admin/tasks')
+@app_admin.route('/tasks')
def url_admin_tasks():
page_info = ApplicationPage('Admin', "Tasks")
return render_template(
- 'templates/admin/admin_tasks.html',
+ 'admin/admin_tasks.html',
page_info=page_info)
-@app_admin.route('/admin/info')
+@app_admin.route('/info')
def url_admin_info():
page_info = ApplicationPage('Admin', "Info")
return render_template(
- 'templates/admin/admin_info.html',
+ 'admin/admin_info.html',
page_info=page_info)
-@app_admin.route('/admin/alive_message')
+@app_admin.route('/alive_message')
def url_alive_message_start():
app.logger.info("url_alive_message_start [start]")
task_admin_alive_message.apply_async()
flash("alive_message_task started")
app.logger.info("url_alive_message_start [done]")
- return redirect(url_for('url_admin_tasks'))
+ return redirect(url_for('admin.url_admin_tasks'))
-@app_admin.route('/admin/database/dump')
+@app_admin.route('/database/dump')
def url_admin_database_dump():
app.logger.info("url_admin_database_dump [start]")
admin_service.run_admin_database_dump()
flash("admin_service.run_admin_database_dump started")
app.logger.info("url_admin_database_dump [done]")
- return redirect(url_for('url_admin_tasks'))
+ return redirect(url_for('admin.url_admin_tasks'))
-@app_admin.route('/admin/database/import')
+@app_admin.route('/database/import')
def url_admin_database_import():
app.logger.info("url_admin_database_import [start]")
admin_service.run_admin_database_import()
flash("admin_service.run_admin_database_import started")
app.logger.info("url_admin_database_import [done]")
- return redirect(url_for('url_admin_tasks'))
+ return redirect(url_for('admin.url_admin_tasks'))
-@app_admin.route('/admin/database/drop')
+@app_admin.route('/database/drop')
def url_admin_database_drop():
app.logger.info("url_admin_database_drop [start]")
flash("admin_service.run_admin_database_drop started")
@@ -110,4 +110,4 @@ def url_admin_database_drop():
flash("task_admin_database_drop_create async started")
task_admin_database_drop_create.apply_async()
app.logger.info("url_admin_database_drop [done]")
- return redirect(url_for('url_admin_tasks'))
+ return redirect(url_for('admin.url_admin_tasks'))
diff --git a/covid19/blueprints/europe/europe_views.py b/covid19/blueprints/europe/europe_views.py
index b67b93d3..852bc29a 100644
--- a/covid19/blueprints/europe/europe_views.py
+++ b/covid19/blueprints/europe/europe_views.py
@@ -51,7 +51,7 @@ def task_europe_update_short(self):
def url_europe_info():
page_info = ApplicationPage('Europe', "Info")
return render_template(
- 'templates/europe/europe_info.html',
+ 'europe/europe_info.html',
title='Europe',
page_info=page_info)
@@ -60,7 +60,7 @@ def url_europe_info():
def url_europe_tasks():
page_info = ApplicationPage('Europe', "Tasks")
return render_template(
- 'templates/europe/europe_tasks.html',
+ 'europe/europe_tasks.html',
title='Europe Tasks',
page_info=page_info)
@@ -79,7 +79,7 @@ def url_europe_data_imported(page=1):
page_info = ApplicationPage('Europe', "Last Import")
page_data = EuropeDataImportTable.get_all_as_page(page)
return render_template(
- 'templates/europe/europe_imported.html',
+ 'europe/europe_imported.html',
page_data=page_data,
page_info=page_info)
@@ -90,7 +90,7 @@ def url_europe_date_reported_all(page=1):
page_info = ApplicationPage('Europe', "date_reported")
page_data = EuropeDateReported.get_all_as_page(page)
return render_template(
- 'templates/europe/date_reported/europe_date_reported_all.html',
+ 'europe/date_reported/europe_date_reported_all.html',
page_data=page_data,
page_info=page_info)
@@ -104,7 +104,7 @@ def url_europe_date_reported_one_notification_rate(europe_date_reported_id, page
europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id)
page_data = EuropeData.find_by_date_reported_notification_rate(europe_date_reported, page)
return render_template(
- 'templates/europe/date_reported/europe_date_reported_one_notification_rate.html',
+ 'europe/date_reported/europe_date_reported_one_notification_rate.html',
europe_date_reported=europe_date_reported,
page_data=page_data,
page_info=page_info)
@@ -117,7 +117,7 @@ def url_europe_date_reported_one_deaths_weekly(europe_date_reported_id, page=1):
europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id)
page_data = EuropeData.find_by_date_reported_deaths_weekly(europe_date_reported, page)
return render_template(
- 'templates/europe/date_reported/europe_date_reported_one_deaths_weekly.html',
+ 'europe/date_reported/europe_date_reported_one_deaths_weekly.html',
europe_date_reported=europe_date_reported,
page_data=page_data,
page_info=page_info)
@@ -130,7 +130,7 @@ def url_europe_date_reported_one_cases_weekly(europe_date_reported_id, page=1):
europe_date_reported = EuropeDateReported.get_by_id(europe_date_reported_id)
page_data = EuropeData.find_by_date_reported_cases_weekly(europe_date_reported, page)
return render_template(
- 'templates/europe/date_reported/europe_date_reported_one_cases_weekly.html',
+ 'europe/date_reported/europe_date_reported_one_cases_weekly.html',
europe_date_reported=europe_date_reported,
page_data=page_data,
page_info=page_info)
@@ -142,7 +142,7 @@ def url_europe_continent_all(page=1):
page_info = ApplicationPage('Europe', "continent")
page_data = EuropeContinent.get_all_as_page(page)
return render_template(
- 'templates/europe/continent/europe_continent_all.html',
+ 'europe/continent/europe_continent_all.html',
page_data=page_data,
page_info=page_info)
@@ -154,7 +154,7 @@ def url_europe_continent_one(continent_id, page=1):
continent = EuropeContinent.get_by_id(continent_id)
page_data = EuropeCountry.find_by_continent(continent, page)
return render_template(
- 'templates/europe/continent/europe_continent_one.html',
+ 'europe/continent/europe_continent_one.html',
continent=continent,
page_data=page_data,
page_info=page_info)
@@ -166,7 +166,7 @@ def url_europe_country_all(page=1):
page_info = ApplicationPage('Europe', "country")
page_data = EuropeCountry.get_all_as_page(page)
return render_template(
- 'templates/europe/country/europe_country_all.html',
+ 'europe/country/europe_country_all.html',
page_data=page_data,
page_info=page_info)
@@ -178,7 +178,7 @@ def url_europe_country_one(country_id, page=1):
europe_country = EuropeCountry.get_by_id(country_id)
page_data = EuropeData.find_by_country(europe_country, page)
return render_template(
- 'templates/europe/country/europe_country_one.html',
+ 'europe/country/europe_country_one.html',
europe_country=europe_country,
page_data=page_data,
page_info=page_info)
@@ -194,7 +194,7 @@ def url_europe_country_germany(page=1):
return redirect(url_for('url_europe_tasks'))
page_data = EuropeData.find_by_country(europe_country, page)
return render_template(
- 'templates/europe/country/europe_country_germany.html',
+ 'europe/country/europe_country_germany.html',
europe_country=europe_country,
page_data=page_data,
page_info=page_info)
--
GitLab