From 673f78e987b02281ad012b6d697fe03fbd0bf3ef Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 30 Jan 2021 22:01:23 +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()
---
 .../blueprints/admin/templates/admin/admin_info.html   |  2 +-
 .../blueprints/admin/templates/admin/admin_tasks.html  |  2 +-
 covid19/blueprints/vaccination/vaccination_views.py    | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/covid19/blueprints/admin/templates/admin/admin_info.html b/covid19/blueprints/admin/templates/admin/admin_info.html
index 04baf972..2f3f9caf 100644
--- a/covid19/blueprints/admin/templates/admin/admin_info.html
+++ b/covid19/blueprints/admin/templates/admin/admin_info.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'admin/fragments/fragments/fragment_admin_navtabs.html' %}
+  {% include 'admin/fragments/fragment_admin_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/covid19/blueprints/admin/templates/admin/admin_tasks.html b/covid19/blueprints/admin/templates/admin/admin_tasks.html
index 766b2df8..d30234c9 100644
--- a/covid19/blueprints/admin/templates/admin/admin_tasks.html
+++ b/covid19/blueprints/admin/templates/admin/admin_tasks.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'admin/fragments/fragments/fragment_admin_navtabs.html' %}
+  {% include 'admin/fragments/fragment_admin_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}
diff --git a/covid19/blueprints/vaccination/vaccination_views.py b/covid19/blueprints/vaccination/vaccination_views.py
index 5bd3e9f2..767bebb8 100644
--- a/covid19/blueprints/vaccination/vaccination_views.py
+++ b/covid19/blueprints/vaccination/vaccination_views.py
@@ -33,7 +33,7 @@ def task_vaccination_update_initial(self):
     return result
 
 
-@app.route('/info')
+@app_vaccination.route('/info')
 def url_vaccination_info():
     page_info = ApplicationPage('Vaccination', "Info")
     return render_template(
@@ -41,7 +41,7 @@ def url_vaccination_info():
         page_info=page_info)
 
 
-@app.route('/tasks')
+@app_vaccination.route('/tasks')
 def url_vaccination_tasks():
     page_info = ApplicationPage('Vaccination', "Tasks")
     return render_template(
@@ -49,7 +49,7 @@ def url_vaccination_tasks():
         page_info=page_info)
 
 
-@app.route('/update/initial')
+@app_vaccination.route('/update/initial')
 def url_vaccination_update_data():
     vaccination_service.run_download()
     flash("vaccination_service.run_download done")
@@ -58,8 +58,8 @@ def url_vaccination_update_data():
     return redirect(url_for('url_vaccination_tasks'))
 
 
-@app.route('/timeline/germany/page/<int:page>')
-@app.route('/timeline/germany')
+@app_vaccination.route('/timeline/germany/page/<int:page>')
+@app_vaccination.route('/timeline/germany')
 def url_vaccination_timeline_germany(page=1):
     page_info = ApplicationPage('Vaccination', "Germany Timeline")
     page_data = VaccinationGermanyTimeline.get_all_as_page(page)
-- 
GitLab