From 4fa33194a5cebeb676441c3797a0793ecd3264ee Mon Sep 17 00:00:00 2001
From: mahdahar <89adham@gmail.com>
Date: Tue, 24 Feb 2026 10:32:28 +0700
Subject: [PATCH] Add validation user column and Reports menu items, fix phlebo
 routes

---
 app/Config/Routes.php                   |  3 ++-
 app/Views/shared/config.php             |  5 ++++-
 app/Views/shared/content_validation.php | 15 ++++++++++++---
 app/Views/shared/layout.php             |  7 +++++--
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 50417cf..ad47c1f 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -83,7 +83,8 @@ $routes->group('lab', ['filter' => 'role:2'], function ($routes) {
 });
 
 $routes->group('phlebo', ['filter' => 'role:3'], function ($routes) {
-    $routes->get('', 'Pages\PhlebotomistController::index');
+    $routes->get('', 'Pages\PhlebotomistController::collect');
+    $routes->get('dashboard', 'Pages\PhlebotomistController::index');
     $routes->get('collect', 'Pages\PhlebotomistController::collect');
 });
 
diff --git a/app/Views/shared/config.php b/app/Views/shared/config.php
index a0b9d4c..2c0c33c 100644
--- a/app/Views/shared/config.php
+++ b/app/Views/shared/config.php
@@ -28,6 +28,7 @@ return [
         'menuItems' => [
             ['label' => 'Dashboard', 'href' => 'admin', 'icon' => 'chart-bar'],
             ['label' => 'Validate', 'href' => 'admin/validate', 'icon' => 'check-circle'],
+            ['label' => 'Reports', 'href' => 'http://glenlis/report2/', 'icon' => 'book'],
         ],
     ],
     'cs' => [
@@ -53,6 +54,7 @@ return [
         'menuItems' => [
             ['label' => 'Dashboard', 'href' => 'lab', 'icon' => 'chart-bar'],
             ['label' => 'Validate', 'href' => 'lab/validate', 'icon' => 'check-circle'],
+            ['label' => 'Reports', 'href' => 'http://glenlis/report2/', 'icon' => 'book'],
         ],
     ],
     'phlebo' => [
@@ -64,7 +66,7 @@ return [
             'defaultPrinter' => 'phlebo',
         ],
         'menuItems' => [
-            ['label' => 'Dashboard', 'href' => 'phlebo', 'icon' => 'chart-bar'],
+            ['label' => 'Dashboard', 'href' => 'phlebo/dashboard', 'icon' => 'chart-bar'],
             ['label' => 'Collect Samples', 'href' => 'phlebo/collect', 'icon' => 'vial'],
         ],
     ],
@@ -80,6 +82,7 @@ return [
             ['label' => 'Dashboard', 'href' => 'superuser', 'icon' => 'chart-bar'],
             ['label' => 'Validate', 'href' => 'superuser/validate', 'icon' => 'check-circle'],
             ['label' => 'Users', 'href' => 'superuser/users', 'icon' => 'users'],
+            ['label' => 'Reports', 'href' => 'http://glenlis/report2/', 'icon' => 'book'],
         ],
     ],
 ];
diff --git a/app/Views/shared/content_validation.php b/app/Views/shared/content_validation.php
index 6072d0e..7b1b3a2 100644
--- a/app/Views/shared/content_validation.php
+++ b/app/Views/shared/content_validation.php
@@ -69,8 +69,8 @@
 							<th style="width: 13%;">
 								<div class="skeleton h-4 w-20"></div>
 							</th>
-							<th style="width: 20%;">
-								<div class="skeleton h-4 w-full"></div>
+							<th style="width: 13%;">
+								<div class="skeleton h-4 w-20"></div>
 							</th>
 						</tr>
 					</thead>
@@ -137,7 +137,7 @@
 										:class="sortCol === 'REFF' ? (sortAsc ? 'fa-sort-up' : 'fa-sort-down') : 'fa-sort opacity-20'"></i>
 								</div>
 							</th>
-							<th style="width: 20%;" @click="sort('DOC')"
+							<th style="width: 15%;" @click="sort('DOC')"
 								class="cursor-pointer hover:bg-base-200 transition-colors select-none">
 								<div class="flex items-center gap-1">
 									Doctor
@@ -145,6 +145,14 @@
 										:class="sortCol === 'DOC' ? (sortAsc ? 'fa-sort-up' : 'fa-sort-down') : 'fa-sort opacity-20'"></i>
 								</div>
 							</th>
+							<th style="width: 13%;" @click="sort('VAL1USER')"
+								class="cursor-pointer hover:bg-base-200 transition-colors select-none">
+								<div class="flex items-center gap-1">
+									Val1 By
+									<i class="fa text-xs"
+										:class="sortCol === 'VAL1USER' ? (sortAsc ? 'fa-sort-up' : 'fa-sort-down') : 'fa-sort opacity-20'"></i>
+								</div>
+							</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -160,6 +168,7 @@
 								<td x-text="req.HOSTORDERNUMBER" class="font-bold"></td>
 								<td x-text="req.REFF"></td>
 								<td x-text="req.DOC"></td>
+								<td x-text="req.VAL1USER"></td>
 							</tr>
 						</template>
 					</tbody>
diff --git a/app/Views/shared/layout.php b/app/Views/shared/layout.php
index d4d6618..b1d199a 100644
--- a/app/Views/shared/layout.php
+++ b/app/Views/shared/layout.php
@@ -61,8 +61,11 @@
 						<li><a @click.prevent="openDialogSetPassword()"><i class="fa fa-key mr-2"></i> Change Password</a></li>
 						<div class="divider my-1"></div>
 						<?php foreach ($roleConfig['menuItems'] ?? [] as $item): ?>
-							<li><a href="<?= base_url($item['href']) ?>"><i class="fa fa-<?= $item['icon'] ?> mr-2"></i>
-									<?= $item['label'] ?></a></li>
+							<li>
+								<a href="<?= str_starts_with($item['href'], 'http') ? $item['href'] : base_url($item['href']) ?>">
+									<i class="fa fa-<?= $item['icon'] ?> mr-2"></i><?= $item['label'] ?>
+								</a>
+							</li>
 						<?php endforeach; ?>
 					</ul>
 				</div>