From 2c565c62cf1e9bcf3087434fe7aec18cc6636b64 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 13 Feb 2021 18:04:26 +0100
Subject: [PATCH] ## 0.0.15 Release * ------------------------------------- *
Fixed #88 rename VaccinationImport to VaccinationImport * Fixed #89 change
tablename from vaccination_germany_timeline_import to vaccination_import *
Fixed #86 rename VaccinationData to VaccinationData * Fixed #162 rename table
vaccination_germany_timeline into vaccination_data *
------------------------------------- * Fixed #170 implement
url_vaccination_task_update_star_schema_initial in vaccination_views.py *
Fixed #171 implement url_vaccination_task_update_starschema_incremental in
vaccination_views.py * Fixed #172 implement url_vaccination_task_import_only
in vaccination_views.py * Fixed #173 implement
url_vaccination_task_import_only in vaccination_views.py * Fixed #174
implement url_vaccination_task_update_dimensiontables_only in
vaccination_views.py * Fixed #175 implement
url_vaccination_task_update_facttable_incremental_only in
vaccination_views.py * Fixed #176 implement
url_vaccination_task_update_facttable_initial_only in vaccination_views.py *
------------------------------------- * Fixed #91 implement
VaccinationService.run_download_only * Fixed #92 implement
VaccinationService.run_import_only * Fixed #93 implement
VaccinationService.run_update_dimension_tables_only * Fixed #94 implement
VaccinationService.run_update_fact_table_incremental_only * Fixed #95
implement VaccinationService.run_update_fact_table_initial_only * Fixed #96
implement VaccinationService.run_update_star_schema_incremental * Fixed #97
implement VaccinationService.run_update_star_schema_initial * Fixed #101
implement VaccinationServiceUpdate.update_dimension_tables_only * Fixed #102
implement VaccinationServiceUpdate.update_fact_table_incremental_only * Fixed
#103 implement VaccinationServiceUpdate.update_fact_table_initial_only *
Fixed #104 implement VaccinationServiceUpdate.update_star_schema_incremental
* Fixed #105 implement VaccinationServiceUpdate.update_star_schema_initial *
------------------------------------- * Fixed #90 refactor VaccinationService
to new method scheme introduced 07.02.2021 * Fixed #98 refactor
VaccinationServiceDownload to new method scheme introduced 07.02.2021 * Fixed
#99 refactor VaccinationServiceImport to new method scheme introduced
07.02.2021 * Fixed #100 refactor VaccinationServiceUpdate to new method
scheme introduced 07.02.2021 * ------------------------------------- * Fixed
#87 change to: Vaccination.datum many to one VaccinationDateReported * Fixed
#106 add Tasks and URLs for starting Tasks to vaccination_views *
-------------------------------------
---
.../fragment_flashed_messages.html | 0
.../{ => fragments}/fragment_navbar.html | 2 +-
.../{ => fragments}/fragment_navtabs.html | 0
.../{ => fragments}/fragment_pagination.html | 0
.../ecdc/templates/ecdc/ecdc_imported.html | 11 ++++---
.../fragment_ecdc_navbar_dropdown.html | 32 ++++++++++++-------
.../ecdc/fragments/fragment_ecdc_navtabs.html | 21 ++++++++----
.../fragment_ecdc_table_continent.html | 2 +-
.../fragment_ecdc_table_country.html | 8 ++---
.../fragments/fragment_ecdc_table_data.html | 22 ++++++-------
.../fragment_ecdc_table_date_reported.html | 2 +-
...ent_rki_bundeslaender_navbar_dropdown.html | 0
.../fragment_rki_bundeslaender_navtabs.html | 0
...agment_rki_landkreise_navbar_dropdown.html | 0
.../fragment_rki_landkreise_navtabs.html | 0
15 files changed, 60 insertions(+), 40 deletions(-)
rename src/covid19/blueprints/application/templates/application/{ => fragments}/fragment_flashed_messages.html (100%)
rename src/covid19/blueprints/application/templates/application/{ => fragments}/fragment_navbar.html (94%)
rename src/covid19/blueprints/application/templates/application/{ => fragments}/fragment_navtabs.html (100%)
rename src/covid19/blueprints/application/templates/application/{ => fragments}/fragment_pagination.html (100%)
rename src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/{ => fragments}/fragment_rki_bundeslaender_navbar_dropdown.html (100%)
rename src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/{ => fragments}/fragment_rki_bundeslaender_navtabs.html (100%)
rename src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/{ => fragments}/fragment_rki_landkreise_navbar_dropdown.html (100%)
rename src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/{ => fragments}/fragment_rki_landkreise_navtabs.html (100%)
diff --git a/src/covid19/blueprints/application/templates/application/fragment_flashed_messages.html b/src/covid19/blueprints/application/templates/application/fragments/fragment_flashed_messages.html
similarity index 100%
rename from src/covid19/blueprints/application/templates/application/fragment_flashed_messages.html
rename to src/covid19/blueprints/application/templates/application/fragments/fragment_flashed_messages.html
diff --git a/src/covid19/blueprints/application/templates/application/fragment_navbar.html b/src/covid19/blueprints/application/templates/application/fragments/fragment_navbar.html
similarity index 94%
rename from src/covid19/blueprints/application/templates/application/fragment_navbar.html
rename to src/covid19/blueprints/application/templates/application/fragments/fragment_navbar.html
index 1d521772..f898c5c6 100644
--- a/src/covid19/blueprints/application/templates/application/fragment_navbar.html
+++ b/src/covid19/blueprints/application/templates/application/fragments/fragment_navbar.html
@@ -15,7 +15,7 @@
{% include 'who/fragments/fragment_who_navbar_dropdown.html' %}
- {% include 'ecdc/fragments/fragment_europe_navbar_dropdown.html' %}
+ {% include 'ecdc/fragments/fragment_ecdc_navbar_dropdown.html' %}
{% include 'rki_vaccination/fragments/fragment_vaccination_navbar_dropdown.html' %}
diff --git a/src/covid19/blueprints/application/templates/application/fragment_navtabs.html b/src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/application/templates/application/fragment_navtabs.html
rename to src/covid19/blueprints/application/templates/application/fragments/fragment_navtabs.html
diff --git a/src/covid19/blueprints/application/templates/application/fragment_pagination.html b/src/covid19/blueprints/application/templates/application/fragments/fragment_pagination.html
similarity index 100%
rename from src/covid19/blueprints/application/templates/application/fragment_pagination.html
rename to src/covid19/blueprints/application/templates/application/fragments/fragment_pagination.html
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
index ac2ccead..bd04c539 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/ecdc_imported.html
@@ -24,7 +24,8 @@
<ul class="pagination">
{% if page_data.has_prev %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('ecdc.url_europe_data_imported', page=page_data.prev_num) }}">Previous</a>
+ <a class="page-link"
+ href="{{ url_for('ecdc.url_ecdc_data_imported', page=page_data.prev_num) }}">Previous</a>
</li>
{% endif %}
<!-- all page numbers -->
@@ -32,7 +33,8 @@
{% if page_num %}
{% if page_num != page_data.page %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('ecdc.url_europe_data_imported', page=page_num) }}">{{ page_num }}</a>
+ <a class="page-link"
+ href="{{ url_for('ecdc.url_ecdc_data_imported', page=page_num) }}">{{ page_num }}</a>
</li>
{% else %}
<li class="page-item active">
@@ -48,13 +50,14 @@
<!-- next page -->
{% if page_data.has_next %}
<li class="page-item">
- <a class="page-link" href="{{ url_for('ecdc.url_europe_data_imported', page=page_data.next_num) }}">Next</a>
+ <a class="page-link"
+ href="{{ url_for('ecdc.url_ecdc_data_imported', page=page_data.next_num) }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
- {% include 'ecdc/fragments/fragment_europe_table_data_imported.html' %}
+ {% include 'ecdc/fragments/fragment_ecdc_table_data_imported.html' %}
{% endblock %}
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navbar_dropdown.html b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navbar_dropdown.html
index e58db870..8d537560 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navbar_dropdown.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navbar_dropdown.html
@@ -1,24 +1,34 @@
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown"
role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- Europe
+ ECDC
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<!-- TODO: change URL to for_url() -->
- <a class="dropdown-item" href="/europe/date_reported/all">Europe</a>
+ <a class="dropdown-item"
+ href="/europe/date_reported/all">Europe</a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/europe/country/germany">Europe Germany</a>
+ <a class="dropdown-item"
+ href="/europe/country/germany">Europe Germany</a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/europe/date_reported/all">Europe date_reported</a>
- <a class="dropdown-item" href="/europe/continent/all">Europe continent</a>
- <a class="dropdown-item" href="/europe/country/all">Europe country</a>
+ <a class="dropdown-item"
+ href="/europe/date_reported/all">Europe date_reported</a>
+ <a class="dropdown-item"
+ href="/europe/continent/all">Europe continent</a>
+ <a class="dropdown-item"
+ href="/europe/country/all">Europe country</a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/europe/update/initial">Task: Europe :: update :: initial</a>
- <a class="dropdown-item" href="/europe/update/short">Task: Europe :: update :: short</a>
+ <a class="dropdown-item"
+ href="/europe/update/initial">Task: Europe :: update :: initial</a>
+ <a class="dropdown-item"
+ href="/europe/update/short">Task: Europe :: update :: short</a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/europe/imported">Europe imported</a>
+ <a class="dropdown-item"
+ href="/europe/imported">Europe imported</a>
<div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/europe/info">Europe Info</a>
- <a class="dropdown-item" href="/europe/tasks">Europe Tasks</a>
+ <a class="dropdown-item"
+ href="/europe/info">Europe Info</a>
+ <a class="dropdown-item"
+ href="/europe/tasks">Europe Tasks</a>
</div>
</li>
\ No newline at end of file
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html
index c1127d6a..c9cc8221 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_navtabs.html
@@ -2,25 +2,32 @@
<ul class="nav nav-tabs">
<!-- TODO: change URL to for_url() -->
<li class="nav-item">
- <a class="nav-link" href="/europe/info">Europe Info</a>
+ <a class="nav-link"
+ href="/europe/info">Europe Info</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="/europe/tasks">Europe tasks</a>
+ <a class="nav-link"
+ href="/europe/tasks">Europe tasks</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="/europe/date_reported/all">Europe date_reported</a>
+ <a class="nav-link"
+ href="/europe/date_reported/all">Europe date_reported</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="/europe/country/germany">Europe Germany</a>
+ <a class="nav-link"
+ href="/europe/country/germany">Europe Germany</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="/europe/continent/all">Europe continent</a>
+ <a class="nav-link"
+ href="/europe/continent/all">Europe continent</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="/europe/country/all">Europe country</a>
+ <a class="nav-link"
+ href="/europe/country/all">Europe country</a>
</li>
<li class="nav-item">
- <a class="nav-link" href="/europe/imported">Europe imported</a>
+ <a class="nav-link"
+ href="/europe/imported">Europe imported</a>
</li>
</ul>
</nav>
\ No newline at end of file
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_continent.html b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_continent.html
index 2d3f3ff8..2b8cada6 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_continent.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_continent.html
@@ -9,7 +9,7 @@
<tr>
<td>
<!-- TODO: change URL to for_url() -->
- <a href="/europe/continent/{{ europe_continent.id }}">
+ <a href="/ecdc/continent/{{ europe_continent.id }}">
{{ europe_continent.continent_exp }}
</a>
</td>
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_country.html b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_country.html
index dea70ea6..7676b453 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_country.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_country.html
@@ -14,23 +14,23 @@
<tr>
<!-- TODO: change URL to for_url() -->
<td>
- <a href="/europe/country/{{ europe_country.id }}">
+ <a href="/ecdc/country/{{ europe_country.id }}">
{{ europe_country.countries_and_territories }}
</a>
</td>
<td>{{ europe_country.pop_data_2019 }}</td>
<td>
- <a href="/europe/country/{{ europe_country.id }}">
+ <a href="/ecdc/country/{{ europe_country.id }}">
{{ europe_country.geo_id }}
</a>
</td>
<td>
- <a href="/europe/country/{{ europe_country.id }}">
+ <a href="/ecdc/country/{{ europe_country.id }}">
{{ europe_country.country_territory_code }}
</a>
</td>
<td>
- <a href="/europe/continent/{{ europe_country.continent.id }}">
+ <a href="/ecdc/continent/{{ europe_country.continent.id }}">
{{ europe_country.continent.continent_exp }}
</a>
</td>
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_data.html b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_data.html
index fe3f9e44..7716e815 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_data.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_data.html
@@ -3,7 +3,7 @@
<tr>
<!-- TODO: change URL to for_url() -->
<th scope="col">
- <a href="/europe/date_reported/all">date rep</a>
+ <a href="/ecdc/date_reported/all">date rep</a>
</th>
<th scope="col">year_week</th>
<th scope="col">
@@ -42,23 +42,23 @@
notification rate per 100000 population 14days
{% endif %}
</th>
- <th scope="col"><a href="/europe/country/all">countries and territories</a></th>
+ <th scope="col"><a href="/ecdc/country/all">countries and territories</a></th>
<th scope="col">population data 2019</th>
- <th scope="col"><a href="/europe/country/all">geo id</a></th>
- <th scope="col"><a href="/europe/country/all">country territory code</a></th>
- <th scope="col"><a href="/europe/continent/all">continent</a></th>
+ <th scope="col"><a href="/ecdc/country/all">geo id</a></th>
+ <th scope="col"><a href="/ecdc/country/all">country territory code</a></th>
+ <th scope="col"><a href="/ecdc/continent/all">continent</a></th>
</tr>
</thead>
<tbody>
{% for europe_data in page_data.items %}
<tr>
<td>
- <a href="/europe/date_reported/{{ europe_data.europe_date_reported.id }}">
+ <a href="/ecdc/date_reported/{{ europe_data.europe_date_reported.id }}">
{{ europe_data.europe_date_reported.get_name_for_datum() }}
</a>
</td>
<td>
- <a href="/europe/date_reported/{{ europe_data.europe_date_reported.id }}">
+ <a href="/ecdc/date_reported/{{ europe_data.europe_date_reported.id }}">
{{ europe_data.europe_date_reported.year_week }}
</a>
</td>
@@ -66,23 +66,23 @@
<td>{{ europe_data.cases_weekly }}</td>
<td>{{ europe_data.notification_rate_per_100000_population_14days }}</td>
<td>
- <a href="/europe/country/{{ europe_data.europe_country.id }}">
+ <a href="/ecdc/country/{{ europe_data.europe_country.id }}">
{{ europe_data.europe_country.countries_and_territories }}
</a>
</td>
<td>{{ europe_data.europe_country.pop_data_2019 }}</td>
<td>
- <a href="/europe/country/{{ europe_data.europe_country.id }}">
+ <a href="/ecdc/country/{{ europe_data.europe_country.id }}">
{{ europe_data.europe_country.geo_id }}
</a>
</td>
<td>
- <a href="/europe/country/{{ europe_data.europe_country.id }}">
+ <a href="/ecdc/country/{{ europe_data.europe_country.id }}">
{{ europe_data.europe_country.country_territory_code }}
</a>
</td>
<td>
- <a href="/europe/continent/{{ europe_data.europe_country.continent.id }}">
+ <a href="/ecdc/continent/{{ europe_data.europe_country.continent.id }}">
{{ europe_data.europe_country.continent.continent_exp }}
</a>
</td>
diff --git a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_date_reported.html b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_date_reported.html
index 7ea7cb14..0b9557a5 100644
--- a/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_date_reported.html
+++ b/src/covid19/blueprints/ecdc/templates/ecdc/fragments/fragment_ecdc_table_date_reported.html
@@ -15,7 +15,7 @@
{{ europe_date_reported.get_name_for_weekday() }}
</td>
<td class="text-left">
- <a href="/europe/date_reported/{{ europe_date_reported.id }}">
+ <a href="/ecdc/date_reported/{{ europe_date_reported.id }}">
{{ europe_date_reported }}
</a>
</td>
diff --git a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragment_rki_bundeslaender_navbar_dropdown.html b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navbar_dropdown.html
similarity index 100%
rename from src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragment_rki_bundeslaender_navbar_dropdown.html
rename to src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navbar_dropdown.html
diff --git a/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragment_rki_bundeslaender_navtabs.html b/src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragment_rki_bundeslaender_navtabs.html
rename to src/covid19/blueprints/rki_bundeslaender/templates/rki_bundeslaender/fragments/fragment_rki_bundeslaender_navtabs.html
diff --git a/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragment_rki_landkreise_navbar_dropdown.html b/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navbar_dropdown.html
similarity index 100%
rename from src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragment_rki_landkreise_navbar_dropdown.html
rename to src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navbar_dropdown.html
diff --git a/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragment_rki_landkreise_navtabs.html b/src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html
similarity index 100%
rename from src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragment_rki_landkreise_navtabs.html
rename to src/covid19/blueprints/rki_landkreise/templates/rki_landkreise/fragments/fragment_rki_landkreise_navtabs.html
--
GitLab