diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
index 414392906b8111c37643da499143c7ac18dc903c..eea1d5dab6331468a984df2f3fc2fe962f0f3f34 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all.html
@@ -7,82 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_data.prev_num) }}">Previous</a>
- </li>
- {% endif %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_num) }}">{{ page_num }}</a>
- </li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
- </li>
- {% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_data.next_num) }}">Next</a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
+ {% include 'who/date_reported/who_date_reported_all_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- <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>
- </tr>
- </thead>
- <tbody>
- {% for who_date_reported in page_data.items %}
- <tr>
- <td class="text-right">
- {{ who_date_reported.get_name_for_weekday() }}
- </td>
- <td class="text-left">
- <a href="/who/date_reported/{{ who_date_reported.id }}">
- {{ who_date_reported }}
- </a>
- </td>
- <td class="text-right">
- {{ who_date_reported.week_of_year }}
- </td>
- <td class="text-left">
- {{ who_date_reported.year }}
- </td>
- </tr>
- {% 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>
- </tr>
- </tfoot>
- </table>
+ {% include 'who/date_reported/who_date_reported_all_table.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/date_reported/who_date_reported_all_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_pagination.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_pagination.html
new file mode 100644
index 0000000000000000000000000000000000000000..3434879171248384b5af560384ba84e538558fce
--- /dev/null
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_pagination.html
@@ -0,0 +1,34 @@
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_data.prev_num) }}">Previous</a>
+ </li>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_num) }}">{{ page_num }}</a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_all', page=page_data.next_num) }}">Next</a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_table.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_table.html
new file mode 100644
index 0000000000000000000000000000000000000000..ef541983181cfca3c2f92fcf3d2271dcf7659647
--- /dev/null
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_all_table.html
@@ -0,0 +1,39 @@
+ <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>
+ </tr>
+ </thead>
+ <tbody>
+ {% for who_date_reported in page_data.items %}
+ <tr>
+ <td class="text-right">
+ {{ who_date_reported.get_name_for_weekday() }}
+ </td>
+ <td class="text-left">
+ <a href="/who/date_reported/{{ who_date_reported.id }}">
+ {{ who_date_reported }}
+ </a>
+ </td>
+ <td class="text-right">
+ {{ who_date_reported.week_of_year }}
+ </td>
+ <td class="text-left">
+ {{ who_date_reported.year }}
+ </td>
+ </tr>
+ {% 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>
+ </tr>
+ </tfoot>
+ </table>
+
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
index 7d0a6c40caf8666dc7079dfdb7d028bb536f52b8..fb852908da57023a907d05d68bc08d75f8bd3bfa 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one.html
@@ -7,48 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported',
- date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
- </li>
- {% endif %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported',
- date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
- </li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
- </li>
- {% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported',
- date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
+ {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
index 0f13ba300bbcfe7290122a550902d2116a54811d..2e6562a57a27c4cccce811027fea0fc595b738f3 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative.html
@@ -7,48 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
- date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
- </li>
- {% endif %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
- date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
- </li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
- </li>
- {% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
- date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
+ {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
</div>
</div>
{% endblock %}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative_pagination.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative_pagination.html
new file mode 100644
index 0000000000000000000000000000000000000000..3b6188546206e22f6a94ef7de8ed1d7649d513a2
--- /dev/null
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_cumulative_pagination.html
@@ -0,0 +1,37 @@
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
+ date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
+ </li>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
+ date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
+ date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
index 8d1da83870aac3afa3c78ec5271f1234dd681d20..fb852908da57023a907d05d68bc08d75f8bd3bfa 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new.html
@@ -7,50 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_cases_new',
- date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">
- Previous
- </a>
- </li>
- {% endif %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_cases_new',
- date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
- </li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
- </li>
- {% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_cases_new',
- date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
+ {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new_pagination.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new_pagination.html
new file mode 100644
index 0000000000000000000000000000000000000000..dc0782434b92c4992f1d9620ad854811629cad6a
--- /dev/null
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_cases_new_pagination.html
@@ -0,0 +1,39 @@
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_cases_new',
+ date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">
+ Previous
+ </a>
+ </li>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_cases_new',
+ date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_cases_new',
+ date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
index 5c73fb1dde244c5ac0ac0961404fa2a6422ab0a6..6cade560341b221034de178f547b65c38538e911 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative.html
@@ -7,48 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
- date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
- </li>
- {% endif %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
- date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
- </li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">{{ page_num }}</a>
- </li>
- {% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
- date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
+ {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative_pagination.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative_pagination.html
new file mode 100644
index 0000000000000000000000000000000000000000..3b6188546206e22f6a94ef7de8ed1d7649d513a2
--- /dev/null
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_cumulative_pagination.html
@@ -0,0 +1,37 @@
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
+ date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
+ </li>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
+ date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_cumulative',
+ date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
index 5d9400912876a2b1f812470a9e2092ea6b64c2d6..c61e0d1972b4df5e5cc5ef3b37a7458fb522ffbf 100644
--- a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_deaths_new.html
@@ -7,54 +7,17 @@
<div class="container">
<div class="row">
<div class="col">
- {% if page_data.pages > 1 %}
- <!-- previous page -->
- <ul class="pagination">
- {% if page_data.has_prev %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_new',
- date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
- </li>
- {% endif %}
- <!-- all page numbers -->
- {% for page_num in page_data.iter_pages() %}
- {% if page_num %}
- {% if page_num != page_data.page %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_new',
- date_reported_id=who_date_reported.id, page=page_num) }}">
- {{ page_num }}
- </a>
- </li>
- {% else %}
- <li class="page-item active">
- <a class="page-link" href="#">
- {{ page_num }}
- </a>
- </li>
- {% endif %}
- {% else %}
- <li class="page-item">
- <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
- </li>
- {% endif %}
- {% endfor %}
- <!-- next page -->
- {% if page_data.has_next %}
- <li class="page-item">
- <a class="page-link" href="{{ url_for('who.url_who_date_reported_deaths_new',
- date_reported_id=who_date_reported.id, page=page_data.next_num) }}">
- Next
- </a>
- </li>
- {% endif %}
- </ul>
- {% endif %}
+ {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
</div>
</div>
<div class="row">
<div class="col">
- {% include 'who/fragments/fragment_who_table_global_data_date_reported.html' %}
+ {% include 'who/date_reported/who_date_reported_one_table.html' %}
+ </div>
+ </div>
+ <div class="row">
+ <div class="col">
+ {% include 'who/date_reported/who_date_reported_one_pagination.html' %}
</div>
</div>
</div>
diff --git a/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_pagination.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_pagination.html
new file mode 100644
index 0000000000000000000000000000000000000000..7938fbcd1c4430f3657c078d2a323fa4e7d7cdaf
--- /dev/null
+++ b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_pagination.html
@@ -0,0 +1,37 @@
+ {% if page_data.pages > 1 %}
+ <!-- previous page -->
+ <ul class="pagination">
+ {% if page_data.has_prev %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported',
+ date_reported_id=who_date_reported.id, page=page_data.prev_num) }}">Previous</a>
+ </li>
+ {% endif %}
+ <!-- all page numbers -->
+ {% for page_num in page_data.iter_pages() %}
+ {% if page_num %}
+ {% if page_num != page_data.page %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported',
+ date_reported_id=who_date_reported.id, page=page_num) }}">{{ page_num }}</a>
+ </li>
+ {% else %}
+ <li class="page-item active">
+ <a class="page-link" href="#">{{ page_num }}</a>
+ </li>
+ {% endif %}
+ {% else %}
+ <li class="page-item">
+ <span class="ellipsis page-link my-page-item-ellipsis-page-link">…</span>
+ </li>
+ {% endif %}
+ {% endfor %}
+ <!-- next page -->
+ {% if page_data.has_next %}
+ <li class="page-item">
+ <a class="page-link" href="{{ url_for('who.url_who_date_reported',
+ date_reported_id=who_date_reported.id, page=page_data.next_num) }}">Next</a>
+ </li>
+ {% endif %}
+ </ul>
+ {% endif %}
diff --git a/src/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data_date_reported.html b/src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_table.html
similarity index 100%
rename from src/covid19/blueprints/who/templates/who/fragments/fragment_who_table_global_data_date_reported.html
rename to src/covid19/blueprints/who/templates/who/date_reported/who_date_reported_one_table.html