diff --git a/src/covid19/app_views.py b/src/covid19/app_views.py
index 1a6a38e749c771bc0222b46e9892c5b6d65465b1..a5b98e3308450c3707a931dee3e404875df8274d 100644
--- a/src/covid19/app_views.py
+++ b/src/covid19/app_views.py
@@ -11,14 +11,14 @@ import covid19.blueprints.admin.admin_views
from covid19.blueprints.who.who_views import app_who
from covid19.blueprints.europe.europe_views import app_europe
-from covid19.blueprints.rki_vaccination.vaccination_views import app_vaccination
+from covid19.blueprints.rki_vaccination.vaccination_views import app_rki_vaccination
from covid19.blueprints.rki_landkreise.rki_views import app_rki_landkreise
from covid19.blueprints.rki_bundeslaender.rki_views import app_rki_bundeslaender
from covid19.blueprints.admin.admin_views import app_admin
app.register_blueprint(app_who, url_prefix='/who')
app.register_blueprint(app_europe, url_prefix='/europe')
-app.register_blueprint(app_vaccination, url_prefix='/vaccination')
+app.register_blueprint(app_rki_vaccination, url_prefix='/rki/vaccination')
app.register_blueprint(app_rki_bundeslaender, url_prefix='/rki/bundeslaender')
app.register_blueprint(app_rki_landkreise, url_prefix='/rki/landkreise')
app.register_blueprint(app_admin, url_prefix='/admin')
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_views.py b/src/covid19/blueprints/rki_bundeslaender/rki_views.py
index 88c991e78ad21c094cbdb29554e18ced24164590..d6994b369e5428118a36520e7f4f996d40475f7a 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_views.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_views.py
@@ -22,7 +22,7 @@ app_rki_bundeslaender = Blueprint(
def url_rki_info():
page_info = ApplicationPage('RKI', "Info")
return render_template(
- 'rki_bundeslaender/rki_info.html',
+ 'rki_bundeslaender/rki_bundeslaender_info.html',
page_info=page_info)
@@ -30,7 +30,7 @@ def url_rki_info():
def url_rki_tasks():
page_info = ApplicationPage('RKI', "Tasks")
return render_template(
- 'rki_bundeslaender/rki_tasks.html',
+ 'rki_bundeslaender/rki_bundeslaender_tasks.html',
page_info=page_info)
diff --git a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html
index 8ee058f65ff1baf8d4623b388ec6f0ece7ab5057..71fd07eac440a2dd47c75140bb64f98b15e66d72 100644
--- a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html
+++ b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html
@@ -9,7 +9,7 @@
{% block navigation_navtabs %}
- {% include 'rki_bundeslaender/fragment_rki_navtabs.html' %}
+ {% include 'rki_bundeslaender/fragment_rki_bundeslaender_navtabs.html' %}
{% endblock %}
@@ -21,7 +21,9 @@
{% if page_data.has_prev %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for('rki_bundeslaender.url_rki_imported', page=page_data.prev_num) }}">Previous</a>
+ href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_imported', page=page_data.prev_num) }}">
+ Previous
+ </a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -30,7 +32,9 @@
{% if page_num != page_data.page %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for('rki_bundeslaender.url_rki_imported', page=page_num) }}">{{ page_num }}</a>
+ href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_imported', page=page_num) }}">
+ {{ page_num }}
+ </a>
</li>
{% else %}
<li class="page-item active">
@@ -47,7 +51,9 @@
{% if page_data.has_next %}
<li class="page-item">
<a class="page-link"
- href="{{ url_for('rki_bundeslaender.url_rki_imported', page=page_data.next_num) }}">Next</a>
+ href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_imported', page=page_data.next_num) }}">
+ Next
+ </a>
</li>
{% endif %}
</ul>
diff --git a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html
index 62bdc2568aa4e19ac8b0f7224eddc9bd1601af71..ac2553991473a81166d0544a1e4c81e6b9ec65f4 100644
--- a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html
+++ b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_info.html
@@ -7,7 +7,7 @@
{% block navigation_navtabs %}
- {% include 'rki_bundeslaender/fragment_rki_navtabs.html' %}
+ {% include 'rki_bundeslaender/fragment_rki_bundeslaender_navtabs.html' %}
{% endblock %}
diff --git a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html
index 67f657b7e0070ad1eb7d38e5fd30265041619f1d..f26cea8de808f68432c1a56d6fe83bce3283158f 100644
--- a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html
+++ b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_tasks.html
@@ -19,29 +19,29 @@
<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="/rki/bundeslaender/task/update/star_schema/initial"
+ href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_task_update_starschema_initial') }}"
role="button">RKI :: Bundeslaender :: Task :: update :: star_schema :: initial</a>
<a class="btn btn-primary btn-lg btn-block text-left"
- href="/rki/bundeslaender/task/update/star_schema/incremental"
+ href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_task_update_starschema_incremental') }}"
role="button">RKI :: Bundeslaender :: Task :: update :: star_schema :: incremental</a>
</div>
</div>
<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="/rki/bundeslaender/task/download/only"
+ href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_task_download_only') }}"
role="button">RKI :: Bundeslaender :: Task :: download :: only</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="/rki/bundeslaender/task/import/only"
+ href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_task_import_only') }}"
role="button">RKI :: Bundeslaender :: Task :: import :: only</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="/rki/bundeslaender/task/update/dimension-tables/only"
+ href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_task_update_dimensiontables_only') }}"
role="button">RKI :: Bundeslaender :: Task :: update :: dimension-tables : only</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="/rki/bundeslaender/task/update/fact-table/incremental/only"
+ href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_task_update_facttable_incremental_only') }}"
role="button">RKI :: Bundeslaender :: Task :: update :: fact-table :: only :: incremental</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="/rki/bundeslaender/task/update/fact-table/initial/only"
+ href="{{ url_for('rki_bundeslaender.url_rki_bundeslaender_task_update_facttable_initial_only') }}"
role="button">RKI :: Bundeslaender :: Task :: update :: fact-table :: only :: initial</a>
</div>
</div>
diff --git a/src/covid19/blueprints/rki_landkreise/rki_views.py b/src/covid19/blueprints/rki_landkreise/rki_views.py
index d43cda833c2998f273e5b28c1eb26f2fbe15f0f2..a04a86e71ecfc9460f912110ba93e63f3b4c8c39 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_views.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_views.py
@@ -12,7 +12,10 @@ drop_and_create_data_again = True
app_rki_landkreise = Blueprint(
- 'rki_landkreise', __name__, template_folder='templates', url_prefix='/rki/landkreise')
+ 'rki_landkreise', __name__,
+ template_folder='templates',
+ url_prefix='/rki/landkreise'
+)
##################################################################################################################
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_vaccination_navbar_dropdown.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navbar_dropdown.html
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_vaccination_navbar_dropdown.html
rename to src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navbar_dropdown.html
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_vaccination_navtabs.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_vaccination_navtabs.html
rename to src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_navtabs.html
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_vaccination_timeline_germany_table.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_timeline_germany_table.html
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_vaccination_timeline_germany_table.html
rename to src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_timeline_germany_table.html
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_timeline_germany_table_head.html
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_vaccination_timeline_germany_table_head.html
rename to src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_timeline_germany_table_head.html
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/vaccination_data.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/vaccination_data.html
rename to src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/vaccination_import.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/vaccination_import.html
rename to src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_import.html
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/vaccination_info.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/vaccination_info.html
rename to src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_info.html
diff --git a/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/vaccination_tasks.html b/src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html
similarity index 100%
rename from src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/vaccination_tasks.html
rename to src/covid19/blueprints/rki_vaccination/templates/rki_vaccination/rki_vaccination_tasks.html
diff --git a/src/covid19/blueprints/rki_vaccination/vaccination_views.py b/src/covid19/blueprints/rki_vaccination/vaccination_views.py
index d4f16aa34f16ab064be5898543a2ccaa4f8ffc92..540d77376d0645b72b31696856d29d9590f74d33 100644
--- a/src/covid19/blueprints/rki_vaccination/vaccination_views.py
+++ b/src/covid19/blueprints/rki_vaccination/vaccination_views.py
@@ -3,15 +3,15 @@ from celery import states
from celery.utils.log import get_task_logger
from database import app
-from covid19.services import vaccination_service
-from covid19.workers import celery
+from covid19.app_services import vaccination_service
+from covid19.app_workers import celery
from covid19.blueprints.rki_vaccination.vaccination_model import VaccinationData, VaccinationDateReported
from covid19.blueprints.rki_vaccination.vaccination_model_import import VaccinationImport
from covid19.blueprints.common.common_model_transient import ApplicationPage
-app_vaccination = Blueprint('vaccination', __name__, template_folder='templates')
+app_rki_vaccination = Blueprint('rki_vaccination', __name__, template_folder='templates', url_prefix='/rki/vaccination')
##################################################################################################################
@@ -112,7 +112,7 @@ def task_vaccination_task_update_starschema_initial(self):
return result
-@app_vaccination.route('/info')
+@app_rki_vaccination('/info')
def url_vaccination_info():
page_info = ApplicationPage('Vaccination', "Info")
return render_template(
@@ -120,7 +120,7 @@ def url_vaccination_info():
page_info=page_info)
-@app_vaccination.route('/tasks')
+@app_rki_vaccination('/tasks')
def url_vaccination_tasks():
page_info = ApplicationPage('Vaccination', "Tasks")
return render_template(
@@ -128,8 +128,8 @@ def url_vaccination_tasks():
page_info=page_info)
-@app_vaccination.route('/imported/page/<int:page>')
-@app_vaccination.route('/imported')
+@app_rki_vaccination('/imported/page/<int:page>')
+@app_rki_vaccination('/imported')
def url_vaccination_imported(page=1):
page_info = ApplicationPage('Vaccination', "Data: Germany Timeline imported")
page_data = VaccinationImport.get_all_as_page(page)
@@ -139,8 +139,8 @@ def url_vaccination_imported(page=1):
page_info=page_info)
-@app_vaccination.route('/data/page/<int:page>')
-@app_vaccination.route('/data')
+@app_rki_vaccination('/data/page/<int:page>')
+@app_rki_vaccination('/data')
def url_vaccination_data(page=1):
page_info = ApplicationPage('Vaccination', "Data: Germany Timeline")
page_data = VaccinationData.get_all_as_page(page)
@@ -150,8 +150,8 @@ def url_vaccination_data(page=1):
page_info=page_info)
-@app_vaccination.route('/date-reported/all/page/<int:page>')
-@app_vaccination.route('/date-reported/all')
+@app_rki_vaccination('/date-reported/all/page/<int:page>')
+@app_rki_vaccination('/date-reported/all')
def url_vaccination_datereported_all(page=1):
page_info = ApplicationPage('Vaccination', "Germany Timeline")
page_data = VaccinationDateReported.get_all_as_page(page)
@@ -161,8 +161,8 @@ def url_vaccination_datereported_all(page=1):
page_info=page_info)
-@app_vaccination.route('/date-reported/<int:vaccination_date_reported_id>/page/<int:page>')
-@app_vaccination.route('/date-reported/<int:vaccination_date_reported_id>')
+@app_rki_vaccination('/date-reported/<int:vaccination_date_reported_id>/page/<int:page>')
+@app_rki_vaccination('/date-reported/<int:vaccination_date_reported_id>')
def url_vaccination_datereported_one(page=1, vaccination_date_reported_id=0):
page_info = ApplicationPage('Vaccination', "Germany Timeline")
datereported = VaccinationDateReported.find_by_id(vaccination_date_reported_id)
@@ -174,42 +174,42 @@ def url_vaccination_datereported_one(page=1, vaccination_date_reported_id=0):
page_info=page_info)
-@app_vaccination.route('/task/download/only')
+@app_rki_vaccination('/task/download/only')
def url_vaccination_task_download_only():
flash("url_vaccination_task_download_only started")
vaccination_service.run_download_only()
return redirect(url_for('vaccination.url_vaccination_tasks'))
-@app_vaccination.route('/task/import/only')
+@app_rki_vaccination('/task/import/only')
def url_vaccination_task_import_only():
flash("url_vaccination_task_import_only started")
task_vaccination_import_only.apply_async()
return redirect(url_for('vaccination.url_vaccination_tasks'))
-@app_vaccination.route('/task/update/dimension-tables/only')
+@app_rki_vaccination('/task/update/dimension-tables/only')
def url_vaccination_task_update_dimensiontables_only():
flash("url_vaccination_task_update_dimensiontables_only started")
task_vaccination_update_dimension_tables_only.apply_async()
return redirect(url_for('vaccination.url_vaccination_tasks'))
-@app_vaccination.route('/task/update/fact-table/incremental/only')
+@app_rki_vaccination('/task/update/fact-table/incremental/only')
def url_vaccination_task_update_facttable_incremental_only():
flash("url_vaccination_task_update_facttable_incremental_only started")
task_vaccination_update_facttable_incremental_only.apply_async()
return redirect(url_for('vaccination.url_vaccination_tasks'))
-@app_vaccination.route('/task/update/fact-table/initial/only')
+@app_rki_vaccination('/task/update/fact-table/initial/only')
def url_vaccination_task_update_facttable_initial_only():
flash("url_vaccination_task_update_facttable_initial_only started")
task_vaccination_update_facttable_initial_only.apply_async()
return redirect(url_for('vaccination.url_vaccination_tasks'))
-@app_vaccination.route('/task/update/star_schema/initial')
+@app_rki_vaccination('/task/update/star_schema/initial')
def url_vaccination_task_update_starschema_initial():
flash("url_vaccination_task_update_star_schemainitial started")
vaccination_service.run_download_only()
@@ -217,7 +217,7 @@ def url_vaccination_task_update_starschema_initial():
return redirect(url_for('vaccination.url_vaccination_tasks'))
-@app_vaccination.route('/task/update/star_schema/incremental')
+@app_rki_vaccination('/task/update/star_schema/incremental')
def url_vaccination_task_update_starschema_incremental():
flash("url_vaccination_task_update_starschema_incremental started")
vaccination_service.run_download_only()