From 2aa7dde0294ad0d269009315ee71841d925850ff Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 26 May 2021 23:32:25 +0200
Subject: [PATCH] Refactoring: vaccination
---
.../app_all/navigation/app_all_navbar_dropdown.html | 2 +-
.../templates/app_application/navigation/navbar.html | 6 ++++--
.../templates/app_application/navigation/navtabs.html | 2 ++
src/flask_covid19/blueprints/data_rki/rki_views.py | 4 ++++
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/flask_covid19/blueprints/app_all/templates/app_all/navigation/app_all_navbar_dropdown.html b/src/flask_covid19/blueprints/app_all/templates/app_all/navigation/app_all_navbar_dropdown.html
index 1bf4ade2..97e6edfe 100644
--- a/src/flask_covid19/blueprints/app_all/templates/app_all/navigation/app_all_navbar_dropdown.html
+++ b/src/flask_covid19/blueprints/app_all/templates/app_all/navigation/app_all_navbar_dropdown.html
@@ -1,7 +1,7 @@
{% if current_user.is_authenticated %}
<li class="dropdown">
<a class="dropdown-toggle nav-link" data-toggle="dropdown" href="javascript:void(0)">
- Admin<i class="glyphicon glyphicon-chevron-down small"></i>
+ All<i class="glyphicon glyphicon-chevron-down small"></i>
</a>
<ul class="dropdown-menu">
<li>
diff --git a/src/flask_covid19/blueprints/app_web/templates/app_application/navigation/navbar.html b/src/flask_covid19/blueprints/app_web/templates/app_application/navigation/navbar.html
index 6050b215..274d2bfc 100644
--- a/src/flask_covid19/blueprints/app_web/templates/app_application/navigation/navbar.html
+++ b/src/flask_covid19/blueprints/app_web/templates/app_application/navigation/navbar.html
@@ -22,11 +22,13 @@
{% include 'rki/navigation/rki_navbar_dropdown.html' %}
- {% include 'ecdc/navigation/ecdc_navbar_dropdown.html' %}
-
{% include 'vaccination/navigation/vaccination_navbar_dropdown.html' %}
+ {% include 'ecdc/navigation/ecdc_navbar_dropdown.html' %}
+
+ {#
{% include 'divi/navigation/divi_navbar_dropdown.html' %}
+ #}
{% include 'app_admin/navigation/app_admin_navbar_dropdown.html' %}
diff --git a/src/flask_covid19/blueprints/app_web/templates/app_application/navigation/navtabs.html b/src/flask_covid19/blueprints/app_web/templates/app_application/navigation/navtabs.html
index a1b167ae..bf4f4222 100644
--- a/src/flask_covid19/blueprints/app_web/templates/app_application/navigation/navtabs.html
+++ b/src/flask_covid19/blueprints/app_web/templates/app_application/navigation/navtabs.html
@@ -42,12 +42,14 @@
ECDC
</a>
</li>
+ {#
<li class="nav-item">
<a class="nav-link"
href="{{ url_for( 'divi.url_divi_info') }}">
DIVI
</a>
</li>
+ #}
<li class="nav-item">
<a class="nav-link"
href="{{ url_for( 'app_admin.url_admin_info') }}">
diff --git a/src/flask_covid19/blueprints/data_rki/rki_views.py b/src/flask_covid19/blueprints/data_rki/rki_views.py
index 56167f30..15519632 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_views.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_views.py
@@ -8,6 +8,7 @@ from flask_login import login_required
from database import app, admin, db, celery
from flask_covid19.blueprints.app_web.web_dispachter_matrix_service import rki_service
from flask_covid19.blueprints.data_rki.rki_model import RkiData, RkiMeldedatum, RkiBundesland, RkiLandkreis
+from flask_covid19.blueprints.data_rki.rki_model import RkiRefDatum, RkiDatenstand, RkiAltersgruppe
from flask_covid19.blueprints.data_rki.rki_model_import import RkiImport, RkiFlat
from flask_covid19.blueprints.app_web.web_model_transient import WebPageContent
@@ -21,9 +22,12 @@ app_rki = Blueprint(
admin.add_view(ModelView(RkiImport, db.session, category="RKI"))
admin.add_view(ModelView(RkiFlat, db.session, category="RKI"))
+admin.add_view(ModelView(RkiRefDatum, db.session, category="RKI"))
+admin.add_view(ModelView(RkiDatenstand, db.session, category="RKI"))
admin.add_view(ModelView(RkiMeldedatum, db.session, category="RKI"))
admin.add_view(ModelView(RkiBundesland, db.session, category="RKI"))
admin.add_view(ModelView(RkiLandkreis, db.session, category="RKI"))
+admin.add_view(ModelView(RkiAltersgruppe, db.session, category="RKI"))
admin.add_view(ModelView(RkiData, db.session, category="RKI"))
--
GitLab