* Fixed #123 split RkiBundeslaenderService into two Services, one for...

* 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

src/covid19/blueprints/admin/admin_views.py

@@ -5,13 +5,10 @@ from celery.utils.log import get_task_logger
 from database import app
 from covid19.services import who_service, europe_service, vaccination_service, admin_service, rki_service_bundeslaender
 from covid19.workers import celery
-
 from covid19.blueprints.common.common_model_transient import ApplicationPage
 
-
 drop_and_create_data_again = True
 
-
 app_admin = Blueprint('admin', __name__, template_folder='templates')
 
 

src/covid19/blueprints/common/rki_model.py

-from sqlalchemy import and_
-from datetime import date
-from sqlalchemy.orm import joinedload
-
-from database import db, ITEMS_PER_PAGE
-from covid19.blueprints.common.common_model import CommonDateReported, CommonRegion
-

src/covid19/templates/common/fragment_navbar.html

@@ -19,10 +19,13 @@
 
                 {% include 'vaccination/fragments/fragment_vaccination_navbar_dropdown.html' %}
 
-                {% include 'rki/fragment_rki_navbar_dropdown.html' %}
+                {% include 'rki_bundeslaender/fragment_rki_navbar_dropdown.html' %}
+
+                {% include 'rki_landkreise/fragment_rki_navbar_dropdown.html' %}
 
                 {% include 'admin/fragments/fragment_admin_navbar_dropdown.html' %}
 
+                <!--
                 <li class="nav-item">
                     <a class="nav-link" href="#">Link</a>
                 </li>
@@ -30,6 +33,7 @@
                 <li class="nav-item">
                     <a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
                 </li>
+                -->
             </ul>
             <form class="form-inline my-2 my-lg-0">
                 <input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">

src/covid19/templates/common/fragment_navtabs.html

@@ -4,16 +4,19 @@
                         <a class="nav-link active" href="/home">Home</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="/who/info">WHO</a>
+                        <a class="nav-link" href="/who/tasks">WHO</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="/europe/info">Europe</a>
+                        <a class="nav-link" href="/europe/tasks">Europe</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="/vaccination/info">Vaccination</a>
+                        <a class="nav-link" href="/vaccination/tasks">Vaccination</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="/rki/info">RKI</a>
+                        <a class="nav-link" href="/rki/bundeslaender/tasks">RKI Bundeslaender</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="/rki/landkreise/tasks">RKI Landkreise</a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" href="/admin/tasks">Admin</a>