diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table.html index 30e4e391682eeee6973372d5b060ed1319f95873..b9a65f41a3cd88322e8e9afb04c0e2d11ac098ec 100644 --- a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table.html +++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table.html @@ -7,7 +7,7 @@ <tbody> {% for data_item in page_data.items %} <tr> - <td class="text-center table-dark" nowrap>{{ data_item.datum }}</td> + <td class="text-center table-dark" nowrap>{{ data_item.date_reported }}</td> <td class="text-right table-secondary">{{ data_item.dosen_differenz_zum_vortag }}</td> diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_imported.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_imported.html new file mode 100644 index 0000000000000000000000000000000000000000..30e4e391682eeee6973372d5b060ed1319f95873 --- /dev/null +++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/fragments/fragment_rki_vaccination_data_table_imported.html @@ -0,0 +1,46 @@ + +<div class="table-responsive"> + <table class="table table-hover table-striped table-sm table-bordered"> + <thead> + {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html' %} + </thead> + <tbody> + {% for data_item in page_data.items %} + <tr> + <td class="text-center table-dark" nowrap>{{ data_item.datum }}</td> + + <td class="text-right table-secondary">{{ data_item.dosen_differenz_zum_vortag }}</td> + + <td class="text-right table-warning">{{ data_item.dosen_kumulativ }}</td> + <td class="text-right table-warning">{{ data_item.dosen_biontech_kumulativ }}</td> + <td class="text-right table-warning">{{ data_item.dosen_moderna_kumulativ }}</td> + + <td class="text-right table-light">{{ data_item.personen_erst_kumulativ }}</td> + <td class="text-right table-light">{{ data_item.personen_voll_kumulativ }}</td> + + <td class="text-right table-danger">{{ data_item.impf_quote_erst }}</td> + <td class="text-right table-danger">{{ data_item.impf_quote_voll }}</td> + + <td class="text-right table-light">{{ data_item.indikation_alter_dosen }}</td> + <td class="text-right table-light">{{ data_item.indikation_alter_erst }}</td> + <td class="text-right table-light">{{ data_item.indikation_alter_voll }}</td> + + <td class="text-right table-secondary">{{ data_item.indikation_pflegeheim_dosen }}</td> + <td class="text-right table-secondary">{{ data_item.indikation_pflegeheim_erst }}</td> + <td class="text-right table-secondary">{{ data_item.indikation_pflegeheim_voll }}</td> + + <td class="text-right table-light">{{ data_item.indikation_beruf_dosen }}</td> + <td class="text-right table-light">{{ data_item.indikation_beruf_erst }}</td> + <td class="text-right table-light">{{ data_item.indikation_beruf_erst }}</td> + + <td class="text-right table-secondary">{{ data_item.indikation_medizinisch_dosen }}</td> + <td class="text-right table-secondary">{{ data_item.indikation_medizinisch_erst }}</td> + <td class="text-right table-secondary">{{ data_item.indikation_medizinisch_voll }}</td> + </tr> + {% endfor %} + </tbody> + <tfoot> + {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table_head.html' %} + </tfoot> + </table> +</div> \ No newline at end of file diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html index ebe60202b2972c08258b4a791746de161b4b3dd1..f581f45c8253ec0277d565fb54aadcfd62c4f14c 100644 --- a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html +++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_data.html @@ -15,6 +15,11 @@ {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table.html' %} </div> </div> + <div class="row"> + <div class="col"> + {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_pagination.html' %} + </div> + </div> </div> {% endblock %} diff --git a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_imported.html b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_imported.html index b3cdb57704956da03ec77c3906a29bd9da3914e0..3db9ada86137d4363122088fa914557a6fcc388b 100644 --- a/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_imported.html +++ b/src/covid19/blueprints/rki/rki_vaccination/templates/rki_vaccination/rki_vaccination_imported.html @@ -12,7 +12,12 @@ </div> <div class="row"> <div class="col"> - {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table.html' %} + {% include 'rki_vaccination/fragments/fragment_rki_vaccination_data_table_imported.html' %} + </div> + </div> + <div class="row"> + <div class="col"> + {% include 'rki_vaccination/fragments/fragment_rki_vaccination_imported_pagination.html' %} </div> </div> </div> diff --git a/src/covid19/blueprints/who/templates/who/who_imported.html b/src/covid19/blueprints/who/templates/who/who_imported.html index 63b038b3a2f3c271406c45a4543cdc65a0efdba4..09dd8382274c78486d426e2dea1055f24326c48b 100644 --- a/src/covid19/blueprints/who/templates/who/who_imported.html +++ b/src/covid19/blueprints/who/templates/who/who_imported.html @@ -15,6 +15,11 @@ {% include 'who/fragments/fragment_who_imported_table.html' %} </div> </div> + <div class="row"> + <div class="col"> + {% include 'who/fragments/fragment_who_imported_pagination.html' %} + </div> + </div> </div> {% endblock %}