From 8e89d029bdf2125952df3876b1d3cde2f60813ec Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Wed, 21 Oct 2026 13:56:13 +0700 Subject: [PATCH] fix(qma): resolve dim backdrop stacking on physical unit modals and reorganize p2h and summary menus --- resources/views/layouts/app.blade.php | 140 +++++++--- .../qma/vehicles_support_units.blade.php | 247 +++++++++--------- 2 files changed, 226 insertions(+), 161 deletions(-) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index e656cd5..839bf98 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -322,9 +322,9 @@ @endcan - @if(auth()->user()->canAny(['qma.logs.view', 'qma.p2h.view'])) + @can('qma.logs.view') @php - $isActivityRoute = request()->routeIs('qma.activity.log') || request()->routeIs('qma.activity.support_timesheet') || request()->routeIs('qma.p2h.index') || request()->routeIs('qma.p2h.show'); + $isActivityRoute = request()->routeIs('qma.activity.log') || request()->routeIs('qma.activity.support_timesheet'); @endphp
@@ -338,9 +338,8 @@ - +
- @endif + @endcan + + @can('qma.p2h.view') + + + P2H Unit Support + + @endcan @can('qma.p2h.templates') @endcan - @can('qma.summary.view') - - - Summary Aktivitas - - @endcan + @if(auth()->user()->canAny(['qma.summary.view', 'qma.p2h.view'])) + @php + $isSummaryRoute = request()->routeIs('qma.activity.summary*') || request()->routeIs('qma.p2h.summary*'); + @endphp + +
+ + + +
+ @can('qma.summary.view') + + Summary Timesheet LV + + @endcan + + @if(auth()->user()->canAny(['qma.p2h.view', 'qma.vehicles.view'])) + + Summary P2H Unit Support + + @endif +
+
+ @endif @endif @@ -657,9 +683,9 @@ @endcan - @if(auth()->user()->canAny(['qma.logs.view', 'qma.p2h.view'])) + @can('qma.logs.view') @php - $isActivityRouteMob = request()->routeIs('qma.activity.log') || request()->routeIs('qma.activity.support_timesheet') || request()->routeIs('qma.p2h.index') || request()->routeIs('qma.p2h.show'); + $isActivityRouteMob = request()->routeIs('qma.activity.log') || request()->routeIs('qma.activity.support_timesheet'); @endphp
- @endif + @endcan + + @can('qma.p2h.view') + + + P2H Unit Support + + @endcan @can('qma.p2h.templates') @@ -702,12 +726,38 @@ @endcan - @can('qma.summary.view') - - - Summary Aktivitas - - @endcan + @if(auth()->user()->canAny(['qma.summary.view', 'qma.p2h.view'])) + @php + $isSummaryRouteMob = request()->routeIs('qma.activity.summary*') || request()->routeIs('qma.p2h.summary*'); + @endphp +
+ + +
+ @can('qma.summary.view') + + Summary Timesheet LV + + @endcan + + @if(auth()->user()->canAny(['qma.p2h.view', 'qma.vehicles.view'])) + + Summary P2H Unit Support + + @endif +
+
+ @endif @endif @@ -849,7 +899,7 @@ @elseif(request()->routeIs('qma.p2h.*')) P2H Unit Support @elseif(request()->routeIs('qma.activity.summary')) - Summary Aktivitas + Summary Timesheet LV @elseif(request()->routeIs('profile.*')) Profil Saya @elseif(request()->routeIs('pg.dashboard')) @@ -1221,6 +1271,18 @@ } } + // Toggle Dropdown Menu Summary Aktivitas (Desktop & Mobile) + function toggleSummaryMenu(target) { + const submenu = document.getElementById(target === 'desktop' ? 'summarySubmenuDesktop' : 'summarySubmenuMobile'); + const chevron = document.getElementById(target === 'desktop' ? 'summaryChevronDesktop' : 'summaryChevronMobile'); + if (submenu) { + submenu.classList.toggle('hidden'); + } + if (chevron) { + chevron.classList.toggle('rotate-180'); + } + } + // Toggle Dropdown Menu Profil Pengguna di Pojok Kanan Atas function toggleProfileDropdown() { const dropdown = document.getElementById('userProfileDropdownMenu'); diff --git a/resources/views/qma/vehicles_support_units.blade.php b/resources/views/qma/vehicles_support_units.blade.php index 329e58c..7af2659 100644 --- a/resources/views/qma/vehicles_support_units.blade.php +++ b/resources/views/qma/vehicles_support_units.blade.php @@ -327,21 +327,18 @@ -