* 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/rki_bundeslaender/templates/rki_bundeslaender/fragment_rki_navbar_dropdown.html

@@ -5,10 +5,10 @@
                     </a>
                     <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                         <!-- TODO: change URL to for_url() -->
-                        <a class="dropdown-item" href="/rki/info">RKI</a>
+                        <a class="dropdown-item" href="/rki/bundeslaender/info">RKI</a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item" href="/rki/imported">RKI imported</a>
+                        <a class="dropdown-item" href="/rki/bundeslaender/imported">RKI imported</a>
                         <div class="dropdown-divider"></div>
-                        <a class="dropdown-item" href="/rki/tasks">RKI Tasks</a>
+                        <a class="dropdown-item" href="/rki/bundeslaender/tasks">RKI Tasks</a>
                     </div>
                 </li>

src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragment_rki_navtabs.html

@@ -2,13 +2,13 @@
                 <ul class="nav nav-tabs">
                     <li class="nav-item">
                         <!-- TODO: change URL to for_url() -->
-                        <a class="nav-link" href="/rki/info">RKI Info</a>
+                        <a class="nav-link" href="/rki/bundeslaender/info">RKI Info</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="/rki/tasks">RKI tasks</a>
+                        <a class="nav-link" href="/rki/bundeslaender/stasks">RKI tasks</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="/rki/imported">RKI imported</a>
+                        <a class="nav-link" href="/rki/bundeslaender/imported">RKI imported</a>
                     </li>
                 </ul>
             </nav>
\ No newline at end of file

src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_bundeslaender_imported.html

@@ -9,7 +9,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'rki/fragment_rki_navtabs.html' %}
+  {% include 'rki_bundeslaender/fragment_rki_navtabs.html' %}
 {% endblock %}
 
 
@@ -20,7 +20,8 @@
         <ul class="pagination">
         {% if page_data.has_prev %}
         <li class="page-item">
-            <a class="page-link" href="{{ url_for('rki.url_rki_imported', page=page_data.prev_num) }}">Previous</a>
+            <a class="page-link"
+               href="{{ url_for('rki_bundeslaender.url_rki_imported', page=page_data.prev_num) }}">Previous</a>
         </li>
         {% endif %}
         <!-- all page numbers -->
@@ -28,7 +29,8 @@
             {% if page_num %}
                 {% if page_num != page_data.page %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('rki.url_rki_imported', page=page_num) }}">{{ page_num }}</a>
+                        <a class="page-link"
+                           href="{{ url_for('rki_bundeslaender.url_rki_imported', page=page_num) }}">{{ page_num }}</a>
                     </li>
                 {% else %}
                     <li class="page-item active">
@@ -44,7 +46,8 @@
         <!-- next page -->
         {% if page_data.has_next %}
         <li class="page-item">
-            <a class="page-link" href="{{ url_for('rki.url_rki_imported', page=page_data.next_num) }}">Next</a>
+            <a class="page-link"
+               href="{{ url_for('rki_bundeslaender.url_rki_imported', page=page_data.next_num) }}">Next</a>
         </li>
         {% endif %}
         </ul>

src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_info.html

@@ -7,7 +7,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'rki/fragment_rki_navtabs.html' %}
+  {% include 'rki_bundeslaender/fragment_rki_navtabs.html' %}
 {% endblock %}
 
 

src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_landkreise_imported.html

@@ -9,7 +9,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'rki/fragment_rki_navtabs.html' %}
+  {% include 'rki_bundeslaender/fragment_rki_navtabs.html' %}
 {% endblock %}
 
 
@@ -20,7 +20,8 @@
         <ul class="pagination">
         {% if page_data.has_prev %}
         <li class="page-item">
-            <a class="page-link" href="{{ url_for('rki.url_rki_imported', page=page_data.prev_num) }}">Previous</a>
+            <a class="page-link"
+               href="{{ url_for('rki_bundeslaender.url_rki_imported', page=page_data.prev_num) }}">Previous</a>
         </li>
         {% endif %}
         <!-- all page numbers -->
@@ -28,7 +29,8 @@
             {% if page_num %}
                 {% if page_num != page_data.page %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('rki.url_rki_imported', page=page_num) }}">{{ page_num }}</a>
+                        <a class="page-link"
+                           href="{{ url_for('rki_bundeslaender.url_rki_imported', page=page_num) }}">{{ page_num }}</a>
                     </li>
                 {% else %}
                     <li class="page-item active">
@@ -44,7 +46,8 @@
         <!-- next page -->
         {% if page_data.has_next %}
         <li class="page-item">
-            <a class="page-link" href="{{ url_for('rki.url_rki_imported', page=page_data.next_num) }}">Next</a>
+            <a class="page-link"
+               href="{{ url_for('rki_bundeslaender.url_rki_imported', page=page_data.next_num) }}">Next</a>
         </li>
         {% endif %}
         </ul>

src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/rki_tasks.html

@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block navigation_navtabs %}
-  {% include 'rki/fragment_rki_navtabs.html' %}
+  {% include 'rki_bundeslaender/fragment_rki_navtabs.html' %}
 {% endblock %}
 
 {% block main_container %}

src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragment_rki_navtabs.html

@@ -2,13 +2,13 @@
                 <ul class="nav nav-tabs">
                     <li class="nav-item">
                         <!-- TODO: change URL to for_url() -->
-                        <a class="nav-link" href="/rki/info">RKI Info</a>
+                        <a class="nav-link" href="/rki/landkreise/info">RKI Info</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="/rki/tasks">RKI tasks</a>
+                        <a class="nav-link" href="/rki/landkreise/tasks">RKI tasks</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="/rki/imported">RKI imported</a>
+                        <a class="nav-link" href="/rki/landkreise/imported">RKI imported</a>
                     </li>
                 </ul>
             </nav>
\ No newline at end of file

src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_info.html

@@ -7,7 +7,7 @@
 
 
 {% block navigation_navtabs %}
-  {% include 'rki/fragment_rki_navtabs.html' %}
+  {% include 'rki_landkreise/fragment_rki_navtabs.html' %}
 {% endblock %}
 
 

src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/rki_landkreise_imported.html

@@ -20,7 +20,7 @@
         <ul class="pagination">
         {% if page_data.has_prev %}
         <li class="page-item">
-            <a class="page-link" href="{{ url_for('rki.url_rki_imported', page=page_data.prev_num) }}">Previous</a>
+            <a class="page-link" href="{{ url_for('rki_landkreise.url_rki_imported', page=page_data.prev_num) }}">Previous</a>
         </li>
         {% endif %}
         <!-- all page numbers -->
@@ -28,7 +28,7 @@
             {% if page_num %}
                 {% if page_num != page_data.page %}
                     <li class="page-item">
-                        <a class="page-link" href="{{ url_for('rki.url_rki_imported', page=page_num) }}">{{ page_num }}</a>
+                        <a class="page-link" href="{{ url_for('rki_landkreise.url_rki_imported', page=page_num) }}">{{ page_num }}</a>
                     </li>
                 {% else %}
                     <li class="page-item active">
@@ -44,7 +44,7 @@
         <!-- next page -->
         {% if page_data.has_next %}
         <li class="page-item">
-            <a class="page-link" href="{{ url_for('rki.url_rki_imported', page=page_data.next_num) }}">Next</a>
+            <a class="page-link" href="{{ url_for('rki_landkreise.url_rki_imported', page=page_data.next_num) }}">Next</a>
         </li>
         {% endif %}
         </ul>