From 6467ff8469a07f0e3452dff59d9b48f9cb88e01a Mon Sep 17 00:00:00 2001 From: thomaswoehlke <thomas.woehlke@gmail.com> Date: Thu, 29 Apr 2021 20:16:07 +0200 Subject: [PATCH] working on: 0.0.32 Release --- .../country/divi_country_all_pagination.html | 6 ++--- .../divi/country/divi_country_all_table.html | 10 ++++---- .../divi_country_germany_pagination.html | 6 ++--- ...untry_one_cases_cumulative_pagination.html | 6 ++--- ...divi_country_one_cases_new_pagination.html | 6 ++--- ...ntry_one_deaths_cumulative_pagination.html | 6 ++--- .../country/divi_country_one_deaths_new.html | 6 ++--- ...ivi_country_one_deaths_new_pagination.html | 6 ++--- .../country/divi_country_one_pagination.html | 6 ++--- .../divi/country/divi_country_one_table.html | 24 +++++++++---------- .../divi_date_reported_all_pagination.html | 6 ++--- ...orted_one_cases_cumulative_pagination.html | 6 ++--- ...ate_reported_one_cases_new_pagination.html | 6 ++--- ...rted_one_deaths_cumulative_pagination.html | 6 ++--- .../divi_date_reported_one_pagination.html | 6 ++--- .../divi_date_reported_one_table.html | 24 +++++++++---------- .../templates/divi/divi_tasks.html | 14 +++++------ .../fragment_divi_imported_pagination.html | 6 ++--- .../fragment_divi_table_global_data.html | 8 +++---- .../region/divi_region_all_pagination.html | 6 ++--- .../region/divi_region_one_pagination.html | 6 ++--- 21 files changed, 88 insertions(+), 88 deletions(-) diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html index 6416bf0c..d4eb573e 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_pagination.html @@ -3,7 +3,7 @@ <ul class="pagination"> {% if page_data.has_prev %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_country_all', page=page_data.prev_num) }}">Previous</a> + <a class="page-link" href="{{ url_for('divi.url_divi_country_all', page=page_data.prev_num) }}">Previous</a> </li> {% endif %} <!-- all page numbers --> @@ -11,7 +11,7 @@ {% if page_num %} {% if page_num != page_data.page %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_country_all', page=page_num) }}">{{ page_num }}</a> + <a class="page-link" href="{{ url_for('divi.url_divi_country_all', page=page_num) }}">{{ page_num }}</a> </li> {% else %} <li class="page-item active"> @@ -27,7 +27,7 @@ <!-- next page --> {% if page_data.has_next %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_country_all', page=page_data.next_num) }}">Next</a> + <a class="page-link" href="{{ url_for('divi.url_divi_country_all', page=page_data.next_num) }}">Next</a> </li> {% endif %} </ul> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html index 9bb422cd..abdc46c9 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_all_table.html @@ -8,7 +8,7 @@ country code </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_region_all') }}">region</a> + <a href="{{ url_for('divi.url_divi_region_all') }}">region</a> </th> </tr> </thead> @@ -16,17 +16,17 @@ {% for divi_country in page_data.items %} <tr> <td> - <a href="{{ url_for('who.url_divi_country', country_id=divi_country.id) }}"> + <a href="{{ url_for('divi.url_divi_country', country_id=divi_country.id) }}"> {{ divi_country.country }} </a> </td> <td> - <a href="{{ url_for('who.url_divi_country', country_id=divi_country.id) }}"> + <a href="{{ url_for('divi.url_divi_country', country_id=divi_country.id) }}"> {{ divi_country.country_code }} </a> </td> <th> - <a href="{{ url_for('who.url_divi_region', region_id=divi_country.region.id) }}"> + <a href="{{ url_for('divi.url_divi_region', region_id=divi_country.region.id) }}"> {{ divi_country.region.region }} </a> </th> @@ -42,7 +42,7 @@ country code </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_region_all') }}">region</a> + <a href="{{ url_for('divi.url_divi_region_all') }}">region</a> </th> </tr> </tfoot> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html index 2f158697..71965df9 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_germany_pagination.html @@ -3,7 +3,7 @@ {% if page_data.has_prev %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_germany', country_id=divi_country.id, page=page_data.prev_num) }}"> + href="{{ url_for('divi.url_divi_germany', country_id=divi_country.id, page=page_data.prev_num) }}"> Previous </a> </li> @@ -13,7 +13,7 @@ {% if page_num != page_data.page %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_germany', country_id=divi_country.id, page=page_num) }}"> + href="{{ url_for('divi.url_divi_germany', country_id=divi_country.id, page=page_num) }}"> {{ page_num }} </a> </li> @@ -31,7 +31,7 @@ {% if page_data.has_next %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_germany', country_id=divi_country.id, page=page_data.next_num) }}"> + href="{{ url_for('divi.url_divi_germany', country_id=divi_country.id, page=page_data.next_num) }}"> Next </a> </li> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html index ed138a32..a4892f3a 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_cumulative_pagination.html @@ -3,7 +3,7 @@ {% if page_data.has_prev %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_data.prev_num) }}"> + href="{{ url_for('divi.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_data.prev_num) }}"> Previous </a> </li> @@ -13,7 +13,7 @@ {% if page_num != page_data.page %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_num) }}"> + href="{{ url_for('divi.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_num) }}"> {{ page_num }} </a> </li> @@ -31,7 +31,7 @@ {% if page_data.has_next %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_data.next_num) }}"> + href="{{ url_for('divi.url_divi_country_cases_cumulative', country_id=divi_country.id, page=page_data.next_num) }}"> Next </a> </li> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html index 5fe0b4fd..ac8c9a38 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_cases_new_pagination.html @@ -3,7 +3,7 @@ {% if page_data.has_prev %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_cases_new', country_id=divi_country.id, page=page_data.prev_num) }}"> + href="{{ url_for('divi.url_divi_country_cases_new', country_id=divi_country.id, page=page_data.prev_num) }}"> Previous </a> </li> @@ -13,7 +13,7 @@ {% if page_num != page_data.page %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_cases_new', country_id=divi_country.id, page=page_num) }}"> + href="{{ url_for('divi.url_divi_country_cases_new', country_id=divi_country.id, page=page_num) }}"> {{ page_num }} </a> </li> @@ -31,7 +31,7 @@ {% if page_data.has_next %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_cases_new', country_id=divi_country.id, page=page_data.next_num) }}"> + href="{{ url_for('divi.url_divi_country_cases_new', country_id=divi_country.id, page=page_data.next_num) }}"> Next </a> </li> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html index b21dd80b..25f8e2db 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_cumulative_pagination.html @@ -3,7 +3,7 @@ {% if page_data.has_prev %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_data.prev_num) }}"> + href="{{ url_for('divi.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_data.prev_num) }}"> Previous </a> </li> @@ -13,7 +13,7 @@ {% if page_num != page_data.page %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_num) }}"> + href="{{ url_for('divi.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_num) }}"> {{ page_num }} </a> </li> @@ -31,7 +31,7 @@ {% if page_data.has_next %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_data.next_num) }}"> + href="{{ url_for('divi.url_divi_country_deaths_cumulative', country_id=divi_country.id, page=page_data.next_num) }}"> Next </a> </li> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html index ef88f3ca..843cbfec 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new.html @@ -12,7 +12,7 @@ {% if page_data.has_prev %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.prev_num) }}"> + href="{{ url_for('divi.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.prev_num) }}"> Previous </a> </li> @@ -22,7 +22,7 @@ {% if page_num != page_data.page %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_num) }}"> + href="{{ url_for('divi.url_divi_country_deaths_new', country_id=divi_country.id, page=page_num) }}"> {{ page_num }} </a> </li> @@ -40,7 +40,7 @@ {% if page_data.has_next %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.next_num) }}"> + href="{{ url_for('divi.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.next_num) }}"> Next </a> </li> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html index b1471e8c..6b838160 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_deaths_new_pagination.html @@ -3,7 +3,7 @@ {% if page_data.has_prev %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.prev_num) }}"> + href="{{ url_for('divi.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.prev_num) }}"> Previous </a> </li> @@ -13,7 +13,7 @@ {% if page_num != page_data.page %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_num) }}"> + href="{{ url_for('divi.url_divi_country_deaths_new', country_id=divi_country.id, page=page_num) }}"> {{ page_num }} </a> </li> @@ -31,7 +31,7 @@ {% if page_data.has_next %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.next_num) }}"> + href="{{ url_for('divi.url_divi_country_deaths_new', country_id=divi_country.id, page=page_data.next_num) }}"> Next </a> </li> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html index ac27722a..0eb916d3 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_pagination.html @@ -3,7 +3,7 @@ {% if page_data.has_prev %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country', country_id=divi_country.id, page=page_data.prev_num) }}"> + href="{{ url_for('divi.url_divi_country', country_id=divi_country.id, page=page_data.prev_num) }}"> Previous </a> </li> @@ -13,7 +13,7 @@ {% if page_num != page_data.page %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country', country_id=divi_country.id, page=page_num) }}"> + href="{{ url_for('divi.url_divi_country', country_id=divi_country.id, page=page_num) }}"> {{ page_num }} </a> </li> @@ -31,7 +31,7 @@ {% if page_data.has_next %} <li class="page-item"> <a class="page-link" - href="{{ url_for( 'who.url_divi_country', country_id=divi_country.id, page=page_data.next_num) }}"> + href="{{ url_for('divi.url_divi_country', country_id=divi_country.id, page=page_data.next_num) }}"> Next </a> </li> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html index 5183d720..00f84654 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/country/divi_country_one_table.html @@ -2,42 +2,42 @@ <thead class="table-secondary"> <tr> <th scope="col"> - <a href="{{ url_for('who.url_divi_date_reported_all') }}"> + <a href="{{ url_for('divi.url_divi_date_reported_all') }}"> date reported </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_country_deaths_new',country_id=divi_country.id) }}"> + <a href="{{ url_for('divi.url_divi_country_deaths_new',country_id=divi_country.id) }}"> deaths new </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_country_cases_new',country_id=divi_country.id) }}"> + <a href="{{ url_for('divi.url_divi_country_cases_new',country_id=divi_country.id) }}"> cases new </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_country_deaths_cumulative',country_id=divi_country.id) }}"> + <a href="{{ url_for('divi.url_divi_country_deaths_cumulative',country_id=divi_country.id) }}"> deaths cumulative </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_country_cases_cumulative',country_id=divi_country.id) }}"> + <a href="{{ url_for('divi.url_divi_country_cases_cumulative',country_id=divi_country.id) }}"> cases cumulative </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_country_all') }}"> + <a href="{{ url_for('divi.url_divi_country_all') }}"> country code </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_country_all') }}"> + <a href="{{ url_for('divi.url_divi_country_all') }}"> country </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_region_all') }}"> + <a href="{{ url_for('divi.url_divi_region_all') }}"> region </a> </th> @@ -47,7 +47,7 @@ {% for divi_global_data in page_data.items %} <tr> <th> - <a href="{{ url_for('who.url_divi_date_reported',date_reported_id=divi_global_data.date_reported.id) }}"> + <a href="{{ url_for('divi.url_divi_date_reported',date_reported_id=divi_global_data.date_reported.id) }}"> {{ divi_global_data.date_reported }} </a> </th> @@ -64,17 +64,17 @@ {{ divi_global_data.cases_cumulative }} </td> <td> - <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id) }}"> + <a href="{{ url_for('divi.url_divi_country', country_id=divi_global_data.country.id) }}"> {{ divi_global_data.country.country_code }} </a> </td> <td> - <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id) }}"> + <a href="{{ url_for('divi.url_divi_country', country_id=divi_global_data.country.id) }}"> {{ divi_global_data.country.country }} </a> </td> <th> - <a href="{{ url_for('who.url_divi_region', region_id=divi_global_data.country.region.id) }}"> + <a href="{{ url_for('divi.url_divi_region', region_id=divi_global_data.country.region.id) }}"> {{ divi_global_data.country.region.region }} </a> </th> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html index 135fc922..9d0f8131 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_all_pagination.html @@ -3,7 +3,7 @@ <ul class="pagination"> {% if page_data.has_prev %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported_all', page=page_data.prev_num) }}">Previous</a> + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_all', page=page_data.prev_num) }}">Previous</a> </li> {% endif %} <!-- all page numbers --> @@ -11,7 +11,7 @@ {% if page_num %} {% if page_num != page_data.page %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported_all', page=page_num) }}">{{ page_num }}</a> + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_all', page=page_num) }}">{{ page_num }}</a> </li> {% else %} <li class="page-item active"> @@ -27,7 +27,7 @@ <!-- next page --> {% if page_data.has_next %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported_all', page=page_data.next_num) }}">Next</a> + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_all', page=page_data.next_num) }}">Next</a> </li> {% endif %} </ul> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html index 02c1fbb8..f59884fa 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_cumulative_pagination.html @@ -3,7 +3,7 @@ <ul class="pagination"> {% if page_data.has_prev %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative', + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative', date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">Previous</a> </li> {% endif %} @@ -12,7 +12,7 @@ {% if page_num %} {% if page_num != page_data.page %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative', + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative', date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a> </li> {% else %} @@ -29,7 +29,7 @@ <!-- next page --> {% if page_data.has_next %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative', + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative', date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a> </li> {% endif %} diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html index 5f553699..49cfc12f 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_cases_new_pagination.html @@ -3,7 +3,7 @@ <ul class="pagination"> {% if page_data.has_prev %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported_cases_new', + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_cases_new', date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}"> Previous </a> @@ -14,7 +14,7 @@ {% if page_num %} {% if page_num != page_data.page %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported_cases_new', + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_cases_new', date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a> </li> {% else %} @@ -31,7 +31,7 @@ <!-- next page --> {% if page_data.has_next %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported_cases_new', + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_cases_new', date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a> </li> {% endif %} diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html index 02c1fbb8..f59884fa 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_deaths_cumulative_pagination.html @@ -3,7 +3,7 @@ <ul class="pagination"> {% if page_data.has_prev %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative', + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative', date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">Previous</a> </li> {% endif %} @@ -12,7 +12,7 @@ {% if page_num %} {% if page_num != page_data.page %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative', + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative', date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a> </li> {% else %} @@ -29,7 +29,7 @@ <!-- next page --> {% if page_data.has_next %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported_deaths_cumulative', + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative', date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a> </li> {% endif %} diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html index aba8dcc6..81064808 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_pagination.html @@ -3,7 +3,7 @@ <ul class="pagination"> {% if page_data.has_prev %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported', + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported', date_reported_id=divi_date_reported.id, page=page_data.prev_num) }}">Previous</a> </li> {% endif %} @@ -12,7 +12,7 @@ {% if page_num %} {% if page_num != page_data.page %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported', + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported', date_reported_id=divi_date_reported.id, page=page_num) }}">{{ page_num }}</a> </li> {% else %} @@ -29,7 +29,7 @@ <!-- next page --> {% if page_data.has_next %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_date_reported', + <a class="page-link" href="{{ url_for('divi.url_divi_date_reported', date_reported_id=divi_date_reported.id, page=page_data.next_num) }}">Next</a> </li> {% endif %} diff --git a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html index abd0e2f0..ee420aa6 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/date_reported/divi_date_reported_one_table.html @@ -2,42 +2,42 @@ <thead class="table-secondary"> <tr> <th scope="col"> - <a href="{{ url_for('who.url_divi_date_reported_all') }}"> + <a href="{{ url_for('divi.url_divi_date_reported_all') }}"> date reported </a> </th> <th scope="col"> who. - <a href="{{ url_for('who.url_divi_date_reported_deaths_new', date_reported_id=divi_date_reported.id) }}"> + <a href="{{ url_for('divi.url_divi_date_reported_deaths_new', date_reported_id=divi_date_reported.id) }}"> deaths new </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_date_reported_cases_new', date_reported_id=divi_date_reported.id) }}"> + <a href="{{ url_for('divi.url_divi_date_reported_cases_new', date_reported_id=divi_date_reported.id) }}"> cases new </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_date_reported_deaths_cumulative', date_reported_id=divi_date_reported.id) }}"> + <a href="{{ url_for('divi.url_divi_date_reported_deaths_cumulative', date_reported_id=divi_date_reported.id) }}"> deaths cumulative </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_date_reported_cases_cumulative', date_reported_id=divi_date_reported.id) }}"> + <a href="{{ url_for('divi.url_divi_date_reported_cases_cumulative', date_reported_id=divi_date_reported.id) }}"> cases cumulative </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_country_all') }}"> + <a href="{{ url_for('divi.url_divi_country_all') }}"> country code </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_country_all') }}"> + <a href="{{ url_for('divi.url_divi_country_all') }}"> country </a> </th> <th scope="col"> - <a href="{{ url_for('who.url_divi_region_all') }}"> + <a href="{{ url_for('divi.url_divi_region_all') }}"> region </a> </th> @@ -47,7 +47,7 @@ {% for divi_global_data in page_data.items %} <tr> <th> - <a href="{{ url_for('who.url_divi_date_reported', date_reported_id=divi_global_data.date_reported.id) }}"> + <a href="{{ url_for('divi.url_divi_date_reported', date_reported_id=divi_global_data.date_reported.id) }}"> {{ divi_global_data.date_reported }} </a> </th> @@ -64,17 +64,17 @@ {{ divi_global_data.cases_cumulative }} </td> <td> - <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id ) }}"> + <a href="{{ url_for('divi.url_divi_country', country_id=divi_global_data.country.id ) }}"> {{ divi_global_data.country.country_code }} </a> </td> <td> - <a href="{{ url_for('who.url_divi_country', country_id=divi_global_data.country.id) }}"> + <a href="{{ url_for('divi.url_divi_country', country_id=divi_global_data.country.id) }}"> {{ divi_global_data.country.country }} </a> </td> <th> - <a href="{{ url_for('who.url_divi_region', region_id=divi_global_data.country.region.id) }}"> + <a href="{{ url_for('divi.url_divi_region', region_id=divi_global_data.country.region.id) }}"> {{ divi_global_data.country.region.region }} </a> </th> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html index 5baf486a..27c195b2 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/divi_tasks.html @@ -9,29 +9,29 @@ <div class="col"> <div class="btn-group-vertical" role="group" aria-label="Views"> <a class="btn btn-primary btn-lg btn-block text-left" - href="{{ url_for( 'who.url_task_divi_update_star_schema_initial') }}" + href="{{ url_for('divi.url_task_divi_update_star_schema_initial') }}" role="button">WHO :: Task :: update :: star_schema :: initial</a> <a class="btn btn-primary btn-lg btn-block text-left" - href="{{ url_for( 'who.url_task_divi_update_star_schema_incremental') }}" + href="{{ url_for('divi.url_task_divi_update_star_schema_incremental') }}" role="button">WHO :: Task :: update :: star_schema :: incremental</a> </div> </div> <div class="col"> <div class="btn-group-vertical" role="group" aria-label="Views"> <a class="btn btn-success btn-lg btn-block text-left" - href="{{ url_for( 'who.url_task_divi_download_only') }}" + href="{{ url_for('divi.url_task_divi_download_only') }}" role="button">WHO :: Task :: download :: only</a> <a class="btn btn-info btn-lg btn-block text-left" - href="{{ url_for( 'who.url_task_divi_import_only') }}" + href="{{ url_for('divi.url_task_divi_import_only') }}" role="button">WHO :: Task :: import :: only</a> <a class="btn btn-warning btn-lg btn-block text-left" - href="{{ url_for( 'who.url_task_divi_update_dimension_tables_only') }}" + href="{{ url_for('divi.url_task_divi_update_dimension_tables_only') }}" role="button">WHO :: Task :: update :: dimension-tables : only</a> <a class="btn btn-danger btn-lg btn-block text-left" - href="{{ url_for( 'who.url_task_divi_update_fact_table_incremental_only') }}" + href="{{ url_for('divi.url_task_divi_update_fact_table_incremental_only') }}" role="button">WHO :: Task :: update :: fact-table :: only :: incremental</a> <a class="btn btn-secondary btn-lg btn-block text-left" - href="{{ url_for( 'who.url_task_divi_update_fact_table_initial_only') }}" + href="{{ url_for('divi.url_task_divi_update_fact_table_initial_only') }}" role="button">WHO :: Task :: update :: fact-table :: only :: initial</a> </div> </div> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html index a0f6a956..eed72195 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_imported_pagination.html @@ -4,7 +4,7 @@ {% if page_data.has_prev %} <li class="page-item"> <a class="page-link" - href="{{ url_for('who.url_divi_imported', page=page_data.prev_num) }}">Previous</a> + href="{{ url_for('divi.url_divi_imported', page=page_data.prev_num) }}">Previous</a> </li> {% endif %} <!-- all page numbers --> @@ -13,7 +13,7 @@ {% if page_num != page_data.page %} <li class="page-item"> <a class="page-link" - href="{{ url_for('who.url_divi_imported', page=page_num) }}">{{ page_num }}</a> + href="{{ url_for('divi.url_divi_imported', page=page_num) }}">{{ page_num }}</a> </li> {% else %} <li class="page-item active"> @@ -30,7 +30,7 @@ {% if page_data.has_next %} <li class="page-item"> <a class="page-link" - href="{{ url_for('who.url_divi_imported', page=page_data.next_num) }}">Next</a> + href="{{ url_for('divi.url_divi_imported', page=page_data.next_num) }}">Next</a> </li> {% endif %} </ul> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html index 9f75943a..27ad588f 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/fragments/fragment_divi_table_global_data.html @@ -2,7 +2,7 @@ <thead class="table-secondary"> <tr> <th scope="col"> - <a href="{{ url_for( 'who.url_divi_date_reported_all') }}"> + <a href="{{ url_for('divi.url_divi_date_reported_all') }}"> date reported </a> </th> @@ -19,17 +19,17 @@ cases cumulative </th> <th scope="col"> - <a href="{{ url_for( 'who.url_divi_country_all') }}"> + <a href="{{ url_for('divi.url_divi_country_all') }}"> country code </a> </th> <th scope="col"> - <a href="{{ url_for( 'who.url_divi_country_all') }}"> + <a href="{{ url_for('divi.url_divi_country_all') }}"> country </a> </th> <th scope="col"> - <a href="{{ url_for( 'who.url_divi_region_all') }}"> + <a href="{{ url_for('divi.url_divi_region_all') }}"> region </a> </th> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html index 54554445..a04ad858 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_all_pagination.html @@ -4,7 +4,7 @@ <!-- previous page --> {% if page_data.has_prev %} <li> - <a href="{{ url_for('who.url_divi_region_all', page=page_data.prev_num) }}"> + <a href="{{ url_for('divi.url_divi_region_all', page=page_data.prev_num) }}"> Previous </a> </li> @@ -14,7 +14,7 @@ {% if page_num %} {% if page_num != page_data.page %} <li> - <a href="{{ url_for('who.url_divi_region_all', page=page_num) }}"> + <a href="{{ url_for('divi.url_divi_region_all', page=page_num) }}"> {{ page_num }} </a> </li> @@ -32,7 +32,7 @@ <!-- next page --> {% if page_data.has_next %} <li> - <a href="{{ url_for('who.url_divi_region_all', page=page_data.next_num) }}"> + <a href="{{ url_for('divi.url_divi_region_all', page=page_data.next_num) }}"> Next </a> </li> diff --git a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html index fe39c125..eab5c8db 100644 --- a/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html +++ b/src/covid19/blueprints/intensivregister/templates/divi/region/divi_region_one_pagination.html @@ -3,7 +3,7 @@ <ul class="pagination"> {% if page_data.has_prev %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_region', + <a class="page-link" href="{{ url_for('divi.url_divi_region', region_id=divi_region.id , page=page_data.prev_num) }}">Previous</a> </li> {% endif %} @@ -12,7 +12,7 @@ {% if page_num %} {% if page_num != page_data.page %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_region', + <a class="page-link" href="{{ url_for('divi.url_divi_region', region_id=divi_region.id ,page=page_num) }}">{{ page_num }}</a> </li> {% else %} @@ -29,7 +29,7 @@ <!-- next page --> {% if page_data.has_next %} <li class="page-item"> - <a class="page-link" href="{{ url_for('who.url_divi_region', + <a class="page-link" href="{{ url_for('divi.url_divi_region', region_id=divi_region.id , page=page_data.next_num) }}">Next</a> </li> {% endif %} -- GitLab