From b8fa1771b9e6a87b5695a7b25e427609814e7fa1 Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Mon, 2 Nov 2026 12:00:21 +0700 Subject: [PATCH] feat: implement 3-level heavy equipment drilldown and transporter options in unit transfer --- .../Commands/SyncExcelVehicleDataCommand.php | 93 +- .../Qma/UnitTransferController.php | 73 +- .../Controllers/Qma/VehicleController.php | 449 ++++++- app/Models/UnitTransfer.php | 2 + app/Models/Vehicle.php | 1 + ...sporter_fields_to_unit_transfers_table.php | 29 + ...dd_operational_group_to_vehicles_table.php | 32 + .../views/qma/unit_transfers_create.blade.php | 469 +++++-- .../views/qma/unit_transfers_index.blade.php | 202 +-- .../views/qma/unit_transfers_show.blade.php | 13 + .../views/qma/vehicles_support.blade.php | 1135 +++++++++++++---- ...HeavyEquipmentThreeLevelNavigationTest.php | 187 +++ tests/Feature/QmaUnitTransferTest.php | 33 + 13 files changed, 2209 insertions(+), 509 deletions(-) create mode 100644 database/migrations/2026_11_02_000002_add_transporter_fields_to_unit_transfers_table.php create mode 100644 database/migrations/2026_11_02_000003_add_operational_group_to_vehicles_table.php create mode 100644 tests/Feature/QmaHeavyEquipmentThreeLevelNavigationTest.php diff --git a/app/Console/Commands/SyncExcelVehicleDataCommand.php b/app/Console/Commands/SyncExcelVehicleDataCommand.php index 6600e6b..1f330ab 100644 --- a/app/Console/Commands/SyncExcelVehicleDataCommand.php +++ b/app/Console/Commands/SyncExcelVehicleDataCommand.php @@ -82,13 +82,26 @@ class SyncExcelVehicleDataCommand extends Command }; // 2. Lokasi & Status Area (Inside / Outside Site) - if (strtoupper($lokasiCurrent) === 'SITE' || empty($lokasiCurrent)) { - $finalLocation = $lokasiSite ?: 'Site Kerinci'; - $siteStatus = 'inside_site'; - } else { - $finalLocation = $lokasiCurrent; - $siteStatus = 'outside_site'; + // Sesuai berkas Excel "DATA LOKASI TERBARU RKM KMH", + // Kolom 8 adalah "LOKASI" tempat unit berada (ADIT 3, POWER HOUSE, VERTICAL SHAFT, dll.) + $finalLocation = $lokasiSite ?: ($lokasiCurrent ?: 'Site Kerinci'); + + // Klasifikasi site_status berdasarkan lokasi: + // Lokasi eksternal / kontraktor luar / workshop luar -> outside_site + // Lokasi area proyek KMH Kerinci (Adit, Power House, Bendungan, dll.) -> inside_site + $outsideKeywords = [ + 'PT.', 'HO', 'LAMPUNG', 'JAKARTA', 'CIDAS', 'POSO', + 'MEDCO', 'SULINDO', 'BMS', 'BHARA', 'BUKAKA', 'ACEH' + ]; + $upperLoc = strtoupper($finalLocation); + $isOutside = false; + foreach ($outsideKeywords as $kw) { + if (str_contains($upperLoc, $kw)) { + $isOutside = true; + break; + } } + $siteStatus = $isOutside ? 'outside_site' : 'inside_site'; // 3. Timesheet Mobile Flag $isMobile = (str_contains($jenis, 'MOBILE') || $type === 'DUMP TRUCK' || $type === 'LIGHT TRUCK'); @@ -113,7 +126,7 @@ class SyncExcelVehicleDataCommand extends Command // Update data unit yang sudah ada $updatePayload = [ 'category' => 'unit_support', - 'unit_category' => $cat, + 'operational_group' => $cat, 'unit_type' => $type, 'location' => $finalLocation, 'site_status' => $siteStatus, @@ -123,6 +136,10 @@ class SyncExcelVehicleDataCommand extends Command 'location_note' => "Pembaruan dari berkas DATA LOKASI TERBARU RKM KMH ({$finalLocation})", ]; + if (empty($vehicle->unit_category)) { + $updatePayload['unit_category'] = $vehicle->parent?->unit_category ?: ucwords(strtolower($type)); + } + if ($cleanBrand) { $updatePayload['brand'] = $cleanBrand; } @@ -155,6 +172,7 @@ class SyncExcelVehicleDataCommand extends Command $vehicle = Vehicle::create([ 'code' => $code1, 'category' => 'unit_support', + 'operational_group' => $cat, 'unit_category' => $cat, 'unit_type' => $type, 'brand' => $cleanBrand, @@ -188,6 +206,67 @@ class SyncExcelVehicleDataCommand extends Command ]); } + // Fallback untuk unit support yang belum memiliki operational_group + $typeFallback = [ + 'DUMP TRUCK' => 'HAULING', + 'DUMP TRUCK FFT' => 'HAULING', + 'MIXER TRUCK' => 'HAULING', + 'CAPSULE CEMENT' => 'HAULING', + 'EXCAVATOR' => 'LOADER', + 'WHEEL LOADER' => 'LOADER', + 'MUCKING LOADER' => 'LOADER', + 'CRAWLER ROCK DRILL' => 'DRILLING', + 'BORE PILE' => 'DRILLING', + 'JUMBO DRILL' => 'DRILLING', + 'WHEEL RIG DRILL' => 'DRILLING', + 'BULLDOZER' => 'PIT SERVICE', + 'MOTOR GRADER' => 'PIT SERVICE', + 'VIBRO' => 'PIT SERVICE', + 'WATER TRUCK' => 'PIT SERVICE', + 'BOOMLIFT' => 'HANDLING', + 'CARRYDECK CRANE' => 'HANDLING', + 'CRAWLER CRANE' => 'HANDLING', + 'CRANE TRUCK' => 'HANDLING', + 'FLAT BED' => 'HANDLING', + 'FORKLIFT' => 'HANDLING', + 'LOW BED' => 'HANDLING', + 'MOBILE CRANE' => 'HANDLING', + 'ROUGHTER CRANE' => 'HANDLING', + 'SCISSOR LIFT' => 'HANDLING', + 'TOWER CRANE' => 'HANDLING', + 'TRAILER' => 'HANDLING', + 'ASPHALT PATCH MIXER' => 'SUPPORT', + 'COMPRESSOR' => 'SUPPORT', + 'CONCRETE PUMP' => 'SUPPORT', + 'CONCRETE PUMP TRUCK' => 'SUPPORT', + 'ENGINE GENSET' => 'SUPPORT', + 'FUEL TRUCK' => 'SUPPORT', + 'SILENT SHEET PILE' => 'SUPPORT', + 'LIGHT TRUCK' => 'SUPPORT', + 'SHOTCRETE' => 'SUPPORT', + 'SKYLIFT TRUCK' => 'SUPPORT', + 'WET SHOTCRETE TRUCK' => 'SUPPORT', + ]; + + foreach ($typeFallback as $fbType => $fbGroup) { + Vehicle::where('category', 'unit_support') + ->where(function ($q) { + $q->whereNull('operational_group')->orWhere('operational_group', ''); + }) + ->where(function ($q) use ($fbType) { + $q->where('unit_type', $fbType) + ->orWhere('unit_category', $fbType); + }) + ->update(['operational_group' => $fbGroup]); + } + + // Default terakhir jika masih kosong + Vehicle::where('category', 'unit_support') + ->where(function ($q) { + $q->whereNull('operational_group')->orWhere('operational_group', ''); + }) + ->update(['operational_group' => 'SUPPORT']); + DB::commit(); } catch (\Throwable $e) { DB::rollBack(); diff --git a/app/Http/Controllers/Qma/UnitTransferController.php b/app/Http/Controllers/Qma/UnitTransferController.php index 03c6115..5d950a7 100644 --- a/app/Http/Controllers/Qma/UnitTransferController.php +++ b/app/Http/Controllers/Qma/UnitTransferController.php @@ -143,21 +143,48 @@ class UnitTransferController extends Controller ->map(fn($group) => $group->count()) ->sortKeys(); - // 2. Daftar armada pengangkut khusus truk/alat angkut (Truk, Flatbed, Lowbed, Towing, dsb. - Eksklusif Non-LV) - $transporterUnits = Vehicle::where('category', '!=', 'light_vehicle') + // 2. Daftar armada pengangkut khusus truk/alat angkut (Lowbed, Flatbed, Trailer, Dump Truck, Light Truck, Crane Truck) + $transporterCategories = [ + 'Low Bed', + 'Flat Bed', + 'Trailer', + 'Dump Truck', + 'Light Truck', + 'Crane Truck', + ]; + + $transporterUnits = Vehicle::trackableUnits() + ->where(function (Builder $q) use ($transporterCategories) { + $q->whereIn('unit_category', $transporterCategories) + ->orWhere(function (Builder $sub) { + $sub->where('code', 'like', 'LB %') + ->orWhere('code', 'like', 'LB-%') + ->orWhere('code', 'like', 'FB %') + ->orWhere('code', 'like', 'FB-%') + ->orWhere('code', 'like', 'TR %') + ->orWhere('code', 'like', 'TR-%') + ->orWhere('code', 'like', 'DT %') + ->orWhere('code', 'like', 'DT-%') + ->orWhere('code', 'like', 'LT %') + ->orWhere('code', 'like', 'LT-%') + ->orWhere('code', 'like', 'CT %') + ->orWhere('code', 'like', 'CT-%'); + }); + }) ->where(function (Builder $q) { $q->where('code', 'not like', 'LV %') ->where('code', 'not like', 'LV-%') ->where('code', 'not like', 'LV/%') ->where('code', 'not like', 'LV_%'); }) - ->where(function (Builder $q) { - $q->whereNotNull('parent_id') - ->orWhereDoesntHave('units'); - }) ->orderBy('code') ->get(); + // Lokasi asal armada pengangkut internal yang tersedia beserta jumlah unitnya + $transporterLocations = $transporterUnits->groupBy(fn($u) => $u->location ?: 'Site Kerinci') + ->map(fn($group) => $group->count()) + ->sortKeys(); + // 3. Daftar pengemudi / operator $drivers = Employee::where('is_operator', true) ->orderBy('name') @@ -175,6 +202,7 @@ class UnitTransferController extends Controller 'originLocations', 'selectedOriginLocation', 'transporterUnits', + 'transporterLocations', 'drivers', 'locationSuggestions', 'defaultDocNumber', @@ -195,6 +223,8 @@ class UnitTransferController extends Controller 'to_site_status' => ['required', 'in:inside_site,outside_site'], 'description' => ['nullable', 'string', 'max:2000'], 'reported_by' => ['required', 'string', 'max:255'], + 'transporter_type' => ['nullable', 'string', 'in:internal,external,none'], + 'transporter_origin_location' => ['nullable', 'string', 'max:255'], 'transporter_vehicle_id' => ['nullable', 'integer', 'exists:vehicles,id'], 'transporter_unit_name' => ['nullable', 'string', 'max:255'], 'transporter_driver_id' => ['nullable', 'integer', 'exists:employees,id'], @@ -230,14 +260,25 @@ class UnitTransferController extends Controller $fromLocation = $vehicle->location ?: ($validated['from_location'] ?? 'Site Kerinci'); $fromSiteStatus = $vehicle->site_status ?: 'inside_site'; + // Sumber Armada Pengangkut (Internal / External / None) + $transporterType = $validated['transporter_type'] ?? (!empty($validated['transporter_vehicle_id']) ? 'internal' : (!empty($validated['transporter_unit_name']) ? 'external' : 'none')); + $transporterVehicleId = ($transporterType === 'internal') ? ($validated['transporter_vehicle_id'] ?? null) : null; + $transporterOriginLocation = !empty($validated['transporter_origin_location']) ? trim($validated['transporter_origin_location']) : null; + // Nama armada pengangkut $transporterUnitName = !empty($validated['transporter_unit_name']) ? trim($validated['transporter_unit_name']) : null; - if (empty($transporterUnitName) && !empty($validated['transporter_vehicle_id'])) { - $transporterVeh = Vehicle::find($validated['transporter_vehicle_id']); + if ($transporterType === 'internal' && !empty($transporterVehicleId)) { + $transporterVeh = Vehicle::find($transporterVehicleId); if ($transporterVeh) { $plate = $transporterVeh->license_plate ? " ({$transporterVeh->license_plate})" : ''; $transporterUnitName = "{$transporterVeh->code} - {$transporterVeh->brand_type}{$plate}"; + if (empty($transporterOriginLocation)) { + $transporterOriginLocation = $transporterVeh->location ?: 'Site Kerinci'; + } } + } elseif ($transporterType === 'none') { + $transporterUnitName = 'Mobilisasi Mandiri (Tanpa Pengangkut)'; + $transporterOriginLocation = null; } // Nama driver pengangkut @@ -271,7 +312,9 @@ class UnitTransferController extends Controller 'description' => !empty($validated['description']) ? trim($validated['description']) : null, 'reported_by' => $reportedBy, 'user_id' => auth()->id(), - 'transporter_vehicle_id' => $validated['transporter_vehicle_id'] ?? null, + 'transporter_type' => $transporterType, + 'transporter_vehicle_id' => $transporterVehicleId, + 'transporter_origin_location' => $transporterOriginLocation, 'transporter_unit_name' => $transporterUnitName, 'transporter_driver_id' => $validated['transporter_driver_id'] ?? null, 'transporter_driver_name' => $transporterDriverName, @@ -294,6 +337,9 @@ class UnitTransferController extends Controller // 3. Catat di audit log riwayat pergerakan unit (VehicleLocationHistory) $transporterSummary = $transporterUnitName ? " Pengangkut: {$transporterUnitName}" : ""; + if ($transporterOriginLocation) { + $transporterSummary .= " [Asal: {$transporterOriginLocation}]"; + } if ($transporterDriverName) { $transporterSummary .= " (Driver: {$transporterDriverName})"; } @@ -314,9 +360,9 @@ class UnitTransferController extends Controller 'recorded_at' => Carbon::now(), ]); - // 4. Jika opsi perbarui posisi truk pengangkut aktif - if ($updateTransporter && !empty($validated['transporter_vehicle_id'])) { - $transporterVeh = Vehicle::find($validated['transporter_vehicle_id']); + // 4. Jika opsi perbarui posisi truk pengangkut aktif (Hanya armada internal) + if ($transporterType === 'internal' && $updateTransporter && !empty($transporterVehicleId)) { + $transporterVeh = Vehicle::find($transporterVehicleId); if ($transporterVeh && $transporterVeh->id !== $vehicle->id) { $transporterNote = $docNumber ? "Armada Pengangkut BAST {$docNumber} untuk {$vehicle->code} ke {$toLocation}" @@ -329,9 +375,10 @@ class UnitTransferController extends Controller 'location_note' => $transporterNote, ]); - $transporterHistNote = $docNumber + $transporterHistNote = $docNumber ? "Armada Pengangkut: Mengantar {$vehicle->code} ({$vehicle->brand_type}) via BAST {$docNumber} ke {$toLocation}" : "Armada Pengangkut: Mengantar {$vehicle->code} ({$vehicle->brand_type}) transfer internal ke {$toLocation}"; + VehicleLocationHistory::create([ 'vehicle_id' => $transporterVeh->id, 'site_status' => $validated['to_site_status'], diff --git a/app/Http/Controllers/Qma/VehicleController.php b/app/Http/Controllers/Qma/VehicleController.php index b6acf63..1807d1e 100644 --- a/app/Http/Controllers/Qma/VehicleController.php +++ b/app/Http/Controllers/Qma/VehicleController.php @@ -277,9 +277,14 @@ class VehicleController extends Controller /** * Halaman khusus pengelolaan Kategori Kendaraan Berat (Heavy Equipment / Alat Berat). + * Mendukung navigasi hirarki 3 level: + * - Level 1: Kelompok Operasional (HAULING, LOADER, SUPPORT, HANDLING, DRILLING, PIT SERVICE) + * - Level 2: Tipe Alat Berat di dalam Kelompok (Dump Truck, Mixer Truck, Excavator, dll.) + * - Level 3: Daftar Unit Fisik individual (DT 01, EX 01, dll.) */ public function indexSupport(Request $request): View { + $selectedGroup = $request->input('group'); $selectedType = $request->input('type'); // Master data daftar divisi perusahaan (gabungan standar + data existing di Employee & Vehicle) @@ -307,7 +312,58 @@ class VehicleController extends Controller ->values() ->all(); - // Master data daftar kategori & tipe alat berat + // Master data daftar kelompok operasional, kategori & tipe alat berat + $availableGroups = ['HAULING', 'LOADER', 'SUPPORT', 'HANDLING', 'DRILLING', 'PIT SERVICE']; + + $groupTypesMap = [ + 'HAULING' => ['DUMP TRUCK', 'MIXER TRUCK', 'CAPSULE CEMENT', 'LOW BED', 'DUMP TRUCK FFT'], + 'LOADER' => ['EXCAVATOR', 'WHEEL LOADER', 'MUCKING LOADER'], + 'SUPPORT' => ['COMPRESSOR', 'CONCRETE PUMP', 'ENGINE GENSET', 'CONCRETE PUMP TRUCK', 'LIGHT TRUCK', 'SHOTCRETE', 'WET SHOTCRETE TRUCK', 'FUEL TRUCK', 'WATER TRUCK', 'SILENT SHEET PILE', 'SKYLIFT TRUCK', 'ASPHALT PATCH MIXER'], + 'HANDLING' => ['FORKLIFT', 'CRANE TRUCK', 'ROUGHTER CRANE', 'BOOMLIFT', 'CRAWLER CRANE', 'SCISSOR LIFT', 'TRAILER', 'TOWER CRANE', 'FLAT BED', 'CARRYDECK CRANE', 'LOW BED', 'MOBILE CRANE'], + 'DRILLING' => ['CRAWLER ROCK DRILL', 'BORE PILE', 'JUMBO DRILL', 'WHEEL RIG DRILL'], + 'PIT SERVICE' => ['BULLDOZER', 'VIBRO', 'WATER TRUCK', 'MOTOR GRADER'], + ]; + + // Gabungkan tipe dari database agar dinamis jika ada custom type baru + $dbGroupTypes = Vehicle::where('category', 'unit_support') + ->whereNotNull('operational_group') + ->whereNotNull('unit_type') + ->where('unit_type', '!=', '') + ->select('operational_group', 'unit_type') + ->distinct() + ->get(); + foreach ($dbGroupTypes as $gt) { + $grpKey = strtoupper(trim($gt->operational_group)); + $tVal = strtoupper(trim($gt->unit_type)); + if (!isset($groupTypesMap[$grpKey])) { + $groupTypesMap[$grpKey] = []; + } + if (!in_array($tVal, $groupTypesMap[$grpKey])) { + $groupTypesMap[$grpKey][] = $tVal; + } + } + foreach ($groupTypesMap as $grpKey => &$tList) { + sort($tList); + } + unset($tList); + + $availableLocations = Vehicle::whereNotNull('location') + ->where('location', '!=', '') + ->distinct() + ->pluck('location') + ->sort() + ->values() + ->all(); + + $availableBrands = Vehicle::where('category', 'unit_support') + ->whereNotNull('brand') + ->where('brand', '!=', '') + ->distinct() + ->pluck('brand') + ->sort() + ->values() + ->all(); + $availableCategories = Vehicle::where('category', 'unit_support') ->whereNotNull('unit_category') ->where('unit_category', '!=', '') @@ -323,8 +379,81 @@ class VehicleController extends Controller $existingCodes = Vehicle::where('category', 'unit_support')->pluck('code')->map(fn($c) => strtoupper(trim($c)))->values()->all(); - // 1. JIKA USER MEMILIH / MASUK KE TIPE TERTENTU (Tampilkan unit-unit fisik tipe tersebut) + // Metadata kelompok operasional (icon, badge style, keterangan) + $groupMetadata = [ + 'HAULING' => [ + 'icon' => 'fa-truck-moving', + 'color' => 'indigo', + 'badge' => 'bg-indigo-50 text-indigo-700 border-indigo-200', + 'icon_bg' => 'bg-indigo-100 text-indigo-800 border-indigo-300', + 'desc' => 'Armada pengangkutan material tanah, batuan, semen, beton curah, dan mobilisasi berat (Dump Truck, Truk Mixer, Capsule Cement, Low Bed).', + ], + 'LOADER' => [ + 'icon' => 'fa-truck-monster', + 'color' => 'amber', + 'badge' => 'bg-amber-50 text-amber-800 border-amber-200', + 'icon_bg' => 'bg-amber-100 text-amber-800 border-amber-300', + 'desc' => 'Alat pemuatan material, penggalian tanah dan batuan terowongan proyek (Excavator, Wheel Loader, Mucking Loader).', + ], + 'SUPPORT' => [ + 'icon' => 'fa-gears', + 'color' => 'emerald', + 'badge' => 'bg-emerald-50 text-emerald-800 border-emerald-200', + 'icon_bg' => 'bg-emerald-100 text-emerald-800 border-emerald-300', + 'desc' => 'Unit penunjang operasional, kelistrikan, suplai angin kompresi, dan pengecoran (Compressor, Genset, Concrete Pump, Fuel Truck, Light Truck).', + ], + 'HANDLING' => [ + 'icon' => 'fa-boxes-stacked', + 'color' => 'purple', + 'badge' => 'bg-purple-50 text-purple-700 border-purple-200', + 'icon_bg' => 'bg-purple-100 text-purple-800 border-purple-300', + 'desc' => 'Alat pengangkatan dan penanganan material konstruksi serta akses ketinggian (Mobile Crane, Crane Truck, Crawler Crane, Forklift, Boomlift, Scissorlift).', + ], + 'DRILLING' => [ + 'icon' => 'fa-arrows-down-to-line', + 'color' => 'rose', + 'badge' => 'bg-rose-50 text-rose-700 border-rose-200', + 'icon_bg' => 'bg-rose-100 text-rose-800 border-rose-300', + 'desc' => 'Alat pengeboran batuan keras, tiang pancang, dan pekerjaan bawah tanah (Crawler Rock Drill, Bore Pile, Jumbo Drill, Wheel Rig Drill).', + ], + 'PIT SERVICE' => [ + 'icon' => 'fa-mountain', + 'color' => 'cyan', + 'badge' => 'bg-cyan-50 text-cyan-800 border-cyan-200', + 'icon_bg' => 'bg-cyan-100 text-cyan-800 border-cyan-300', + 'desc' => 'Alat pemeliharaan jalan tambang, perataan tanah, dan penyiraman debu lintasan proyek (Bulldozer, Motor Grader, Vibro Roller, Water Truck).', + ], + ]; + + // Global statistik untuk header + $allSupportQuery = Vehicle::where('category', 'unit_support'); + $totalUnits = (clone $allSupportQuery)->count(); + $totalOperation = (clone $allSupportQuery)->where('status', 'Operation')->count(); + $totalStandby = (clone $allSupportQuery)->where('status', 'Standby')->count(); + $totalBreakdown = (clone $allSupportQuery)->where('status', 'Breakdown')->count(); + $totalSupport = (clone $allSupportQuery)->whereNotNull('unit_type')->where('unit_type', '!=', '')->distinct('unit_type')->count('unit_type'); + $totalGroups = count($availableGroups); + + $perPage = (int) $request->input('per_page', 15); + if (!in_array($perPage, [15, 50, 100])) { + $perPage = 15; + } + + // ========================================================================= + // LEVEL 3: JIKA USER MEMILIH TIPE TERTENTU (Daftar Unit Fisik) + // ========================================================================= if ($selectedType) { + $level = 'units'; + + // Auto-detect group jika tidak disuplai + if (!$selectedGroup) { + $sampleUnit = Vehicle::where('category', 'unit_support') + ->where(function ($q) use ($selectedType) { + $q->where('unit_type', $selectedType)->orWhere('unit_category', $selectedType); + })->first(); + $selectedGroup = $sampleUnit?->operational_group ?: 'SUPPORT'; + } + $unitsQuery = Vehicle::where('category', 'unit_support') ->where(function ($q) use ($selectedType) { $q->where('unit_type', $selectedType) @@ -353,12 +482,8 @@ class VehicleController extends Controller }); } - $perPage = (int) $request->input('per_page', 15); - if (!in_array($perPage, [15, 50, 100])) { - $perPage = 15; - } - $typeUnits = $unitsQuery->orderBy('code')->paginate($perPage)->withQueryString(); + $vehicles = $typeUnits; // Statistik Khusus Tipe Terpilih $allOfType = Vehicle::where('category', 'unit_support') @@ -375,16 +500,12 @@ class VehicleController extends Controller $insideCount = $allOfType->where('site_status', 'inside_site')->count(); $outsideCount = $allOfType->where('site_status', 'outside_site')->count(); - // Total global statistik untuk header - $totalUnits = Vehicle::where('category', 'unit_support')->count(); - $totalOperation = Vehicle::where('category', 'unit_support')->where('status', 'Operation')->count(); - $totalStandby = Vehicle::where('category', 'unit_support')->where('status', 'Standby')->count(); - $totalBreakdown = Vehicle::where('category', 'unit_support')->where('status', 'Breakdown')->count(); - $totalSupport = $availableTypes->count(); - return view('qma.vehicles_support', compact( + 'level', + 'selectedGroup', 'selectedType', 'typeUnits', + 'vehicles', 'totalUnitsOfType', 'opCount', 'stCount', @@ -392,10 +513,16 @@ class VehicleController extends Controller 'insideCount', 'outsideCount', 'totalSupport', + 'totalGroups', 'totalUnits', 'totalOperation', 'totalStandby', 'totalBreakdown', + 'groupMetadata', + 'groupTypesMap', + 'availableLocations', + 'availableBrands', + 'availableGroups', 'availableCategories', 'availableTypes', 'availableDivisions', @@ -403,21 +530,25 @@ class VehicleController extends Controller )); } - // 2. TAMPILAN UTAMA: PENGELOMPOKAN BERDASARKAN TYPE DULU - $allSupportQuery = Vehicle::where('category', 'unit_support'); - $totalUnits = (clone $allSupportQuery)->count(); - $totalOperation = (clone $allSupportQuery)->where('status', 'Operation')->count(); - $totalStandby = (clone $allSupportQuery)->where('status', 'Standby')->count(); - $totalBreakdown = (clone $allSupportQuery)->where('status', 'Breakdown')->count(); - $totalSupport = (clone $allSupportQuery)->whereNotNull('unit_type')->where('unit_type', '!=', '')->distinct('unit_type')->count('unit_type'); + // ========================================================================= + // LEVEL 2: JIKA USER MEMILIH KELOMPOK OPERASIONAL (Daftar Tipe Alat di Kelompok Tersebut) + // ========================================================================= + if ($selectedGroup) { + $level = 'types'; - // Query pengelompokan berdasarkan tipe - $hasTypes = Vehicle::where('category', 'unit_support')->whereNotNull('unit_type')->where('unit_type', '!=', '')->exists(); + $groupUnitsQuery = Vehicle::where('category', 'unit_support')->where('operational_group', $selectedGroup); + $groupTotalUnits = (clone $groupUnitsQuery)->count(); + $groupOpCount = (clone $groupUnitsQuery)->where('status', 'Operation')->count(); + $groupStCount = (clone $groupUnitsQuery)->where('status', 'Standby')->count(); + $groupBdCount = (clone $groupUnitsQuery)->where('status', 'Breakdown')->count(); + $groupInsideCount = (clone $groupUnitsQuery)->where('site_status', 'inside_site')->count(); + $groupOutsideCount = (clone $groupUnitsQuery)->where('site_status', 'outside_site')->count(); + $groupTypesCount = (clone $groupUnitsQuery)->whereNotNull('unit_type')->where('unit_type', '!=', '')->distinct('unit_type')->count('unit_type'); - if ($hasTypes) { - $typeGroupsQuery = Vehicle::where('category', 'unit_support') + $typesQuery = Vehicle::where('category', 'unit_support') + ->where('operational_group', $selectedGroup) ->select( - DB::raw("COALESCE(NULLIF(unit_type, ''), 'LAINNYA') as unit_type"), + 'unit_type', DB::raw('MAX(unit_category) as unit_category'), DB::raw('COUNT(*) as units_count'), DB::raw("SUM(CASE WHEN status = 'Operation' THEN 1 ELSE 0 END) as total_operation"), @@ -430,14 +561,14 @@ class VehicleController extends Controller DB::raw('MIN(id) as sample_id'), DB::raw('MIN(code) as code') ) - ->groupBy(DB::raw("COALESCE(NULLIF(unit_type, ''), 'LAINNYA')")); + ->groupBy('unit_type'); if ($request->filled('unit_category')) { - $typeGroupsQuery->where('unit_category', $request->input('unit_category')); + $typesQuery->where('unit_category', $request->input('unit_category')); } if ($request->filled('search')) { $search = trim($request->input('search')); - $typeGroupsQuery->where(function ($q) use ($search) { + $typesQuery->where(function ($q) use ($search) { $q->where('unit_type', 'like', "%{$search}%") ->orWhere('unit_category', 'like', "%{$search}%") ->orWhere('brand_type', 'like', "%{$search}%") @@ -445,40 +576,98 @@ class VehicleController extends Controller }); } - $perPage = (int) $request->input('per_page', 15); - if (!in_array($perPage, [15, 50, 100])) { - $perPage = 15; - } + $types = $typesQuery->orderByDesc(DB::raw('COUNT(*)'))->paginate($perPage)->withQueryString(); + $vehicles = $types; - $vehicles = $typeGroupsQuery->orderByDesc(DB::raw('COUNT(*)'))->paginate($perPage)->withQueryString(); - } else { - // Fallback untuk DB sebelum sync excel atau legacy category format - $query = Vehicle::unitSupportCategories()->withCount('units'); - if ($request->filled('status')) { - $query->where('status', $request->input('status')); - } - if ($request->filled('unit_category')) { - $query->where('unit_category', $request->input('unit_category')); - } - if ($request->filled('search')) { - $search = trim($request->input('search')); - $query->where(function ($q) use ($search) { - $q->where('code', 'like', "%{$search}%") - ->orWhere('brand_type', 'like', "%{$search}%") - ->orWhere('unit_category', 'like', "%{$search}%"); - }); - } - $perPage = (int) $request->input('per_page', 15); - $vehicles = $query->orderBy('code')->paginate($perPage)->withQueryString(); + return view('qma.vehicles_support', compact( + 'level', + 'selectedGroup', + 'types', + 'vehicles', + 'groupTotalUnits', + 'groupOpCount', + 'groupStCount', + 'groupBdCount', + 'groupInsideCount', + 'groupOutsideCount', + 'groupTypesCount', + 'totalSupport', + 'totalGroups', + 'totalUnits', + 'totalOperation', + 'totalStandby', + 'totalBreakdown', + 'groupMetadata', + 'groupTypesMap', + 'availableLocations', + 'availableBrands', + 'availableGroups', + 'availableCategories', + 'availableTypes', + 'availableDivisions', + 'existingCodes' + )); } + // ========================================================================= + // LEVEL 1: TAMPILAN UTAMA (6 KELOMPOK OPERASIONAL BESAR) + // ========================================================================= + $level = 'groups'; + + $groupsQuery = Vehicle::where('category', 'unit_support') + ->select( + 'operational_group', + DB::raw('COUNT(DISTINCT unit_type) as types_count'), + DB::raw('COUNT(*) as units_count'), + DB::raw("SUM(CASE WHEN status = 'Operation' THEN 1 ELSE 0 END) as total_operation"), + DB::raw("SUM(CASE WHEN status = 'Standby' THEN 1 ELSE 0 END) as total_standby"), + DB::raw("SUM(CASE WHEN status = 'Breakdown' THEN 1 ELSE 0 END) as total_breakdown"), + DB::raw("SUM(CASE WHEN site_status = 'inside_site' THEN 1 ELSE 0 END) as inside_site_count"), + DB::raw("SUM(CASE WHEN site_status = 'outside_site' THEN 1 ELSE 0 END) as outside_site_count"), + DB::raw('MIN(code) as sample_code') + ) + ->groupBy('operational_group'); + + if ($request->filled('search')) { + $search = trim($request->input('search')); + $groupsQuery->where(function ($q) use ($search) { + $q->where('operational_group', 'like', "%{$search}%") + ->orWhere('unit_type', 'like', "%{$search}%") + ->orWhere('unit_category', 'like', "%{$search}%") + ->orWhere('brand_type', 'like', "%{$search}%") + ->orWhere('code', 'like', "%{$search}%"); + }); + } + + $groups = $groupsQuery + ->orderByRaw("CASE operational_group + WHEN 'HAULING' THEN 1 + WHEN 'LOADER' THEN 2 + WHEN 'SUPPORT' THEN 3 + WHEN 'HANDLING' THEN 4 + WHEN 'DRILLING' THEN 5 + WHEN 'PIT SERVICE' THEN 6 + ELSE 7 END") + ->paginate($perPage) + ->withQueryString(); + + $vehicles = $groups; + return view('qma.vehicles_support', compact( + 'level', + 'groups', 'vehicles', 'totalSupport', + 'totalGroups', 'totalUnits', 'totalOperation', 'totalStandby', 'totalBreakdown', + 'groupMetadata', + 'groupTypesMap', + 'availableLocations', + 'availableBrands', + 'availableGroups', 'availableCategories', 'availableTypes', 'availableDivisions', @@ -495,6 +684,19 @@ class VehicleController extends Controller $query = $category->units(); + if ($request->filled('group') || $request->filled('operational_group')) { + $grp = $request->input('group') ?: $request->input('operational_group'); + $query->where('operational_group', $grp); + } + + if ($request->filled('type') || $request->filled('unit_type')) { + $t = $request->input('type') ?: $request->input('unit_type'); + $query->where(function ($q) use ($t) { + $q->where('unit_type', $t) + ->orWhere('unit_category', $t); + }); + } + if ($request->filled('status')) { $query->where('status', $request->input('status')); } @@ -572,6 +774,19 @@ class VehicleController extends Controller { $query = Vehicle::unitSupportPhysical()->with('parent'); + if ($request->filled('group') || $request->filled('operational_group')) { + $grp = $request->input('group') ?: $request->input('operational_group'); + $query->where('operational_group', $grp); + } + + if ($request->filled('type') || $request->filled('unit_type')) { + $t = $request->input('type') ?: $request->input('unit_type'); + $query->where(function ($q) use ($t) { + $q->where('unit_type', $t) + ->orWhere('unit_category', $t); + }); + } + if ($request->filled('status')) { $query->where('status', $request->input('status')); } @@ -611,6 +826,19 @@ class VehicleController extends Controller { $query = Vehicle::unitSupportCategories()->withCount('units'); + if ($request->filled('group') || $request->filled('operational_group')) { + $grp = $request->input('group') ?: $request->input('operational_group'); + $query->where('operational_group', $grp); + } + + if ($request->filled('type') || $request->filled('unit_type')) { + $t = $request->input('type') ?: $request->input('unit_type'); + $query->where(function ($q) use ($t) { + $q->where('unit_type', $t) + ->orWhere('unit_category', $t); + }); + } + if ($request->filled('status')) { $query->where('status', $request->input('status')); } @@ -861,6 +1089,19 @@ class VehicleController extends Controller $category = Vehicle::unitSupportCategories()->withCount('units')->findOrFail($id); $query = $category->units(); + if ($request->filled('group') || $request->filled('operational_group')) { + $grp = $request->input('group') ?: $request->input('operational_group'); + $query->where('operational_group', $grp); + } + + if ($request->filled('type') || $request->filled('unit_type')) { + $t = $request->input('type') ?: $request->input('unit_type'); + $query->where(function ($q) use ($t) { + $q->where('unit_type', $t) + ->orWhere('unit_category', $t); + }); + } + if ($request->filled('status')) { $query->where('status', $request->input('status')); } @@ -938,6 +1179,19 @@ class VehicleController extends Controller $category = Vehicle::unitSupportCategories()->withCount('units')->findOrFail($id); $query = $category->units(); + if ($request->filled('group') || $request->filled('operational_group')) { + $grp = $request->input('group') ?: $request->input('operational_group'); + $query->where('operational_group', $grp); + } + + if ($request->filled('type') || $request->filled('unit_type')) { + $t = $request->input('type') ?: $request->input('unit_type'); + $query->where(function ($q) use ($t) { + $q->where('unit_type', $t) + ->orWhere('unit_category', $t); + }); + } + if ($request->filled('status')) { $query->where('status', $request->input('status')); } @@ -1103,7 +1357,7 @@ class VehicleController extends Controller $rules = [ 'code' => ['required', 'string', 'max:50', 'unique:vehicles,code'], 'category' => ['required', 'in:light_vehicle,unit_support'], - 'brand_type' => ['required', 'string', 'max:150'], + 'brand_type' => [$category === 'unit_support' ? 'nullable' : 'required', 'string', 'max:150'], 'license_plate' => ['nullable', 'string', 'max:30'], 'serial_number' => ['nullable', 'string', 'max:100'], 'ownership' => ['nullable', 'string', 'max:150'], @@ -1118,12 +1372,14 @@ class VehicleController extends Controller // Atribut opsional spesifik Heavy Equipment (Kendaraan Berat) if ($category === 'unit_support') { $rules = array_merge($rules, [ + 'operational_group' => ['required', 'string', 'max:50'], + 'unit_type' => ['required', 'string', 'max:100'], 'unit_category' => ['nullable', 'string', 'max:100'], - 'unit_type' => ['nullable', 'string', 'max:100'], 'brand' => ['nullable', 'string', 'max:100'], 'model_number' => ['nullable', 'string', 'max:100'], 'production_year' => ['nullable', 'integer', 'min:1980', 'max:' . (date('Y') + 1)], 'location' => ['nullable', 'string', 'max:150'], + 'site_status' => ['nullable', 'in:inside_site,outside_site'], 'fuel_consumption' => ['nullable', 'numeric', 'min:0'], 'silo_document' => ['nullable', 'string', 'max:150'], 'stnk_document' => ['nullable', 'string', 'max:150'], @@ -1135,6 +1391,8 @@ class VehicleController extends Controller $validated = $request->validate($rules, [ 'code.required' => 'Kode kendaraan wajib diisi.', 'code.unique' => 'Kode sudah ada, silakan gunakan kode lain.', + 'operational_group.required' => 'Kelompok operasional wajib dipilih.', + 'unit_type.required' => 'Tipe alat berat wajib dipilih/diisi.', 'brand_type.required' => 'Merek dan spesifikasi/tipe wajib diisi.', 'current_km.required' => 'Nilai KM / HM awal wajib diisi.', 'status.required' => 'Status operasional wajib dipilih.', @@ -1143,6 +1401,37 @@ class VehicleController extends Controller if ($category === 'unit_support') { $validated['status'] = $validated['status'] ?? 'Operation'; $validated['current_km'] = $validated['current_km'] ?? 0; + $validated['code'] = strtoupper(trim($validated['code'])); + $validated['operational_group'] = strtoupper(trim($validated['operational_group'])); + $validated['unit_type'] = strtoupper(trim($validated['unit_type'])); + $validated['unit_category'] = !empty($validated['unit_category']) ? $validated['unit_category'] : $validated['unit_type']; + + // Jika brand_type kosong, susun otomatis dari brand dan model_number + if (empty($validated['brand_type'])) { + $brandPart = trim(($validated['brand'] ?? '') . ' ' . ($validated['model_number'] ?? '')); + $validated['brand_type'] = $brandPart ?: $validated['unit_type']; + } + + // Site status auto-detection jika kosong + if (empty($validated['site_status']) && !empty($validated['location'])) { + $upperLoc = strtoupper($validated['location']); + $outsideKeywords = ['PT.', 'HO', 'LAMPUNG', 'JAKARTA', 'CIDAS', 'POSO', 'MEDCO', 'SULINDO', 'BMS', 'BHARA', 'BUKAKA', 'ACEH']; + $isOutside = false; + foreach ($outsideKeywords as $kw) { + if (str_contains($upperLoc, $kw)) { + $isOutside = true; + break; + } + } + $validated['site_status'] = $isOutside ? 'outside_site' : 'inside_site'; + } elseif (empty($validated['site_status'])) { + $validated['site_status'] = 'inside_site'; + } + + if (!empty($validated['location'])) { + $validated['location_updated_at'] = now(); + $validated['location_updated_by'] = auth()->user()?->name ?? 'Admin QMA'; + } } $validated['is_timesheet_mobile'] = $request->boolean('is_timesheet_mobile'); @@ -1156,19 +1445,20 @@ class VehicleController extends Controller $vehicle = Vehicle::create($validated); if ($vehicle->isSupportCategory()) { - // Otomatis buatkan Master Template P2H baru (default kosong tanpa butir pertanyaan) + // Otomatis buatkan Master Template P2H baru jika belum ada + $templateCode = $vehicle->unit_type ?: $vehicle->code; $template = P2hTemplate::firstOrCreate( - ['code' => $vehicle->code], + ['code' => $templateCode], [ - 'name' => $vehicle->unit_category ?: $vehicle->brand_type, - 'description' => "Template form inspeksi P2H resmi untuk kategori {$vehicle->brand_type} (Kode: {$vehicle->code}).", + 'name' => $vehicle->unit_type ?: $vehicle->brand_type, + 'description' => "Template form inspeksi P2H resmi untuk {$vehicle->unit_type} (Kode: {$templateCode}).", 'is_active' => true, ] ); $vehicle->update(['p2h_template_id' => $template->id]); } - $categoryLabel = $vehicle->isLightVehicle() ? 'Light Vehicle (LV)' : 'Kategori Heavy Equipment'; + $categoryLabel = $vehicle->isLightVehicle() ? 'Light Vehicle (LV)' : 'Unit Heavy Equipment'; return back()->with('success', "Data {$categoryLabel} [{$vehicle->code}] berhasil ditambahkan ke sistem."); } @@ -1186,19 +1476,21 @@ class VehicleController extends Controller $rules = [ 'code' => ['required', 'string', 'max:50', Rule::unique('vehicles', 'code')->ignore($vehicle->id)], 'category' => ['required', 'in:light_vehicle,unit_support'], - 'brand_type' => ['required', 'string', 'max:150'], + 'brand_type' => [$vehicle->isSupportCategory() ? 'nullable' : 'required', 'string', 'max:150'], 'license_plate' => ['nullable', 'string', 'max:30'], 'serial_number' => ['nullable', 'string', 'max:100'], 'ownership' => ['nullable', 'string', 'max:150'], 'division' => ['nullable', 'string', 'max:100'], - 'status' => [$vehicle->isSupportCategory() ? 'nullable' : 'required', 'string', 'in:Operation,Standby,Breakdown,Maintenance'], + 'status' => ['required', 'string', 'in:Operation,Standby,Breakdown,Maintenance'], 'current_km' => [$vehicle->isSupportCategory() ? 'nullable' : 'required', 'numeric', 'min:0'], + 'operational_group' => ['nullable', 'string', 'max:50'], 'unit_category' => ['nullable', 'string', 'max:100'], 'unit_type' => ['nullable', 'string', 'max:100'], 'brand' => ['nullable', 'string', 'max:100'], 'model_number' => ['nullable', 'string', 'max:100'], 'production_year' => ['nullable', 'integer', 'min:1980', 'max:' . (date('Y') + 1)], 'location' => ['nullable', 'string', 'max:150'], + 'site_status' => ['nullable', 'in:inside_site,outside_site'], 'fuel_consumption' => ['nullable', 'numeric', 'min:0'], 'silo_document' => ['nullable', 'string', 'max:150'], 'stnk_document' => ['nullable', 'string', 'max:150'], @@ -1216,6 +1508,39 @@ class VehicleController extends Controller 'current_km.required' => 'Nilai KM / HM wajib diisi.', ]); + if ($vehicle->isSupportCategory()) { + $validated['code'] = strtoupper(trim($validated['code'])); + if (!empty($validated['operational_group'])) { + $validated['operational_group'] = strtoupper(trim($validated['operational_group'])); + } + if (!empty($validated['unit_type'])) { + $validated['unit_type'] = strtoupper(trim($validated['unit_type'])); + $validated['unit_category'] = !empty($validated['unit_category']) ? $validated['unit_category'] : $validated['unit_type']; + } + if (empty($validated['brand_type'])) { + $brandPart = trim(($validated['brand'] ?? '') . ' ' . ($validated['model_number'] ?? '')); + $validated['brand_type'] = $brandPart ?: ($vehicle->brand_type ?: $validated['code']); + } + if ($request->filled('site_status')) { + $validated['site_status'] = $request->input('site_status'); + } elseif (!empty($validated['location']) && $validated['location'] !== $vehicle->location) { + $upperLoc = strtoupper($validated['location']); + $outsideKeywords = ['PT.', 'HO', 'LAMPUNG', 'JAKARTA', 'CIDAS', 'POSO', 'MEDCO', 'SULINDO', 'BMS', 'BHARA', 'BUKAKA', 'ACEH']; + $isOutside = false; + foreach ($outsideKeywords as $kw) { + if (str_contains($upperLoc, $kw)) { + $isOutside = true; + break; + } + } + $validated['site_status'] = $isOutside ? 'outside_site' : 'inside_site'; + } + if (!empty($validated['location']) && $validated['location'] !== $vehicle->location) { + $validated['location_updated_at'] = now(); + $validated['location_updated_by'] = auth()->user()?->name ?? 'Admin QMA'; + } + } + if ($request->hasFile('photo')) { ImageCompressionService::deleteIfExists($vehicle->photo_path); $validated['photo_path'] = ImageCompressionService::uploadAndCompress($request->file('photo'), 'vehicles', 800, 800, 75); diff --git a/app/Models/UnitTransfer.php b/app/Models/UnitTransfer.php index c6de6b7..943c1e7 100644 --- a/app/Models/UnitTransfer.php +++ b/app/Models/UnitTransfer.php @@ -24,7 +24,9 @@ class UnitTransfer extends Model 'description', 'reported_by', 'user_id', + 'transporter_type', 'transporter_vehicle_id', + 'transporter_origin_location', 'transporter_unit_name', 'transporter_driver_id', 'transporter_driver_name', diff --git a/app/Models/Vehicle.php b/app/Models/Vehicle.php index 255bb2f..996a32b 100644 --- a/app/Models/Vehicle.php +++ b/app/Models/Vehicle.php @@ -29,6 +29,7 @@ class Vehicle extends Model 'photo_path', 'unit_category', 'unit_type', + 'operational_group', 'brand', 'model_number', 'production_year', diff --git a/database/migrations/2026_11_02_000002_add_transporter_fields_to_unit_transfers_table.php b/database/migrations/2026_11_02_000002_add_transporter_fields_to_unit_transfers_table.php new file mode 100644 index 0000000..581288c --- /dev/null +++ b/database/migrations/2026_11_02_000002_add_transporter_fields_to_unit_transfers_table.php @@ -0,0 +1,29 @@ +string('transporter_type', 30)->default('internal')->after('user_id'); + $table->string('transporter_origin_location', 255)->nullable()->after('transporter_vehicle_id'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('unit_transfers', function (Blueprint $table) { + $table->dropColumn(['transporter_type', 'transporter_origin_location']); + }); + } +}; diff --git a/database/migrations/2026_11_02_000003_add_operational_group_to_vehicles_table.php b/database/migrations/2026_11_02_000003_add_operational_group_to_vehicles_table.php new file mode 100644 index 0000000..9b403c5 --- /dev/null +++ b/database/migrations/2026_11_02_000003_add_operational_group_to_vehicles_table.php @@ -0,0 +1,32 @@ +string('operational_group', 50)->nullable()->after('unit_type')->index(); + } + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('vehicles', function (Blueprint $table) { + if (Schema::hasColumn('vehicles', 'operational_group')) { + $table->dropColumn('operational_group'); + } + }); + } +}; diff --git a/resources/views/qma/unit_transfers_create.blade.php b/resources/views/qma/unit_transfers_create.blade.php index c7e4bbc..585fcdd 100644 --- a/resources/views/qma/unit_transfers_create.blade.php +++ b/resources/views/qma/unit_transfers_create.blade.php @@ -282,11 +282,55 @@

2. Armada & Supir Pengangkut (Transporter)

-

Truk pengangkut dapat dipilih dari lokasi yang sama atau dimobilisasi dari pool/workshop lain.

+

Pilih kendaraan pengangkut dari armada internal proyek KMH atau input armada dari vendor/rekanan luar.

- + +
+ +
+ + + + + +
+
+ + - -
- -
- - -
- - -
- -
- - + + + +
+
+ +
+ +
+ + +
+

Pilih lokasi asal untuk memfilter unit pengangkut yang standby di titik tersebut.

-

Otomatis terisi jika memilih armada internal, atau ketik nama vendor/unit rekanan luar.

+ + +
+ +
+ + +
+

Ketik atau pilih dari rekomendasi truk pengangkut internal (Lowbed, Flatbed, Dump Truck, Trailer, dll.).

+ + + + @foreach($transporterUnits as $tu) + + + + +
+
+ + +
+ +
- -
- - + + + + + + + + -
+
diff --git a/resources/views/qma/unit_transfers_index.blade.php b/resources/views/qma/unit_transfers_index.blade.php index 35b0e18..18dc902 100644 --- a/resources/views/qma/unit_transfers_index.blade.php +++ b/resources/views/qma/unit_transfers_index.blade.php @@ -3,12 +3,12 @@ @section('title', 'Transfer Unit Alat Berat - Admin QMA | PT Kerinci Merangin Hidro') @section('content') -
+
- -
+ +
-
+
MANAJEMEN SISTEM @@ -19,22 +19,22 @@
-

+

Transfer Unit Alat Berat

-
+
-
- - - @canany(['qma.vehicles.create', 'qma.vehicles.edit']) - - - Buat Transfer Unit + class="flex-1 sm:flex-none flex items-center justify-center space-x-1.5 bg-[#1b5e20] hover:bg-[#144919] text-white px-3.5 py-2 rounded-xl text-xs font-bold transition shadow-2xs cursor-pointer whitespace-nowrap"> + + Transfer Unit Baru @endcanany
@@ -73,8 +61,8 @@ @if(session('success')) -
-
+
+
@@ -84,8 +72,8 @@ @endif @if(session('error')) -
-
+
+
@@ -94,86 +82,100 @@
@endif - -
+ +
-
-

Total Pemindahan

-

{{ number_format($totalTransfers, 0, ',', '.') }}

- Semua Dokumen BAST +
+
+

Total BAST

+

{{ number_format($totalTransfers, 0, ',', '.') }}

+ Semua Dokumen +
+
+ +
-
-

Bulan Ini

-

{{ number_format($thisMonthCount, 0, ',', '.') }}

- {{ \Carbon\Carbon::now()->translatedFormat('F Y') }} +
+
+

Bulan Ini

+

{{ number_format($thisMonthCount, 0, ',', '.') }}

+ {{ \Carbon\Carbon::now()->translatedFormat('M Y') }} +
+
+ +
-
-

Tujuan In-Site

-

{{ number_format($insideCount, 0, ',', '.') }}

- Area Proyek KMH +
+
+

Tujuan In-Site

+

{{ number_format($insideCount, 0, ',', '.') }}

+ Area Proyek +
+
+ +
-
-

Tujuan Out-Site

-

{{ number_format($outsideCount, 0, ',', '.') }}

- Workshop/Luar Proyek +
+
+

Tujuan Out-Site

+

{{ number_format($outsideCount, 0, ',', '.') }}

+ Workshop/Luar +
+
+ +
- -
-
- -
- - -
+ + + +
+ + + + +
+ +
-
- -
+ -
- -
+ - -
- - @if(request()->anyFilled(['search', 'vehicle_id', 'to_site_status', 'start_date', 'end_date'])) - - - - @endif -
- -
+ @if(request()->anyFilled(['search', 'vehicle_id', 'to_site_status', 'start_date', 'end_date'])) + + Reset + + @endif +
+ - +
@@ -267,12 +269,18 @@ @@ -310,18 +318,18 @@ @empty - + @if($transfer->transporter_origin_location) + + + + + @endif
-
+
{{ $t->transporter_unit_name ?: ($t->transporterVehicle?->code ?? 'Tanpa Pengangkut') }} + @if($t->transporter_type === 'external' || (!$t->transporter_vehicle_id && $t->transporter_unit_name)) + Luar + @endif
-
- {{ $t->transporter_driver_name ?: ($t->transporterDriver?->name ?? '-') }} +
+ {{ $t->transporter_driver_name ?: ($t->transporterDriver?->name ?? '-') }} + @if($t->transporter_origin_location) + | Asal: {{ $t->transporter_origin_location }} + @endif
-
+
+

Belum Ada Data Pemindahan Unit

- Belum ada transaksi pemindahan alat berat yang tercatat. Silakan klik tombol "Buat Transfer Unit" untuk membuat Berita Acara baru. + Belum ada transaksi pemindahan alat berat yang tercatat. Silakan klik tombol di bawah untuk membuat Berita Acara baru.

@canany(['qma.vehicles.create', 'qma.vehicles.edit']) -
- - + diff --git a/resources/views/qma/unit_transfers_show.blade.php b/resources/views/qma/unit_transfers_show.blade.php index 80a5c9c..316753a 100644 --- a/resources/views/qma/unit_transfers_show.blade.php +++ b/resources/views/qma/unit_transfers_show.blade.php @@ -190,8 +190,21 @@
Kendaraan Pengangkut {{ $transfer->transporter_unit_name ?: ($transfer->transporterVehicle?->code ?? 'Tanpa Truk Pengangkut (Mobilisasi Mandiri)') }} + @if($transfer->transporter_type === 'external' || (!$transfer->transporter_vehicle_id && $transfer->transporter_unit_name)) + Armada Luar / Rekanan + @elseif($transfer->transporter_vehicle_id) + Armada Internal KMH + @endif
Asal Kendaraan Pengangkut + {{ $transfer->transporter_origin_location }} +
Nama Pengemudi / Driver diff --git a/resources/views/qma/vehicles_support.blade.php b/resources/views/qma/vehicles_support.blade.php index 50fa274..3aee272 100644 --- a/resources/views/qma/vehicles_support.blade.php +++ b/resources/views/qma/vehicles_support.blade.php @@ -5,6 +5,27 @@ @section('content')
+ + +
@@ -21,8 +42,23 @@

- Heavy Equipment + @if($level === 'groups') + Heavy Equipment + @elseif($level === 'types') + Kelompok: {{ $selectedGroup }} + @elseif($level === 'units') + {{ $selectedType }} + @endif

+

+ @if($level === 'groups') + Navigasi hierarki 3 level: Kelompok Operasional → Tipe Alat Berat → Unit Fisik Individual. + @elseif($level === 'types') + Daftar tipe alat berat operasional di bawah kelompok {{ $selectedGroup }}. + @elseif($level === 'units') + Daftar unit alat berat fisik individual untuk tipe {{ $selectedType }} (Kelompok {{ $selectedGroup }}). + @endif +

@@ -54,28 +90,132 @@ @endcan
+ + @if($level === 'groups') +
+
+ TOTAL ALAT BERAT +
+ {{ $totalUnits }} + Unit Fisik +
+
+ + 6 Kelompok Operasional (Excel) +
+
- - @if(isset($selectedType) && $selectedType) -
- + @endif + + + @if($level === 'types') + @php + $curMeta = $groupMetadata[$selectedGroup] ?? [ + 'icon' => 'fa-truck-monster', + 'badge' => 'bg-indigo-50 text-indigo-700 border-indigo-200', + 'icon_bg' => 'bg-indigo-100 text-indigo-800 border-indigo-300', + 'desc' => 'Daftar tipe alat berat dalam kelompok ' . $selectedGroup, + ]; + @endphp +
+
+ + + Semua Kelompok
-

- Tipe: {{ $selectedType }} - {{ $totalUnitsOfType ?? $typeUnits->total() }} Unit Fisik -

+
+ {{ $selectedGroup }} + + {{ $groupTypesCount }} Tipe Alat + + + {{ $groupTotalUnits }} Unit Fisik + +
+

+ {{ $curMeta['desc'] }} +

+
+
+
+ + {{ $groupOpCount ?? 0 }} Operation + + + {{ $groupStCount ?? 0 }} Standby + + + {{ $groupBdCount ?? 0 }} Breakdown + + + {{ $groupInsideCount ?? 0 }} Site / {{ $groupOutsideCount ?? 0 }} Luar + +
+
+ @endif + + + @if($level === 'units') +
+
+ + + Tipe {{ $selectedGroup }} + +
+
+ + {{ $selectedGroup }} + +

+ {{ $selectedType }} +

+ + {{ $totalUnitsOfType ?? $typeUnits->total() }} Unit Fisik + +

- Daftar unit alat berat spesifik di bawah tipe {{ $selectedType }}. + Daftar unit alat berat fisik individual untuk tipe {{ $selectedType }} di kelompok {{ $selectedGroup }}.

@@ -98,9 +238,13 @@
+ @if(isset($selectedGroup) && $selectedGroup) + + @endif @if(isset($selectedType) && $selectedType) @endif +
@@ -109,21 +253,29 @@ id="supportSearchInput" name="search" value="{{ request('search') }}" - placeholder="{{ isset($selectedType) && $selectedType ? 'Cari kode unit, seri, model, lokasi di ' . $selectedType . '...' : 'Cari tipe alat berat (Boomlift, Excavator, Dump Truck)...' }}" + placeholder="@if($level === 'units')Cari kode unit, nomor seri, model, lokasi di {{ $selectedType }}...@elseif($level === 'types')Cari tipe alat berat di kelompok {{ $selectedGroup }}...@elseCari kelompok operasional atau tipe alat berat (Hauling, Excavator, Dump Truck)...@endif" class="w-full text-xs pl-10 pr-4 py-2.5 rounded-xl border border-slate-200 bg-white text-slate-800 placeholder-slate-400 focus:outline-none focus:border-emerald-600 focus:ring-2 focus:ring-emerald-600/10 shadow-sm transition">
- @if(!isset($selectedType) || !$selectedType) - + @if($level === 'groups') + + + @elseif($level === 'types') + - @else - + @elseif($level === 'units') + @@ -267,105 +431,194 @@ @endforelse
- @else - + + {{-- ========================================================================= --}} + {{-- LEVEL 2: TABEL DAFTAR TIPE ALAT BERAT DI DALAM KELOMPOK TERPILIH --}} + {{-- ========================================================================= --}} + @elseif($level === 'types') - + - - @forelse($vehicles as $index => $v) - + + @forelse($types as $index => $t) + - @empty - + + + @endforelse + +
NO TIPE ALAT BERATKATEGORIKELOMPOK JUMLAH (QTY) STATUS OPERASIONAL DISTRIBUSI AREA AKSI
- {{ $vehicles->firstItem() + $index }} + {{ $types->firstItem() + $index }} - +
- {{ $v->unit_type }} - @if(isset($v->sample_brand_type) && $v->sample_brand_type) - {{ $v->sample_brand_type }} + {{ $t->unit_type }} + @if(isset($t->sample_brand_type) && $t->sample_brand_type) + {{ $t->sample_brand_type }} @endif
- - {{ $v->unit_category ?? 'SUPPORT' }} + + {{ $selectedGroup }} - - {{ $v->units_count ?? 0 }} Unit + title="Buka daftar {{ $t->units_count ?? 0 }} unit fisik tipe {{ $t->unit_type }}"> + {{ $t->units_count ?? 0 }} Unit -
+
- {{ $v->total_operation ?? 0 }} Operasi + {{ $t->total_operation ?? 0 }} Operasi - {{ $v->total_standby ?? 0 }} Standby + {{ $t->total_standby ?? 0 }} Standby - {{ $v->total_breakdown ?? 0 }} Breakdown + {{ $t->total_breakdown ?? 0 }} Breakdown
- {{ $v->inside_site_count ?? 0 }} Di Dalam Site + + {{ $t->inside_site_count ?? 0 }} Di Dalam Site • - {{ $v->outside_site_count ?? 0 }} Di Luar Site + {{ $t->outside_site_count ?? 0 }} Di Luar Site - Buka Unit +
- @if(request('search')) -

- Data "{{ request('search') }}" tidak ditemukan di tabel -

-

- Pastikan kata kunci yang dicari sudah benar. -

-
- - - Hapus Pencarian - +

Tidak ada tipe alat berat di kelompok {{ $selectedGroup }}

+

Belum ada tipe alat yang sesuai dengan filter.

+
+ + {{-- ========================================================================= --}} + {{-- LEVEL 1: TABEL DAFTAR KELOMPOK OPERASIONAL HEAVY EQUIPMENT (EXCEL) --}} + {{-- ========================================================================= --}} + @else + + + + + + + + + + + + + + @forelse($groups as $index => $g) + @php + $meta = $groupMetadata[$g->operational_group] ?? [ + 'icon' => 'fa-truck-monster', + 'badge' => 'bg-slate-100 text-slate-700 border-slate-200', + 'icon_bg' => 'bg-slate-100 text-slate-700 border-slate-200', + 'desc' => 'Kelompok operasional alat berat', + ]; + @endphp + + + + + + + + + + @empty + + @endforelse @@ -375,40 +628,63 @@
- @if(isset($selectedType) && $selectedType) + @if($level === 'units') {{ $typeUnits->links() }} + @elseif($level === 'types') + {{ $types->links() }} @else - {{ $vehicles->links() }} + {{ $groups->links() }} @endif
- + + + + @foreach($availableLocations ?? [] as $loc) + + @endforeach + + + + @foreach($availableBrands ?? [] as $b) + + @endforeach + + + +
NOKELOMPOK OPERASIONALTIPE ALATJUMLAH (QTY)STATUS OPERASIONALDISTRIBUSI AREAAKSI
+ {{ $groups->firstItem() + $index }} + + +
+
- @else -

Belum ada tipe alat berat

-

Belum ada tipe alat berat yang sesuai dengan filter.

- @endif +
+
+ {{ $g->operational_group }} + + {{ $g->operational_group }} + +
+

+ {{ $meta['desc'] }} +

+
+
+
+ + {{ $g->types_count ?? 0 }} Tipe Alat + + + + {{ $g->units_count ?? 0 }} Unit + + + +
+ + {{ $g->total_operation ?? 0 }} Operasi + + + {{ $g->total_standby ?? 0 }} Standby + + + {{ $g->total_breakdown ?? 0 }} Breakdown + +
+
+ {{ $g->inside_site_count ?? 0 }} Dalam Site + • + {{ $g->outside_site_count ?? 0 }} Luar Site + + + + Lihat Kategori + + +
+ +

Kelompok operasional tidak ditemukan

+

Silakan sesuaikan kata kunci pencarian Anda.