05/04 Update code to replace Area related to Facility

This commit is contained in:
2026-05-04 13:46:37 -04:00
parent 2bdd6c1a26
commit a0136bd99b
17 changed files with 174 additions and 95 deletions
+1 -5
View File
@@ -14,11 +14,7 @@
</div>
<form method="post" enctype="multipart/form-data">
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
<div class="mb-3">
{{ form.area_id.label(class="form-label fw-semibold") }}
{{ form.area_id(class="form-select") }}
</div>
{{ form.facility_id(type="hidden") }}
<div class="mb-3">
{{ form.severity.label(class="form-label fw-semibold") }}
{{ form.severity(class="form-select") }}
+1 -1
View File
@@ -26,4 +26,4 @@
</div>
</div>
</div>
{% endblock %}
{% endblock %}
+2 -2
View File
@@ -77,8 +77,8 @@
</span>
</td>
<td>
{{ issue.area.facility.name }}<br>
<small class="text-muted">{{ issue.area.name }}</small>
{{ issue.resolved_facility.name if issue.resolved_facility else '—' }}<br>
<small class="text-muted">{{ issue.area.name if issue.area else '—' }}</small>
</td>
<td>{{ issue.description[:60] }}{% if issue.description|length > 60 %}…{% endif %}</td>
<td>
+2 -2
View File
@@ -29,10 +29,10 @@
{% endif %}
<dt class="col-sm-3">Facility</dt>
<dd class="col-sm-9">{{ issue.area.facility.name }}</dd>
<dd class="col-sm-9">{{ issue.resolved_facility.name if issue.resolved_facility else '—' }}</dd>
<dt class="col-sm-3">Area</dt>
<dd class="col-sm-9">{{ issue.area.name }}</dd>
<dd class="col-sm-9">{{ issue.area.name if issue.area else '—' }}</dd>
{% if issue.inspection %}
<dt class="col-sm-3">Inspection</dt>
+2 -2
View File
@@ -77,8 +77,8 @@
</span>
</td>
<td>
{{ issue.area.facility.name }}<br>
<small class="text-muted">{{ issue.area.name }}</small>
{{ issue.resolved_facility.name if issue.resolved_facility else '—' }}<br>
<small class="text-muted">{{ issue.area.name if issue.area else '—' }}</small>
</td>
<td>{{ issue.description[:60] }}{% if issue.description|length > 60 %}…{% endif %}</td>
<td>
+1 -1
View File
@@ -77,7 +77,7 @@
{# Area / Description #}
<td class="align-middle">
<div class="fw-semibold small">{{ issue.area.name }}</div>
<div class="fw-semibold small">{{ issue.area.name if issue.area else '—' }}</div>
<div class="text-muted small">
{{ issue.description[:80] }}{% if issue.description|length > 80 %}…{% endif %}
</div>
+3 -3
View File
@@ -18,10 +18,10 @@
<dd class="col-sm-9">{{ issue.reported_at.strftime('%Y-%m-%d %H:%M') }}</dd>
<dt class="col-sm-3">Facility</dt>
<dd class="col-sm-9">{{ issue.area.facility.name }}</dd>
<dd class="col-sm-9">{{ issue.resolved_facility.name if issue.resolved_facility else '—' }}</dd>
<dt class="col-sm-3">Area</dt>
<dd class="col-sm-9">{{ issue.area.name }}</dd>
<dd class="col-sm-9">{{ issue.area.name if issue.area else '—' }}</dd>
{% if issue.inspection %}
<dt class="col-sm-3">Inspection</dt>
@@ -245,7 +245,7 @@
</div>
<div class="modal-body">
<p>You are about to permanently delete:</p>
<p class="fw-bold">Issue #{{ issue.id }} — {{ issue.severity|title }} severity in {{ issue.area.name }}</p>
<p class="fw-bold">Issue #{{ issue.id }} — {{ issue.severity|title }} severity in {{ issue.area.name if issue.area else '—' }}</p>
<div class="alert alert-warning mb-0">
<i class="bi bi-exclamation-triangle-fill"></i>
This action is <strong>irreversible</strong>. All comments, photos, and