From b48168ffec5975fd5210b33f6255f62d954a0a30 Mon Sep 17 00:00:00 2001
From: wrongecho <marcus@itflow.org>
Date: Mon, 12 Jan 2026 15:36:06 +0000
Subject: [PATCH] Rewrite kanban in more procedural code to match existing
 codebase (as a v2, delete old and rename once we're happy)

---
 admin/settings_ticket.php  |   2 +-
 agent/ticket_kanban_v2.php | 176 +++++++++++++++++++++++++++++++++++++
 agent/tickets.php          |   7 +-
 3 files changed, 182 insertions(+), 3 deletions(-)
 create mode 100644 agent/ticket_kanban_v2.php

diff --git a/admin/settings_ticket.php b/admin/settings_ticket.php
index 05e7fbba..f9736c1f 100644
--- a/admin/settings_ticket.php
+++ b/admin/settings_ticket.php
@@ -97,7 +97,7 @@ require_once "includes/inc_all_admin.php";
                 <label>Kanban Settings</label>
                     <div class="custom-control custom-switch">
                         <input type="checkbox" class="custom-control-input" name="config_ticket_ordering" <?php if ($config_ticket_ordering == 1) { echo "checked"; } ?> value="1" id="ticketOrderingSwitch">
-                        <label class="custom-control-label" for="ticketOrderingSwitch">Allow ticket ordering within its column<small class="text-secondary">(uncheked will result in ordering it by priority and id)</small></label>
+                        <label class="custom-control-label" for="ticketOrderingSwitch">Allow ticket ordering within its column<small class="text-secondary"> (unchecked = order by priority and id)</small></label>
                     </div>
                     <div class="custom-control custom-switch">
                     <input type="checkbox" class="custom-control-input" name="config_ticket_moving_columns" <?php if ($config_ticket_moving_columns == 1) { echo "checked"; } ?> value="1" id="ticketMovingColumnsSwitch">
diff --git a/agent/ticket_kanban_v2.php b/agent/ticket_kanban_v2.php
new file mode 100644
index 00000000..464ebec4
--- /dev/null
+++ b/agent/ticket_kanban_v2.php
@@ -0,0 +1,176 @@
+<link rel="stylesheet" href="css/ticket_kanban.css">
+
+<?php
+isset($mysqli) || die("Direct file access is not allowed");
+
+// Fetch statuses
+$status_sql = mysqli_query($mysqli, "SELECT * FROM ticket_statuses WHERE ticket_status_active = 1 AND ticket_status_id != 5 ORDER BY ticket_status_order");
+
+$statuses = array();
+
+while ($row = mysqli_fetch_assoc($status_sql)) {
+
+    $status_id = intval($row['ticket_status_id']);
+    $status_name = nullable_htmlentities($row['ticket_status_name']);
+    $kanban_order = intval($row['ticket_status_order']);
+
+    $statuses[$status_id] = array(
+        'id'      => $status_id,
+        'name'    => $status_name,
+        'order'   => $kanban_order,
+        'tickets' => array()
+    );
+}
+
+$ordering_snippet = "ORDER BY
+    CASE
+        WHEN ticket_priority = 'High' THEN 1
+        WHEN ticket_priority = 'Medium' THEN 2
+        WHEN ticket_priority = 'Low' THEN 3
+        ELSE 4
+    END,
+    ticket_id DESC";
+
+if ($config_ticket_ordering == 1) {
+    $ordering_snippet = "ORDER BY ticket_order ASC";
+}
+
+// Fetch tickets
+$sql = mysqli_query(
+    $mysqli,
+    "SELECT SQL_CALC_FOUND_ROWS * FROM tickets
+    LEFT JOIN clients ON ticket_client_id = client_id
+    LEFT JOIN contacts ON ticket_contact_id = contact_id
+    LEFT JOIN users ON ticket_assigned_to = user_id
+    LEFT JOIN assets ON ticket_asset_id = asset_id
+    LEFT JOIN locations ON ticket_location_id = location_id
+    LEFT JOIN vendors ON ticket_vendor_id = vendor_id
+    LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
+    LEFT JOIN categories ON ticket_category = category_id
+    WHERE $ticket_status_snippet $ticket_assigned_query
+    $category_query
+    $client_query
+    AND DATE(ticket_created_at) BETWEEN '$dtf' AND '$dtt'
+    AND (
+        CONCAT(ticket_prefix,ticket_number) LIKE '%$q%' OR
+        client_name LIKE '%$q%' OR
+        ticket_subject LIKE '%$q%' OR
+        ticket_status_name LIKE '%$q%' OR
+        ticket_priority LIKE '%$q%' OR
+        user_name LIKE '%$q%' OR
+        contact_name LIKE '%$q%' OR
+        asset_name LIKE '%$q%' OR
+        vendor_name LIKE '%$q%' OR
+        ticket_vendor_ticket_number LIKE '%$q%'
+    )
+    $ticket_permission_snippet
+    $ordering_snippet"
+);
+
+while ($row = mysqli_fetch_assoc($sql)) {
+
+    $status_id = $row['ticket_status_id'];
+
+    foreach ($row as $key => $value) {
+        if (is_string($value)) {
+            $row[$key] = nullable_htmlentities($value);
+        }
+    }
+
+    if (isset($statuses[$status_id])) {
+        $statuses[$status_id]['tickets'][] = $row;
+    }
+}
+
+// Convert associative array to indexed array
+$kanban = array_values($statuses);
+?>
+
+<div class="container-fluid" id="kanban-board">
+
+    <?php foreach ($kanban as $column) { ?>
+
+        <div class="kanban-column card card-dark" data-status-id="<?php echo $column['id']; ?>">
+            <h6 class="panel-title"><?php echo $column['name']; ?></h6>
+
+            <div class="kanban-status" data-column-name="<?php echo $column['name']; ?>" data-status-id="<?php echo $column['id']; ?>">
+
+                <?php foreach ($column['tickets'] as $item) {
+
+                    if ($item['ticket_priority'] == "High") {
+                        $ticket_priority_color = "danger";
+                    } elseif ($item['ticket_priority'] == "Medium") {
+                        $ticket_priority_color = "warning";
+                    } else {
+                        $ticket_priority_color = "info";
+                    }
+                    ?>
+
+                    <div class="task grab-cursor"
+                         data-ticket-id="<?php echo $item['ticket_id']; ?>"
+                         data-ticket-status-id="<?php echo $item['ticket_status_id']; ?>"
+                         ondblclick="window.location.href='ticket.php?ticket_id=<?php echo $item['ticket_id']; ?>'">
+
+                <span class="badge badge-<?php echo $ticket_priority_color; ?>">
+                    <?php echo $item['ticket_priority']; ?>
+                </span>
+
+                        <span class="badge badge-secondary">
+                    <?php echo $item['category_name']; ?>
+                </span>
+
+                        <div class="btn btn-light drag-handle-class" style="display:none;">
+                            <i class="drag-handle-class fas fa-bars"></i>
+                        </div>
+
+                        <br>
+
+                        <b>
+                            <?php
+                            if (!$client_url) {
+                                if ($item['contact_name'] != "") {
+                                    echo $item['client_name'] . ' - ' . $item['contact_name'];
+                                } else {
+                                    echo $item['client_name'];
+                                }
+                            } else {
+                                echo $item['contact_name'];
+                            }
+                            ?>
+                        </b>
+
+                        <br>
+
+                        <?php if ($item['asset_name'] != "") { ?>
+                            <i class="fa fa-fw fa-desktop text-secondary mr-2"></i><?php echo $item['asset_name']; ?><br>
+                        <?php } ?>
+
+                        <i class="fa fa-fw fa-life-ring text-secondary mr-2"></i><?php echo $item['ticket_subject']; ?><br>
+
+                        <i class="fas fa-fw fa-user mr-2 text-secondary"></i><?php echo $item['user_name']; ?><br>
+
+                        <?php if ($item['ticket_schedule'] != "") { ?>
+                            <i class="fa fa-fw fa-calendar-check text-secondary mr-2"></i>
+                            <span class="badge badge-warning"><?php echo $item['ticket_schedule']; ?></span>
+                        <?php } ?>
+
+                    </div>
+
+                <?php } ?>
+
+            </div>
+        </div>
+
+    <?php } ?>
+
+</div>
+
+<?php
+echo "<script>";
+echo "const CONFIG_TICKET_MOVING_COLUMNS = " . json_encode($config_ticket_moving_columns) . ";";
+echo "const CONFIG_TICKET_ORDERING = " . json_encode($config_ticket_ordering) . ";";
+echo "</script>";
+?>
+
+<script src="../plugins/SortableJS/Sortable.min.js"></script>
+<script src="js/tickets_kanban.js"></script>
\ No newline at end of file
diff --git a/agent/tickets.php b/agent/tickets.php
index e4f4d28f..89fac035 100644
--- a/agent/tickets.php
+++ b/agent/tickets.php
@@ -235,8 +235,9 @@ $sql_categories_filter = mysqli_query(
                                 <div class="dropdown-menu">
                                     <a class="dropdown-item" href="<?=htmlspecialchars('?' . http_build_query(array_merge($_GET, ['view' => 'list']))); ?>">List</a>
                                     <?php if ($status !== 'Closed') {?>
-                                    <div class="dropdown-divider"></div>
-                                    <a class="dropdown-item " href="<?=htmlspecialchars('?' . http_build_query(array_merge($_GET, ['view' => 'kanban']))); ?>">Kanban</a>
+                                        <div class="dropdown-divider"></div>
+                                        <a class="dropdown-item " href="<?=htmlspecialchars('?' . http_build_query(array_merge($_GET, ['view' => 'kanban']))); ?>">Kanban</a>
+                                        <a class="dropdown-item " href="<?=htmlspecialchars('?' . http_build_query(array_merge($_GET, ['view' => 'kanbanv2']))); ?>">Kanban (v2)</a>
                                     <?php } ?>
                                 </div>
                             </div>
@@ -391,6 +392,8 @@ if (isset($_GET["view"])) {
         require_once "ticket_list.php";
     } elseif ($_GET["view"] == "kanban") {
         require_once "ticket_kanban.php";
+    } elseif ($_GET["view"] == "kanbanv2") {
+        require_once "ticket_kanban_v2.php";
     }
 } else {
     // here we have to get default view setting