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