From 26e614c407b77040ba231743cc138ae4cb20da97 Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Tue, 20 Oct 2026 21:14:34 +0700 Subject: [PATCH] fix(qma): remove non-existent is_active column on employees and separate support timesheet into standalone menu --- .../Qma/SupportTimesheetController.php | 3 +- resources/views/layouts/app.blade.php | 30 +++++++++++-------- tests/Feature/QmaSupportTimesheetTest.php | 1 - 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Qma/SupportTimesheetController.php b/app/Http/Controllers/Qma/SupportTimesheetController.php index 390152d..afa46e6 100644 --- a/app/Http/Controllers/Qma/SupportTimesheetController.php +++ b/app/Http/Controllers/Qma/SupportTimesheetController.php @@ -133,8 +133,7 @@ class SupportTimesheetController extends Controller ->orderBy('code') ->get(); - $operators = Employee::where('is_active', true) - ->orderBy('name') + $operators = Employee::orderBy('name') ->get(['id', 'nik', 'name', 'position', 'is_operator']); $shifts = self::SHIFTS; diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index b16ccb2..62c96af 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -314,9 +314,17 @@ @endcan + @can('qma.logs.view') + + + Timesheet Unit Support + + @endcan + @if(auth()->user()->canAny(['qma.logs.view', 'qma.p2h.view'])) @php - $isActivityRoute = request()->routeIs('qma.activity.log') || request()->routeIs('qma.support_timesheet.*') || request()->routeIs('qma.p2h.index') || request()->routeIs('qma.p2h.show'); + $isActivityRoute = request()->routeIs('qma.activity.log') || request()->routeIs('qma.p2h.index') || request()->routeIs('qma.p2h.show'); @endphp
@@ -337,11 +345,6 @@ class="block px-3.5 py-2 text-xs rounded-xl transition {{ request()->routeIs('qma.activity.log') ? 'bg-[#1b5e20] text-white font-bold shadow-sm' : 'text-slate-600 hover:text-slate-900 hover:bg-slate-100 font-medium' }}"> Timesheet LV - - - Timesheet Unit Support - @endcan @can('qma.p2h.view') @@ -641,9 +644,17 @@ @endcan + @can('qma.logs.view') + + + Timesheet Unit Support + + @endcan + @if(auth()->user()->canAny(['qma.logs.view', 'qma.p2h.view'])) @php - $isActivityRouteMob = request()->routeIs('qma.activity.log') || request()->routeIs('qma.support_timesheet.*') || request()->routeIs('qma.p2h.index') || request()->routeIs('qma.p2h.show'); + $isActivityRouteMob = request()->routeIs('qma.activity.log') || request()->routeIs('qma.p2h.index') || request()->routeIs('qma.p2h.show'); @endphp