From 4d305e1fa24ab3d64b86371a9d07f445fe6f7eb5 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 20 Oct 2025 12:54:17 +0100
Subject: [PATCH] Add logging for bulk delete request and update button for
 selected questions deletion

---
 generic/views.py                   |  2 +
 templates/question_table_view.html | 77 ++++--------------------------
 2 files changed, 10 insertions(+), 69 deletions(-)

diff --git a/generic/views.py b/generic/views.py
index db59e603..25734508 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -160,6 +160,8 @@ def bulk_delete_questions(request):
     if request.method != "POST":
         return HttpResponse(status=405)
 
+    logger.debug(f"bulk_delete_questions called with POST: {request.POST}")
+
     app = request.POST.get("app")
 
     # Accept different submission patterns: checkboxes may be sent as 'selection' or 'selected'
diff --git a/templates/question_table_view.html b/templates/question_table_view.html
index 912a1e29..98a52357 100644
--- a/templates/question_table_view.html
+++ b/templates/question_table_view.html
@@ -18,15 +18,15 @@
             </form>
         </details>
     </div>
-    <form id="bulk-delete-form" method="post" action="{% url 'generic:bulk_delete_questions' %}" hx-post="{% url 'generic:bulk_delete_questions' %}" hx-target="#bulk-delete-result" hx-swap="innerHTML">
         {% render_table table %}
 
-        {% csrf_token %}
-        <input type="hidden" name="app" value="{{ app_name }}">
-        <input type="hidden" name="selected" id="bulk-selected-input" value="">
-        <button id="button-bulk-delete" class="btn btn-danger btn-sm" type="submit">Delete selected</button>
-        <span id="bulk-delete-result" class="ms-2"></span>
-    </form>
+    <button id="delete-selected-btn" class="btn btn-danger btn-sm mt-2"
+    hx-post="{% url 'generic:bulk_delete_questions' %}"
+    hx-include="[name='selection']:checked" hx-vals='{"app":"{{ app_name|escapejs }}"}'
+    hx-target="#action-result"
+    hx-swap="innerHTML"
+    hx-confirm="Are you sure you want to delete the selected questions? This action cannot be undone.">
+    Delete selected questions</button>
 
     <button id="button-select-add-exam"
             data-exam_json_edit_url="{% url 'generic:generic_exam_json_edit' %}"
@@ -34,67 +34,6 @@
             data-type={{app_name}} data-csrf="{{ csrf_token}}">Add selected questions to
         exam</button>
 
-{% endblock %}
+    <div id="action-result" class="mt-2"></div>
 
-{% block scripts %}
-    <script>
-    // When the user submits the bulk-delete form, gather selected checkboxes from the table
-        document.getElementById('bulk-delete-form').addEventListener('submit', function(e){
-            const selected = [];
-            // Try common patterns: name="selection", name="selection[]", name="selection-<pk>", data-pk, or any checked checkbox inside the table
-            // 1) explicit selection name
-            document.querySelectorAll('input[type=checkbox][name="selection"]:checked, input[type=checkbox][name="selection[]"]:checked').forEach(function(cb){
-                if(cb.value) selected.push(cb.value);
-                else if(cb.dataset && cb.dataset.pk) selected.push(cb.dataset.pk);
-            });
-
-            // 2) inputs with name like selection-<pk> or selection_<pk>
-            document.querySelectorAll('input[type=checkbox]').forEach(function(cb){
-                if(!cb.checked) return;
-                const n = cb.getAttribute('name') || '';
-                if(n.startsWith('selection-') || n.startsWith('selection_')){
-                    // try extract trailing number
-                    const m = n.match(/selection[-_](\d+)/);
-                    if(m && m[1]){
-                        selected.push(m[1]);
-                    } else if(cb.value){
-                        selected.push(cb.value);
-                    }
-                }
-                // 3) fallback: any checked checkbox inside the rendered table
-                if(cb.closest('table') && cb.checked && cb.value){
-                    selected.push(cb.value);
-                }
-                // 4) data-pk attribute
-                if(cb.checked && cb.dataset && cb.dataset.pk){
-                    selected.push(cb.dataset.pk);
-                }
-            });
-        // fallback: django-tables2 renders checkboxes with accessor name 'selection' and value
-            if(selected.length === 0){
-            // try to find inputs inside table
-                document.querySelectorAll('table input[type=checkbox]').forEach(function(cb){
-                    if(cb.checked && cb.value) selected.push(cb.value);
-                });
-            }
-            // dedupe
-            const uniq = Array.from(new Set(selected.map(String)));
-            console.log('Bulk delete selected ids:', uniq);
-            document.getElementById('bulk-selected-input').value = uniq.join(',');
-            // Confirm with the user before submitting
-            const count = uniq.length;
-            if(count === 0){
-                // nothing selected: prevent submit and show alert
-                e.preventDefault();
-                alert('No items selected for deletion.');
-                return;
-            }
-            const ok = confirm(`Delete ${count} selected question${count === 1 ? '' : 's'}? This cannot be undone.`);
-            if(!ok){
-                e.preventDefault();
-                return;
-            }
-        // allow HTMX to submit
-        });
-    </script>
 {% endblock %}
\ No newline at end of file