diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/all/who_country_all_table.html b/src/flask_covid19/blueprints/data_who/templates/who/country/all/who_country_all_table.html index 858bb4ce408455691303a300f008b5c986786c4a..1fd4eeb51b8daffa50785266064d5d9e19cb42e3 100644 --- a/src/flask_covid19/blueprints/data_who/templates/who/country/all/who_country_all_table.html +++ b/src/flask_covid19/blueprints/data_who/templates/who/country/all/who_country_all_table.html @@ -1,3 +1,4 @@ + <div class="table-responsive"> <table class="table table-hover table-striped table-dark"> <thead class="table-secondary"> <tr> @@ -46,4 +47,5 @@ </th> </tr> </tfoot> - </table> \ No newline at end of file + </table> + </div> \ No newline at end of file diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one_table.html b/src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one_table.html index 159e1bbb690f2cab8b17df9e70a0fd1ee960467b..8f5607536468fb9a8a496ac4570c09a9077b060b 100644 --- a/src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one_table.html +++ b/src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one_table.html @@ -1,3 +1,4 @@ + <div class="table-responsive"> <table class="table table-hover table-striped table-dark"> <thead class="table-secondary"> <tr> @@ -81,4 +82,8 @@ </tr> {% endfor %} </tbody> - </table> \ No newline at end of file + <tfoot> + + </tfoot> + </table> + </div> \ No newline at end of file diff --git a/src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one_table_head.html b/src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one_table_head.html new file mode 100644 index 0000000000000000000000000000000000000000..1608036a7498a6d30c6e1139d5ead80a9797a146 --- /dev/null +++ b/src/flask_covid19/blueprints/data_who/templates/who/country/one/who_country_one_table_head.html @@ -0,0 +1,42 @@ + <tr> + <th scope="col"> + <a href="{{ url_for('who.url_who_date_reported_all') }}"> + date reported + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_country_deaths_new',country_id=who_country.id) }}"> + deaths new + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_country_cases_new',country_id=who_country.id) }}"> + cases new + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_country_deaths_cumulative',country_id=who_country.id) }}"> + deaths cumulative + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_country_cases_cumulative',country_id=who_country.id) }}"> + cases cumulative + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_country_all') }}"> + country code + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_country_all') }}"> + country + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_region_all') }}"> + region + </a> + </th> + </tr> diff --git a/src/flask_covid19/blueprints/data_who/templates/who/data/fragment_who_table_global_data.html b/src/flask_covid19/blueprints/data_who/templates/who/data/who_table_global_data.html similarity index 96% rename from src/flask_covid19/blueprints/data_who/templates/who/data/fragment_who_table_global_data.html rename to src/flask_covid19/blueprints/data_who/templates/who/data/who_table_global_data.html index 90049ac244f2bee17b01e80c0e4f15a1aa10aff9..2f31b0e77c75c319be2a539d53d240be4bd25529 100644 --- a/src/flask_covid19/blueprints/data_who/templates/who/data/fragment_who_table_global_data.html +++ b/src/flask_covid19/blueprints/data_who/templates/who/data/who_table_global_data.html @@ -1,3 +1,4 @@ + <div class="table-responsive"> <table class="table table-hover table-striped table-dark"> <thead class="table-secondary"> <tr> @@ -65,4 +66,8 @@ </tr> {% endfor %} </tbody> - </table> \ No newline at end of file + <tfoot> + + </tfoot> + </table> + </div> \ No newline at end of file diff --git a/src/flask_covid19/blueprints/data_who/templates/who/data/who_table_global_data_head.html b/src/flask_covid19/blueprints/data_who/templates/who/data/who_table_global_data_head.html new file mode 100644 index 0000000000000000000000000000000000000000..26a0ebd1b7e44f8091d3a45c8d531bab4e53103f --- /dev/null +++ b/src/flask_covid19/blueprints/data_who/templates/who/data/who_table_global_data_head.html @@ -0,0 +1,34 @@ + <tr> + <th scope="col"> + <a href="{{ url_for( 'who.url_who_date_reported_all') }}"> + date reported + </a> + </th> + <th scope="col"> + deaths new + </th> + <th scope="col"> + cases new + </th> + <th scope="col"> + deaths cumulative + </th> + <th scope="col"> + cases cumulative + </th> + <th scope="col"> + <a href="{{ url_for( 'who.url_who_country_all') }}"> + country code + </a> + </th> + <th scope="col"> + <a href="{{ url_for( 'who.url_who_country_all') }}"> + country + </a> + </th> + <th scope="col"> + <a href="{{ url_for( 'who.url_who_region_all') }}"> + region + </a> + </th> + </tr> diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all_table.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all_table.html index d921902d28a0945901c37f7cf57ebcb13f9b3ec8..e7d73916c94cf59bf270489146c1194d7d07b34e 100644 --- a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all_table.html +++ b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all_table.html @@ -1,12 +1,7 @@ + <div class="table-responsive"> <table class="table table-hover table-striped table-dark"> <thead class="table-secondary"> - <tr> - <th scope="col" class="text-right">day of week</th> - <th scope="col" class="text-left">date reported</th> - <th scope="col" class="text-right">week of year</th> - <th scope="col" class="text-left">year</th> - <th scope="col" class="text-left">day of year</th> - </tr> + {% include 'who/date_reported/all/who_date_reported_all_table_head.html' %} </thead> <tbody> {% for who_date_reported in page_data.items %} @@ -32,13 +27,8 @@ {% endfor %} </tbody> <tfoot class="table-secondary"> - <tr> - <th scope="col" class="text-right">day of week</th> - <th scope="col" class="text-left">date reported</th> - <th scope="col" class="text-right">week of year</th> - <th scope="col" class="text-left">year</th> - <th scope="col" class="text-left">day of year</th> - </tr> + {% include 'who/date_reported/all/who_date_reported_all_table_head.html' %} </tfoot> </table> + </div> diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all_table_head.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all_table_head.html new file mode 100644 index 0000000000000000000000000000000000000000..4a8510a66c31833c742b54035c8e7e6b3bd14a3f --- /dev/null +++ b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/all/who_date_reported_all_table_head.html @@ -0,0 +1,9 @@ + <tr> + <th scope="col" class="text-right">day of week</th> + <th scope="col" class="text-left">date reported</th> + <th scope="col" class="text-right">week of year</th> + <th scope="col" class="text-left">year</th> + <th scope="col" class="text-left">day of year</th> + </tr> + + diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one_table.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one_table.html index 8e9dac9dc60c94c7c373a7383911d5127faa9130..c44fb605ae84464317fccd3cec54cd7584da782d 100644 --- a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one_table.html +++ b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one_table.html @@ -1,47 +1,7 @@ + <div class="table-responsive"> <table class="table table-hover table-striped table-dark"> <thead class="table-secondary"> - <tr> - <th scope="col"> - <a href="{{ url_for('who.url_who_date_reported_all') }}"> - date reported - </a> - </th> - <th scope="col"> - <a href="{{ url_for('who.url_who_date_reported_deaths_new', date_reported_id=who_date_reported.id) }}"> - deaths new - </a> - </th> - <th scope="col"> - <a href="{{ url_for('who.url_who_date_reported_cases_new', date_reported_id=who_date_reported.id) }}"> - cases new - </a> - </th> - <th scope="col"> - <a href="{{ url_for('who.url_who_date_reported_deaths_cumulative', date_reported_id=who_date_reported.id) }}"> - deaths cumulative - </a> - </th> - <th scope="col"> - <a href="{{ url_for('who.url_who_date_reported_cases_cumulative', date_reported_id=who_date_reported.id) }}"> - cases cumulative - </a> - </th> - <th scope="col"> - <a href="{{ url_for('who.url_who_country_all') }}"> - country code - </a> - </th> - <th scope="col"> - <a href="{{ url_for('who.url_who_country_all') }}"> - country - </a> - </th> - <th scope="col"> - <a href="{{ url_for('who.url_who_region_all') }}"> - region - </a> - </th> - </tr> + {% include 'who/date_reported/one/who_date_reported_one_table_head.html' %} </thead> <tbody> {% for who_global_data in page_data.items %} @@ -81,4 +41,8 @@ </tr> {% endfor %} </tbody> - </table> \ No newline at end of file + <tfoot> + {% include 'who/date_reported/one/who_date_reported_one_table_head.html' %} + </tfoot> + </table> + </div> \ No newline at end of file diff --git a/src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one_table_head.html b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one_table_head.html new file mode 100644 index 0000000000000000000000000000000000000000..b3fde09ce0a85058211dae05c92a81b308088b71 --- /dev/null +++ b/src/flask_covid19/blueprints/data_who/templates/who/date_reported/one/who_date_reported_one_table_head.html @@ -0,0 +1,42 @@ + <tr> + <th scope="col"> + <a href="{{ url_for('who.url_who_date_reported_all') }}"> + date reported + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_date_reported_deaths_new', date_reported_id=who_date_reported.id) }}"> + deaths new + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_date_reported_cases_new', date_reported_id=who_date_reported.id) }}"> + cases new + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_date_reported_deaths_cumulative', date_reported_id=who_date_reported.id) }}"> + deaths cumulative + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_date_reported_cases_cumulative', date_reported_id=who_date_reported.id) }}"> + cases cumulative + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_country_all') }}"> + country code + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_country_all') }}"> + country + </a> + </th> + <th scope="col"> + <a href="{{ url_for('who.url_who_region_all') }}"> + region + </a> + </th> + </tr> diff --git a/src/flask_covid19/blueprints/data_who/templates/who/flat/who_flat_table.html b/src/flask_covid19/blueprints/data_who/templates/who/flat/who_flat_table.html index 6452a8e2fa005adc04bdb6ba9c53829f4af24ea6..aaa72870d999c2d7f07c4921973552197bd1a966 100644 --- a/src/flask_covid19/blueprints/data_who/templates/who/flat/who_flat_table.html +++ b/src/flask_covid19/blueprints/data_who/templates/who/flat/who_flat_table.html @@ -1,5 +1,6 @@ <table class="table table-hover table-striped table-dark"> <thead> + {% include 'who/flat/who_flat_table_head.html' %} <tr> <th scope="col">date reported</th> <th scope="col">country</th> @@ -57,4 +58,7 @@ </tr> {% endfor %} </tbody> + <tfoot> + {% include 'who/flat/who_flat_table_head.html' %} + </tfoot> </table> \ No newline at end of file diff --git a/src/flask_covid19/blueprints/data_who/templates/who/flat/who_flat_table_head.html b/src/flask_covid19/blueprints/data_who/templates/who/flat/who_flat_table_head.html new file mode 100644 index 0000000000000000000000000000000000000000..b3597f22eb7ee404b55a23cbdfc2d85ec6134b82 --- /dev/null +++ b/src/flask_covid19/blueprints/data_who/templates/who/flat/who_flat_table_head.html @@ -0,0 +1,27 @@ + + <tr> + <th scope="col">date reported</th> + <th scope="col">country</th> + <th scope="col">country code</th> + <th scope="col">who region</th> + <th scope="col">new cases</th> + <th scope="col">cumulative cases</th> + <th scope="col">new deaths</th> + <th scope="col">cumulative deaths</th> + + <th scope="col">datum</th> + <th scope="col">year month</th> + <th scope="col">year week</th> + <th scope="col">year day of year</th> + <th scope="col">processed update</th> + <th scope="col">processed full update</th> + + <th scope="col">month</th> + <th scope="col">day of month</th> + <th scope="col">day of week</th> + <th scope="col">week of year</th> + <th scope="col">day of year</th> + <th scope="col">location</th> + <th scope="col">location group</th> + <th scope="col">location code</th> + </tr> diff --git a/src/flask_covid19/blueprints/data_who/templates/who/imported/who_imported_table.html b/src/flask_covid19/blueprints/data_who/templates/who/imported/who_imported_table.html index 941f320b750d00038bc84af70bef5e4c5db83d5f..9ea10af0d27b9e97e071b34eb5e85dc9eab27a30 100644 --- a/src/flask_covid19/blueprints/data_who/templates/who/imported/who_imported_table.html +++ b/src/flask_covid19/blueprints/data_who/templates/who/imported/who_imported_table.html @@ -1,15 +1,6 @@ <table class="table table-hover table-striped table-dark"> <thead> - <tr> - <th scope="col">date reported</th> - <th scope="col">country</th> - <th scope="col">country code</th> - <th scope="col">who region</th> - <th scope="col">new cases</th> - <th scope="col">cumulative cases</th> - <th scope="col">new deaths</th> - <th scope="col">cumulative deaths</th> - </tr> + {% include 'who/flat/who_flat_table_head.html' %} </thead> <tbody> {% for who_global_data_import in page_data.items %} @@ -25,4 +16,7 @@ </tr> {% endfor %} </tbody> + <tfoot> + {% include 'who/flat/who_flat_table_head.html' %} + </tfoot> </table> \ No newline at end of file diff --git a/src/flask_covid19/blueprints/data_who/templates/who/imported/who_imported_table_head.html b/src/flask_covid19/blueprints/data_who/templates/who/imported/who_imported_table_head.html new file mode 100644 index 0000000000000000000000000000000000000000..a9aee05939ac356b6e3902dd202b58b84077f921 --- /dev/null +++ b/src/flask_covid19/blueprints/data_who/templates/who/imported/who_imported_table_head.html @@ -0,0 +1,10 @@ + <tr> + <th scope="col">date reported</th> + <th scope="col">country</th> + <th scope="col">country code</th> + <th scope="col">who region</th> + <th scope="col">new cases</th> + <th scope="col">cumulative cases</th> + <th scope="col">new deaths</th> + <th scope="col">cumulative deaths</th> + </tr>