From 40d60dba07fda29521575c70f59b346c9933874e Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 17 Feb 2021 10:33:05 +0100
Subject: [PATCH] ### 0.0.17 Release * Fixed #123 split RkiBundeslaenderService
into two Services, one for bundeslaender and one for landkreise * Fixed #128
add fields from csv to RkiLandkreiseImport * Fixed #139 refactor
RkiBundeslaenderServiceDownload to new method scheme introduced 07.02.2021 *
Fixed #140 move WhoImport to RKI in: rk_service_import.py * Fixed #125
implement RkiLandkreise * Fixed #126 implement RkiBundeslaenderImport
### 0.0.18 Release
* Fixed #39 SQLalchemy instead of SQL: AllModelClasses.remove_all()
* Fixed #40 SQLalchemy instead of SQL: EcdcImport.get_date_rep()
* Fixed #41 SQLalchemy instead of SQL: EcdcImport.get_countries_of_continent()
* Fixed #107 SQLalchemy instead of SQL in: EcdcImport.get_countries_of_continent
* Fixed #109 SQLalchemy instead of SQL in: EcdcImport.get_date_rep
* Fixed #110 SQLalchemy instead of SQL in: EcdcImport.get_continent
---
src/covid19/blueprints/admin/admin_views.py | 8 ++++++++
.../admin/templates/admin/admin_tasks.html | 10 +++++-----
.../fragment_admin_navbar_dropdown.html | 16 ++++++++--------
.../admin/fragments/fragment_admin_navtabs.html | 4 ++--
.../blueprints/admin/templates/admin/index.html | 10 +++++-----
.../application/fragments/fragment_navtabs.html | 2 +-
src/database.py | 2 +-
7 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/src/covid19/blueprints/admin/admin_views.py b/src/covid19/blueprints/admin/admin_views.py
index 1fcbdca0..37aefd56 100644
--- a/src/covid19/blueprints/admin/admin_views.py
+++ b/src/covid19/blueprints/admin/admin_views.py
@@ -48,6 +48,14 @@ def task_admin_database_drop_create(self):
return result
+@app.route('/')
+def url_admin_index():
+ page_info = ApplicationPage('Admin', "Covid19 Admin")
+ return render_template(
+ 'admin/index.html',
+ page_info=page_info)
+
+
@app_admin.route('/tasks')
def url_admin_tasks():
page_info = ApplicationPage('Admin', "Tasks")
diff --git a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
index adf2d7b8..f2092e1f 100644
--- a/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
+++ b/src/covid19/blueprints/admin/templates/admin/admin_tasks.html
@@ -13,19 +13,19 @@
<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="{{ url_for( 'admin.url_alive_message_start') }}"
+ href="{{ url_for( 'app_admin.url_alive_message_start') }}"
role="button">Admin :: alive message</a>
<a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'admin.url_admin_database_drop') }}"
+ href="{{ url_for( 'app_admin.url_admin_database_drop') }}"
role="button">Admin :: database :: drop_create</a>
<a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'admin.url_admin_database_dropcreate_only') }}"
+ href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}"
role="button">Admin :: database :: drop_create :: only</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'admin.url_admin_database_import') }}"
+ href="{{ url_for( 'app_admin.url_admin_database_import') }}"
role="button">Admin :: database :: import</a>
<a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'admin.url_admin_database_dump') }}"
+ href="{{ url_for( 'app_admin.url_admin_database_dump') }}"
role="button">Admin :: database :: dump</a>
</div>
</div>
diff --git a/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html b/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html
index e3f2673a..a062df93 100644
--- a/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html
+++ b/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navbar_dropdown.html
@@ -4,31 +4,31 @@
Admin
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
- <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_tasks') }}">
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_tasks') }}">
Admin
</a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_tasks') }}">
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_tasks') }}">
admin tasks
</a>
- <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_info') }}">
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_info') }}">
admin info
</a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="{{ url_for( 'admin.url_alive_message_start') }}">
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_alive_message_start') }}">
Task: Admin :: alive message
</a>
- <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_database_drop') }}">
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_drop') }}">
Task: Admin :: database :: drop_create and import
</a>
- <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_database_dropcreate_only') }}">
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}">
Task: Admin :: database :: drop_create only
</a>
- <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_database_dump') }}">
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_dump') }}">
Task: Admin :: database :: dump
</a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="{{ url_for( 'admin.url_admin_database_import') }}">
+ <a class="dropdown-item" href="{{ url_for( 'app_admin.url_admin_database_import') }}">
Task: Admin :: database :: import (TBD)
</a>
</div>
diff --git a/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html b/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html
index e519221a..c5289732 100644
--- a/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html
+++ b/src/covid19/blueprints/admin/templates/admin/fragments/fragment_admin_navtabs.html
@@ -3,11 +3,11 @@
<ul class="nav nav-tabs">
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'admin.url_admin_info') }}">admin Info</a>
+ href="{{ url_for( 'app_admin.url_admin_info') }}">admin Info</a>
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'admin.url_admin_tasks') }}">admin tasks</a>
+ href="{{ url_for( 'app_admin.url_admin_tasks') }}">admin tasks</a>
</li>
</ul>
</nav>
\ No newline at end of file
diff --git a/src/covid19/blueprints/admin/templates/admin/index.html b/src/covid19/blueprints/admin/templates/admin/index.html
index f378bf30..3ed5c8bc 100644
--- a/src/covid19/blueprints/admin/templates/admin/index.html
+++ b/src/covid19/blueprints/admin/templates/admin/index.html
@@ -8,19 +8,19 @@
<h3>Admin :: Tasks</h3>
<div class="btn-group-vertical" role="group" aria-label="Views">
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'admin.url_alive_message_start') }}"
+ href="{{ url_for( 'app_admin.url_alive_message_start') }}"
role="button">Admin :: alive message</a>
<a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'admin.url_admin_database_drop') }}"
+ href="{{ url_for( 'app_admin.url_admin_database_drop') }}"
role="button">Admin :: database :: drop_create</a>
<a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'admin.url_admin_database_dropcreate_only') }}"
+ href="{{ url_for( 'app_admin.url_admin_database_dropcreate_only') }}"
role="button">Admin :: database :: drop_create :: only</a>
<a class="btn btn-secondary btn-lg btn-block text-left"
- href="{{ url_for( 'admin.url_admin_database_import') }}"
+ href="{{ url_for( 'app_admin.url_admin_database_import') }}"
role="button">Admin :: database :: import</a>
<a class="btn btn-primary btn-lg btn-block text-left"
- href="{{ url_for( 'admin.url_admin_database_dump') }}"
+ href="{{ url_for( 'app_admin.url_admin_database_dump') }}"
role="button">Admin :: database :: dump</a>
</div>
</div>
diff --git a/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html b/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html
index 30a91965..6f8f636c 100644
--- a/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html
+++ b/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html
@@ -38,7 +38,7 @@
</li>
<li class="nav-item">
<a class="nav-link"
- href="{{ url_for( 'admin.url_admin_tasks') }}">
+ href="{{ url_for( 'app_admin.url_admin_tasks') }}">
Admin
</a>
</li>
diff --git a/src/database.py b/src/database.py
index 28bfd9be..39e2691f 100644
--- a/src/database.py
+++ b/src/database.py
@@ -18,7 +18,7 @@ app.config['SQLALCHEMY_DATABASE_URI'] = DB_URL
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False # silence the deprecation warning
run_run_with_debug = app.config['APP_DEBUGGER_ACTIVE']
app.config['FLASK_ADMIN_SWATCH'] = 'cerulean'
-admin = Admin(app, name='covid19', template_mode='bootstrap3')
+admin = Admin(app, name='covid19admin', template_mode='bootstrap4')
db = SQLAlchemy(app)
db.create_all()
--
GitLab