Aug 19 - Update code to catch up with ST

app/templates/modern/inspections/list.html

@@ -25,16 +25,18 @@
   <div>
     <div class="jqc-page-title">Inspections</div>
   </div>
-  {% if current_user.role != 'customer' %}
+  {# Customer Directors schedule inspections for their own facilities, so the
+     Scheduled link is theirs too — but starting an ad-hoc inspection is not. #}
   <div class="d-flex gap-2">
     <a href="{{ url_for('inspection_schedules.index') }}" class="btn btn-outline-primary">
       <i class="bi bi-calendar-check"></i> Scheduled
     </a>
+    {% if current_user.role != 'customer' %}
     <a href="{{ url_for('inspections.start') }}" class="btn btn-primary">
       <i class="bi bi-plus-circle"></i> New Inspection
     </a>
+    {% endif %}
   </div>
-  {% endif %}
 </div>
 
 {# ── Filters ──────────────────────────────────────────────────────────── #}
@@ -162,10 +164,15 @@
   {% endif %}
 
   {% if inspections.items %}
+  {% include 'partials/bulk_inspections_toolbar.html' %}
   <div class="jqc-table-wrap table-responsive">
     <table class="table table-hover mb-0">
       <thead>
         <tr>
+          <th style="width:34px;">
+            <input type="checkbox" class="form-check-input bulk-check-all"
+                   title="Select all on this page" aria-label="Select all">
+          </th>
           <th>#</th><th>Date</th><th>Contract</th><th>Facility</th><th>Area</th>
           <th>Template</th><th>Inspector</th><th>Score</th>
           <th>Status</th><th></th>
@@ -174,6 +181,11 @@
       <tbody>
         {% for ins in inspections.items %}
         <tr>
+          <td>
+            <input type="checkbox" class="form-check-input bulk-check"
+                   form="inspectionsBulkForm" name="inspection_ids" value="{{ ins.id }}"
+                   aria-label="Select inspection #{{ ins.id }}">
+          </td>
           <td><small class="text-muted">#{{ ins.id }}</small></td>
           <td class="text-nowrap">{{ ins.inspection_date.strftime('%Y-%m-%d %H:%M') }}</td>
           <td><small>{{ ins.facility.project.name if ins.facility and ins.facility.project else '—' }}</small></td>
@@ -215,9 +227,9 @@
           </td>
           <td class="text-nowrap">
             {% if ins.status == 'in_progress' or ins.status == 'flagged' %}
-            <a href="{{ url_for('inspections.execute', inspection_id=ins.id) }}" class="btn btn-sm btn-outline-primary insp-list-link">Continue</a>
+            <a href="{{ url_for('inspections.execute', inspection_id=ins.id, next=current_url()) }}" class="btn btn-sm btn-outline-primary insp-list-link">Continue</a>
             {% else %}
-            <a href="{{ url_for('inspections.view', inspection_id=ins.id) }}" class="btn btn-sm btn-outline-secondary insp-list-link">View</a>
+            <a href="{{ url_for('inspections.view', inspection_id=ins.id, next=current_url()) }}" class="btn btn-sm btn-outline-secondary insp-list-link">View</a>
             {% endif %}
             {% if current_user.role in ['admin', 'director'] %}
             <button type="button"
@@ -287,6 +299,7 @@
         </button>
         <form id="deleteInspectionForm" method="POST" action="" class="d-inline">
           <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+          <input type="hidden" name="next" value="{{ current_url() }}">
           <button type="submit" class="btn btn-danger">
             <i class="bi bi-trash3-fill"></i> Delete Permanently
           </button>
@@ -299,6 +312,7 @@
 {% endblock %}
 
 {% block extra_js %}
+{% include 'partials/bulk_select_js.html' %}
 <script>
 (function () {
   'use strict';

app/templates/modern/issues/list.html

@@ -166,10 +166,15 @@
   {% endif %}
 
   {% if issues.items %}
+  {% include 'partials/bulk_issues_toolbar.html' %}
   <div class="jqc-table-wrap table-responsive">
     <table class="table table-hover mb-0">
       <thead>
         <tr>
+          <th style="width:34px;">
+            <input type="checkbox" class="form-check-input bulk-check-all"
+                   title="Select all on this page" aria-label="Select all">
+          </th>
           <th>#</th>
           <th>Reported</th>
           <th>Severity</th>
@@ -188,6 +193,11 @@
         {% set is_following = issue.id in followed_ids %}
         {% set sla = sla_status(issue) %}
         <tr class="{{ 'table-danger' if sla == 'breached' else 'table-warning' if sla == 'at_risk' else '' }}">
+          <td>
+            <input type="checkbox" class="form-check-input bulk-check"
+                   form="issuesBulkForm" name="issue_ids" value="{{ issue.id }}"
+                   aria-label="Select issue #{{ issue.id }}">
+          </td>
           <td><small class="text-muted">#{{ issue.id }}</small></td>
           <td class="text-nowrap"><small>{{ issue.reported_at.strftime('%Y-%m-%d %H:%M') }}</small></td>
           <td>
@@ -236,7 +246,7 @@
               <select class="form-select form-select-sm quick-assign-select" style="min-width:110px;font-size:.78rem;">
                 <option value="">— Unassigned —</option>
                 {% for u in staff %}
-                <option value="{{ u.id }}" {{ 'selected' if issue.assigned_to == u.id }}>{{ u.display_name }}{{ ' (External)' if u.is_external_inspector }}</option>
+                <option value="{{ u.id }}" {{ 'selected' if issue.assigned_to == u.id }}>{{ u.display_name }}{{ ' (Customer)' if u.is_external_inspector }}</option>
                 {% endfor %}
               </select>
               <span class="quick-assign-spinner spinner-border spinner-border-sm text-secondary d-none" role="status"></span>
@@ -262,7 +272,7 @@
                   class="d-inline"
                   title="Unfollow this issue">
               <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
-              <input type="hidden" name="next" value="{{ url_for('issues.index', page=issues.page, issue_id=issue_id_filter, severity=severity_filter, status=status_filter, contract_id=contract_filter, facility_id=facility_filter, date_from=date_from_filter, date_to=date_to_filter, reporter_id=reporter_filter, handler_type=handler_filter, unassigned=unassigned_filter) }}">
+              <input type="hidden" name="next" value="{{ current_url() }}">
               <button type="submit" class="btn btn-sm btn-outline-primary p-0 px-1 me-1"
                       title="Unfollow">
                 <i class="bi bi-bell-slash" style="font-size:.75rem;"></i>
@@ -270,7 +280,7 @@
             </form>
             {% endif %}
 
-            <a href="{{ url_for('issues.view', issue_id=issue.id) }}"
+            <a href="{{ url_for('issues.view', issue_id=issue.id, next=current_url()) }}"
                class="btn btn-sm btn-outline-secondary">
               {% if current_user.role in ['admin','director','auditor'] or issue.assigned_to == current_user.id %}
                 <i class="bi bi-pencil"></i> Edit
@@ -283,6 +293,7 @@
                   class="d-inline"
                   onsubmit="return confirm('Permanently delete Issue #{{ issue.id }}? This cannot be undone.');">
               <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+              <input type="hidden" name="next" value="{{ current_url() }}">
               <button type="submit" class="btn btn-sm btn-outline-danger"
                       title="Delete Issue #{{ issue.id }}">
                 <i class="bi bi-trash"></i>
@@ -324,6 +335,7 @@
 {% endblock %}
 
 {% block extra_js %}
+{% include 'partials/bulk_select_js.html' %}
 <script>
 (function () {
   'use strict';