+
+{% endif %}
+
{# ── Recent activity ─────────────────────────────────────────────────────── #}
+ My Open Issues
+ View all
+
+
+
+
+
+
+| ID | +Severity | +Facility / Description | +Status | +SLA | +
|---|---|---|---|---|
| + #{{ issue.id }} + | ++ + {{ issue.severity|title }} + + | +
+ {{ issue.resolved_facility.name if issue.resolved_facility else '—' }}
+ {{ issue.description[:60] }}{% if issue.description|length > 60 %}…{% endif %}
+ |
+ + + {{ issue.status|replace('_',' ')|title }} + + | ++ {% if sla == 'breached' %} + Breached + {% elif sla == 'at_risk' %} + {{ sla_hours_remaining(issue)|abs|round(1) }}h left + {% else %} + OK + {% endif %} + | +
diff --git a/app/templates/inspections/execute.html b/app/templates/inspections/execute.html
index 958fe51..3ba8d64 100644
--- a/app/templates/inspections/execute.html
+++ b/app/templates/inspections/execute.html
@@ -254,8 +254,8 @@
@@ -433,6 +433,16 @@
{{ field.help_text }}
{% endif %}
{# ── Signature ── #}
@@ -492,6 +502,8 @@
+
+
{% endblock %}
@@ -602,6 +674,9 @@ async function uploadPhotoField(input) {
if (pathHidden) pathHidden.value = json.path;
if (iconEl) iconEl.className = 'bi bi-check-circle-fill';
if (promptEl) promptEl.textContent = 'Photo saved';
+ // Show thumbnail
+ const thumb = document.getElementById('thumb_' + fid);
+ if (thumb) { thumb.src = '/static/' + json.path; thumb.style.display = ''; }
} else {
// Upload failed — file is still in the input, will be sent on full form submit
if (iconEl) iconEl.className = 'bi bi-cloud-upload';
@@ -637,6 +712,8 @@ function clearUpload(fid) {
if (pathHidden) pathHidden.value = '';
if (iconEl) iconEl.className = 'bi bi-cloud-upload';
if (promptEl) promptEl.textContent = 'Tap to take / choose photo';
+ const thumb = document.getElementById('thumb_' + fid);
+ if (thumb) { thumb.src = ''; thumb.style.display = 'none'; }
}
// ── Signature pads ────────────────────────────────────────────────────────────
@@ -819,21 +896,58 @@ document.getElementById('inspectionForm').addEventListener('submit', async funct
}
});
-// ── Flag Issue: save draft via AJAX then navigate ────────────────────────────
+// ── Progress indicator ────────────────────────────────────────────────────────
+// Counts answered fields (non-display) and updates the footer label.
(function () {
- const btn = document.getElementById('flagIssueBtn');
- if (!btn) return;
+ const DISPLAY_TYPES = new Set(['label', 'section', 'button_submit', 'button_print', 'button_email']);
+ const totalFields = {{ form_fields | selectattr('type', 'ne', 'label') | selectattr('type', 'ne', 'section') | selectattr('type', 'ne', 'button_submit') | selectattr('type', 'ne', 'button_print') | selectattr('type', 'ne', 'button_email') | list | length }};
- btn.addEventListener('click', async function () {
- const saveDraftUrl = btn.dataset.flagUrl;
- const redirectUrl = btn.dataset.flagRedirect;
+ function countAnswered() {
+ if (!totalFields) return;
+ const form = document.getElementById('inspectionForm');
+ let answered = 0;
- // Collect all current form field values (non-file inputs only)
- const form = document.getElementById('inspectionForm');
+ form.querySelectorAll('[name^="field_"]').forEach(el => {
+ if (el.type === 'file' || el.type === 'hidden') return;
+ if (el.type === 'radio' && !el.checked) return;
+ if (el.type === 'checkbox') { /* counted below via group */ return; }
+ const val = el.value || '';
+ if (val && val !== '0') answered++;
+ });
+ // Image fields: count by server_path hidden inputs
+ form.querySelectorAll('input[id$="_server_path"]').forEach(el => {
+ if (el.value) answered++;
+ });
+ // Radio groups: count each named group once if any option checked
+ const radioGroups = new Set();
+ form.querySelectorAll('input[type="radio"]:checked').forEach(el => {
+ if (el.name && el.name.startsWith('field_')) radioGroups.add(el.name);
+ });
+ answered += radioGroups.size;
+ // Checkbox fields: count those that are checked
+ form.querySelectorAll('input[type="checkbox"][name^="field_"]:checked').forEach(() => answered++);
+
+ const label = document.getElementById('progressLabel');
+ if (label) label.textContent = `${Math.min(answered, totalFields)} / ${totalFields} fields`;
+ }
+
+ document.getElementById('inspectionForm')
+ .addEventListener('input', countAnswered, { passive: true });
+ countAnswered();
+}());
+
+// ── Auto-save draft every 60 seconds ─────────────────────────────────────────
+(function () {
+ const SAVE_URL = {{ url_for('inspections.save_draft_ajax', inspection_id=inspection.id) | tojson }};
+ const statusEl = document.getElementById('autoSaveStatus');
+
+ async function autoSave() {
+ const form = document.getElementById('inspectionForm');
const responses = {};
+ collectSignatures();
form.querySelectorAll('input, textarea, select').forEach(el => {
if (!el.name || !el.name.startsWith('field_')) return;
- if (el.type === 'file') return; // files can't be JSON-serialised
+ if (el.type === 'file') return;
if (el.type === 'checkbox') {
responses[el.name.replace('field_', '')] = el.checked ? 'true' : 'false';
} else if (el.type === 'radio') {
@@ -842,27 +956,12 @@ document.getElementById('inspectionForm').addEventListener('submit', async funct
responses[el.name.replace('field_', '')] = el.value;
}
});
-
- // Flush signature canvases to their hidden inputs before reading values
- collectSignatures();
- form.querySelectorAll('input[type="hidden"]').forEach(el => {
- if (!el.name || !el.name.startsWith('field_')) return;
- responses[el.name.replace('field_', '')] = el.value;
+ form.querySelectorAll('input[id$="_server_path"]').forEach(el => {
+ const m = el.id.match(/^field_(.+)_server_path$/);
+ if (m && el.value) responses[m[1]] = el.value;
});
-
- // Include server paths for image fields that were already AJAX-uploaded.
- // These are stored in no-name hidden inputs (id="field_
+
+ + Flag Issue +
+ +
+
++ Facility: {{ inspection.facility.name }} +
+ +
+
+
+
+
+