Skip to content

Commit

Permalink
Hotfix for empty report in history table (#4087)
Browse files Browse the repository at this point in the history
  • Loading branch information
@madelondohmen
madelondohmen authored Feb 13, 2025
1 parent 83e2f5e commit 381e369
Showing 1 changed file with 106 additions and 100 deletions.
206 changes: 106 additions & 100 deletions rocky/reports/templates/report_overview/report_history_table.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,24 +87,24 @@
</thead>
<tbody>
{% for report in reports %}
{% if report.total_asset_reports >= 1 %}
<tr>
<td>
<input type="checkbox"
class="report-checkbox"
name="report"
value="{{ report.report.reference }}"
{% if report.id in selected_reports or "all" in selected_reports %}checked{% endif %}
{% if "all" in selected_reports %}disabled{% endif %}>
</td>
<td class="report_name">
<a id="report_name_{{ report.report.reference|slugify }}"
href="{% url "view_report" organization.code %}?report_id={{ report.report.reference }}&observed_at={{ report.report.observed_at|date:"Y-m-d H:i:s:u" }}"
title="{% translate "Shows parent report details" %}">{{ report.report.name }}</a>
</td>
<td class="report_types">
<ul class="tags horizontal-view">
{% if report.report.report_type == "concatenated-report" or report.report.report_type is None %}
<tr>
<td>
<input type="checkbox"
class="report-checkbox"
name="report"
value="{{ report.report.reference }}"
{% if report.id in selected_reports or "all" in selected_reports %}checked{% endif %}
{% if "all" in selected_reports %}disabled{% endif %}>
</td>
<td class="report_name">
<a id="report_name_{{ report.report.reference|slugify }}"
href="{% url "view_report" organization.code %}?report_id={{ report.report.reference }}&observed_at={{ report.report.observed_at|date:"Y-m-d H:i:s:u" }}"
title="{% translate "Shows parent report details" %}">{{ report.report.name }}</a>
</td>
<td class="report_types">
<ul class="tags horizontal-view">
{% if report.report.report_type == "concatenated-report" %}
{% if report.report_type_summary %}
{% for report_type, total_objects in report.report_type_summary.items %}
{% if forloop.counter0 < 2 %}
<li>
Expand All @@ -118,22 +118,26 @@
{% endif %}
{% endfor %}
{% else %}
<li>
<span class="label tags-color-{{ report.report.report_type|get_report_type_label_style }}">{{ report.report.report_type|get_report_type_name }}</span>
</li>
-
{% endif %}
</ul>
</td>
<td class="report_oois">
{% if report.total_objects == 1 %}
<a href="{% ooi_url "ooi_detail" report.report.input_oois.0.input_ooi organization.code query=ooi.mandatory_fields %}">{{ report.report.input_oois.0.input_ooi|human_readable }}</a>
{% else %}
{{ report.total_objects }}
<li>
<span class="label tags-color-{{ report.report.report_type|get_report_type_label_style }}">{{ report.report.report_type|get_report_type_name }}</span>
</li>
{% endif %}
</td>
<td class="nowrap report_reference_date">{{ report.report.observed_at|date }}</td>
<td class="nowrap report_creation_date">{{ report.report.date_generated }}</td>
<td>
</ul>
</td>
<td class="report_oois">
{% if report.total_objects == 1 %}
<a href="{% ooi_url "ooi_detail" report.report.input_oois.0.input_ooi organization.code query=ooi.mandatory_fields %}">{{ report.report.input_oois.0.input_ooi|human_readable }}</a>
{% else %}
{{ report.total_objects }}
{% endif %}
</td>
<td class="nowrap report_reference_date">{{ report.report.observed_at|date }}</td>
<td class="nowrap report_creation_date">{{ report.report.date_generated }}</td>
<td>
{% if report.total_asset_reports >= 1 %}
<button type="button"
class="expando-button icon ti-chevron-down"
data-icon-open-class="icon ti-chevron-down"
Expand All @@ -142,83 +146,85 @@
aria-expanded="false">
{% translate "Open asset report object details" %}
</button>
</td>
</tr>
{% endif %}
<tr class="expando-row">
<td colspan="6">
<table>
<caption class="visually-hidden">{% translate "Asset reports details:" %}</caption>
<h5>{% translate "Report types" %}</h5>
<p>
{% blocktranslate count counter=report.total_asset_reports %}
{% endif %}
</td>
</tr>
{% if report.total_asset_reports >= 1 %}
<tr class="expando-row">
<td colspan="6">
<table>
<caption class="visually-hidden">{% translate "Asset reports details:" %}</caption>
<h5>{% translate "Report types" %}</h5>
<p>
{% blocktranslate count counter=report.total_asset_reports %}
This report consists of {{counter}} asset report with the following report type and object:
{% plural %}
This report consists of {{counter}} asset reports with the following report types and objects:
{% endblocktranslate %}
</p>
<thead>
<tr>
<th scope="col">{% translate "Report type" %}</th>
<th scope="col">{% translate "Objects" %}</th>
</tr>
</thead>
<tbody>
{% for report_type, total_objects in report.report_type_summary.items %}
</p>
<thead>
<tr>
<td>
<ul class="tags horizontal-view">
<li>
<span class="label tags-color-{{ report_type|get_report_type_label_style }}">{{ report_type|get_report_type_name }}</span>
</li>
</ul>
</td>
<td>{{ total_objects }}</td>
<th scope="col">{% translate "Report type" %}</th>
<th scope="col">{% translate "Objects" %}</th>
</tr>
{% endfor %}
</tbody>
</table>
<table>
<h5>
{% translate "Asset reports" %}
({{ report.asset_reports|length }}/{{ report.total_asset_reports }})
</h5>
<thead>
<tr>
<th scope="col">{% translate "Report type" %}</th>
<th scope="col">{% translate "Object" %}</th>
<th scope="col">{% translate "Report name" %}</th>
</tr>
</thead>
<tbody>
{% for asset_report in report.asset_reports %}
</thead>
<tbody>
{% for report_type, total_objects in report.report_type_summary.items %}
<tr>
<td>
<ul class="tags horizontal-view">
<li>
<span class="label tags-color-{{ report_type|get_report_type_label_style }}">{{ report_type|get_report_type_name }}</span>
</li>
</ul>
</td>
<td>{{ total_objects }}</td>
</tr>
{% endfor %}
</tbody>
</table>
<table>
<h5>
{% translate "Asset reports" %}
({{ report.asset_reports|length }}/{{ report.total_asset_reports }})
</h5>
<thead>
<tr>
<td>
<ul class="tags horizontal-view">
<li>
<span class="label tags-color-{{ asset_report.report_type|get_report_type_label_style }}">{{ asset_report.report_type|get_report_type_name }}</span>
</li>
</ul>
</td>
<td>
<a href="{% ooi_url 'ooi_detail' asset_report.input_ooi organization.code %}">{{ asset_report.input_ooi|human_readable }}</a>
</td>
<td>
<a href="{% url "view_report" organization.code %}?asset_report_id={{ asset_report }}&observed_at={{ asset_report.observed_at|date:"Y-m-d H:i:s:u" }}"
title="{% translate "Shows asset report details" %}">{{ asset_report.name }}</a>
</td>
<th scope="col">{% translate "Report type" %}</th>
<th scope="col">{% translate "Object" %}</th>
<th scope="col">{% translate "Report name" %}</th>
</tr>
{% endfor %}
</tbody>
</table>
<div class="button-container">
{% if report.total_asset_reports > 5 %}
<a href="{% url "subreports" organization.code %}?report_id={{ report.report.reference }}"
class="button">{% translate "View all asset reports" %}</a>
{% endif %}
</div>
</td>
</tr>
</thead>
<tbody>
{% for asset_report in report.asset_reports %}
<tr>
<td>
<ul class="tags horizontal-view">
<li>
<span class="label tags-color-{{ asset_report.report_type|get_report_type_label_style }}">{{ asset_report.report_type|get_report_type_name }}</span>
</li>
</ul>
</td>
<td>
<a href="{% ooi_url 'ooi_detail' asset_report.input_ooi organization.code %}">{{ asset_report.input_ooi|human_readable }}</a>
</td>
<td>
<a href="{% url "view_report" organization.code %}?asset_report_id={{ asset_report }}&observed_at={{ asset_report.observed_at|date:"Y-m-d H:i:s:u" }}"
title="{% translate "Shows asset report details" %}">{{ asset_report.name }}</a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
<div class="button-container">
{% if report.total_asset_reports > 5 %}
<a href="{% url "subreports" organization.code %}?report_id={{ report.report.reference }}"
class="button">{% translate "View all asset reports" %}</a>
{% endif %}
</div>
</td>
</tr>
{% endif %}
{% endfor %}
</tbody>
</table>
Expand Down

0 comments on commit 381e369

Please sign in to comment.