From f968b0c5e282090d9dd2c33df19ba17c4817426b Mon Sep 17 00:00:00 2001
From: mahdahar <89adham@gmail.com>
Date: Tue, 7 Apr 2026 11:03:54 +0700
Subject: [PATCH] feat: default request sorting by status

---
 app/Controllers/RequestsController.php | 15 ++++++++++++---
 app/Views/shared/content_requests.php  | 20 +++++++++++++++++++-
 app/Views/shared/script_requests.php   |  8 ++++----
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/app/Controllers/RequestsController.php b/app/Controllers/RequestsController.php
index 774dc85..a216944 100644
--- a/app/Controllers/RequestsController.php
+++ b/app/Controllers/RequestsController.php
@@ -22,7 +22,7 @@ class RequestsController extends BaseController
     $pageSize = max(1, min(self::MAX_PAGE_SIZE, $pageSize));
     $offset = ($page - 1) * $pageSize;
 
-    $sortCol = (string) ($this->request->getGet('sortCol') ?? 'REQDATE');
+    $sortCol = (string) ($this->request->getGet('sortCol') ?? 'STATS');
     $sortDirRaw = strtoupper((string) ($this->request->getGet('sortDir') ?? 'DESC'));
     $sortDir = $sortDirRaw === 'ASC' ? 'ASC' : 'DESC';
     $sortSql = $this->resolveSortColumn($sortCol);
@@ -164,10 +164,19 @@ class RequestsController extends BaseController
       'HOSTORDERNUMBER' => 'd.HOSTORDERNUMBER',
       'REFF' => 'd.REFF',
       'DOC' => 'd.DOC',
-      'STATS' => 'd.STATS',
+      'STATS' => "CASE d.STATS
+        WHEN 'Pend' THEN 1
+        WHEN 'PartColl' THEN 2
+        WHEN 'Coll' THEN 3
+        WHEN 'PartRecv' THEN 4
+        WHEN 'Recv' THEN 5
+        WHEN 'Inc' THEN 6
+        WHEN 'Fin' THEN 7
+        ELSE 99
+      END",
     ];
 
-    return $map[$sortCol] ?? 'd.REQDATE';
+    return $map[$sortCol] ?? $map['STATS'];
   }
 
 
diff --git a/app/Views/shared/content_requests.php b/app/Views/shared/content_requests.php
index 54a8f4e..c2843e7 100644
--- a/app/Views/shared/content_requests.php
+++ b/app/Views/shared/content_requests.php
@@ -97,6 +97,9 @@ $canUnval = $userLevel <= 1;
 							<th style='width:9%;'>
 								<div class="skeleton h-4 w-20"></div>
 							</th>
+							<th style='width:7%;'>
+								<div class="skeleton h-4 w-16"></div>
+							</th>
 							<th style='width:18%;'>
 								<div class="skeleton h-4 w-32"></div>
 							</th>
@@ -124,12 +127,18 @@ $canUnval = $userLevel <= 1;
 							<th style='width:5%;'>
 								<div class="skeleton h-4 w-12"></div>
 							</th>
+							<th style='width:5%;'>
+								<div class="skeleton h-4 w-12"></div>
+							</th>
+							<th style='width:5%;'>
+								<div class="skeleton h-4 w-12"></div>
+							</th>
 						</tr>
 					</thead>
 					<tbody>
 						<template x-for="i in 5" :key="i">
 							<tr>
-								<td colspan="10">
+								<td colspan="13">
 									<div class="skeleton h-4 w-full"></div>
 								</td>
 							</tr>
@@ -155,6 +164,14 @@ $canUnval = $userLevel <= 1;
 										:class="sortCol === 'REQDATE' ? (sortAsc ? 'fa-sort-up' : 'fa-sort-down') : 'fa-sort opacity-20'"></i>
 								</div>
 							</th>
+							<th style='width:7%;' @click="sort('STATS')"
+								class="cursor-pointer hover:bg-base-200 transition-colors select-none">
+								<div class="flex items-center gap-1">
+									Status
+									<i class="fa text-xs"
+										:class="sortCol === 'STATS' ? (sortAsc ? 'fa-sort-up' : 'fa-sort-down') : 'fa-sort opacity-20'"></i>
+								</div>
+							</th>
 							<th style='width:18%;' @click="sort('Name')"
 								class="cursor-pointer hover:bg-base-200 transition-colors select-none">
 								<div class="flex items-center gap-1">
@@ -207,6 +224,7 @@ $canUnval = $userLevel <= 1;
 					<template x-for="req in filteredRows" :key="req.SP_ACCESSNUMBER">
 							<tr class="hover:bg-base-300">
 								<td x-text="req.REQDATE" :class="statusRowBg[req.STATS]"></td>
+								<td x-text="req.STATS" :class="statusRowBg[req.STATS]"></td>
 								<td x-text="req.Name" :class="statusRowBg[req.STATS]"></td>
 								<td x-text="req.SP_ACCESSNUMBER" class="font-bold" :class="statusRowBg[req.STATS]"></td>
 								<td x-text="req.HOSTORDERNUMBER" class="font-bold" :class="statusRowBg[req.STATS]"></td>
diff --git a/app/Views/shared/script_requests.php b/app/Views/shared/script_requests.php
index 0ae821e..5a4948b 100644
--- a/app/Views/shared/script_requests.php
+++ b/app/Views/shared/script_requests.php
@@ -48,8 +48,8 @@ document.addEventListener('alpine:init', () => {
 		filterKey: 'Total',
 
 		// Sorting & Pagination
-		sortCol: 'REQDATE',
-		sortAsc: false,
+		sortCol: 'STATS',
+		sortAsc: true,
 		currentPage: 1,
 		pageSize: 50,
 		totalPages: 1,
@@ -166,8 +166,8 @@ document.addEventListener('alpine:init', () => {
 			this.filterTable = '';
 			this.filterKey = 'Total';
 			this.currentPage = 1;
-			this.sortCol = 'REQDATE';
-			this.sortAsc = false;
+			this.sortCol = 'STATS';
+			this.sortAsc = true;
 			this.fetchList();
 		},