feat: setup Docker production stack, Vite asset compilation, and resolve audit findings (P1/P2)
This commit is contained in:
@@ -108,13 +108,23 @@ class ActivityLogController extends Controller
|
||||
});
|
||||
}
|
||||
|
||||
$totalActivities = (clone $query)->count();
|
||||
$totalDistance = (clone $query)->sum('distance');
|
||||
$inCount = (clone $query)->where('direction', 'in')->count();
|
||||
$outCount = (clone $query)->where('direction', 'out')->count();
|
||||
$approvedCount = (clone $query)->where('validation_status', 'approved')->count();
|
||||
$pendingCount = (clone $query)->where('validation_status', 'pending')->count();
|
||||
$rejectedCount = (clone $query)->where('validation_status', 'rejected')->count();
|
||||
$stats = (clone $query)->selectRaw("
|
||||
COUNT(*) as total_activities,
|
||||
COALESCE(SUM(distance), 0) as total_distance,
|
||||
COUNT(CASE WHEN direction = 'in' THEN 1 END) as in_count,
|
||||
COUNT(CASE WHEN direction = 'out' THEN 1 END) as out_count,
|
||||
COUNT(CASE WHEN validation_status = 'approved' THEN 1 END) as approved_count,
|
||||
COUNT(CASE WHEN validation_status = 'pending' THEN 1 END) as pending_count,
|
||||
COUNT(CASE WHEN validation_status = 'rejected' THEN 1 END) as rejected_count
|
||||
")->first();
|
||||
|
||||
$totalActivities = (int) ($stats->total_activities ?? 0);
|
||||
$totalDistance = (float) ($stats->total_distance ?? 0);
|
||||
$inCount = (int) ($stats->in_count ?? 0);
|
||||
$outCount = (int) ($stats->out_count ?? 0);
|
||||
$approvedCount = (int) ($stats->approved_count ?? 0);
|
||||
$pendingCount = (int) ($stats->pending_count ?? 0);
|
||||
$rejectedCount = (int) ($stats->rejected_count ?? 0);
|
||||
|
||||
// Rekapitulasi per Kendaraan
|
||||
$vehicleSummaries = (clone $query)
|
||||
|
||||
@@ -0,0 +1,220 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Qma;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\P2hRecord;
|
||||
use App\Models\Vehicle;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class P2hInspectionController extends Controller
|
||||
{
|
||||
/**
|
||||
* Tampilkan riwayat dan log pemeriksaan P2H Unit Support untuk Admin QMA.
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$query = P2hRecord::with(['vehicle', 'employee', 'template', 'validator']);
|
||||
|
||||
// Filter Status Approval
|
||||
if ($request->filled('validation_status')) {
|
||||
$query->where('validation_status', $request->input('validation_status'));
|
||||
}
|
||||
|
||||
// Filter Status Kelayakan (Kondisi)
|
||||
if ($request->filled('summary_condition')) {
|
||||
$query->where('summary_condition', $request->input('summary_condition'));
|
||||
}
|
||||
|
||||
// Filter Tanggal
|
||||
if ($request->filled('date')) {
|
||||
$query->whereDate('inspected_at', $request->input('date'));
|
||||
}
|
||||
|
||||
// Filter Pencarian Keyword (Nomor Transaksi, Kode Unit, Nama Operator, NIK)
|
||||
if ($request->filled('search')) {
|
||||
$search = trim($request->input('search'));
|
||||
$query->where(function ($q) use ($search) {
|
||||
$q->where('transaction_no', 'like', "%{$search}%")
|
||||
->orWhereHas('vehicle', fn($v) => $v->where('code', 'like', "%{$search}%")->orWhere('brand_type', 'like', "%{$search}%"))
|
||||
->orWhereHas('employee', fn($e) => $e->where('name', 'like', "%{$search}%")->orWhere('nik', 'like', "%{$search}%"));
|
||||
});
|
||||
}
|
||||
|
||||
$records = $query->orderByDesc('inspected_at')->paginate(15)->withQueryString();
|
||||
|
||||
// Statistik Ringkasan P2H
|
||||
$totalP2h = P2hRecord::count();
|
||||
$totalPending = P2hRecord::where('validation_status', 'pending')->count();
|
||||
$totalApproved = P2hRecord::where('validation_status', 'approved')->count();
|
||||
$totalRejected = P2hRecord::where('validation_status', 'rejected')->count();
|
||||
$totalDefects = P2hRecord::where('summary_condition', 'has_defect')->count();
|
||||
|
||||
return view('qma.p2h_index', compact(
|
||||
'records',
|
||||
'totalP2h',
|
||||
'totalPending',
|
||||
'totalApproved',
|
||||
'totalRejected',
|
||||
'totalDefects'
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tampilkan Summary Pemeriksaan P2H Unit Support (Analitik, Rekapitulasi Alat Berat & Status).
|
||||
*/
|
||||
public function summary(Request $request): View
|
||||
{
|
||||
$today = Carbon::today()->toDateString();
|
||||
$startDate = $request->input('start_date', Carbon::now()->startOfMonth()->toDateString());
|
||||
$endDate = $request->input('end_date', $today);
|
||||
$vehicleId = $request->input('vehicle_id');
|
||||
$validationStatus = $request->input('validation_status');
|
||||
$shift = $request->input('shift');
|
||||
$search = trim($request->input('search', ''));
|
||||
|
||||
$query = P2hRecord::with(['vehicle', 'employee', 'template']);
|
||||
|
||||
if ($startDate && $endDate) {
|
||||
$start = Carbon::parse($startDate)->startOfDay();
|
||||
$end = Carbon::parse($endDate)->endOfDay();
|
||||
$query->whereBetween('inspected_at', [$start, $end]);
|
||||
} elseif ($startDate) {
|
||||
$query->where('inspected_at', '>=', Carbon::parse($startDate)->startOfDay());
|
||||
} elseif ($endDate) {
|
||||
$query->where('inspected_at', '<=', Carbon::parse($endDate)->endOfDay());
|
||||
}
|
||||
|
||||
if ($request->filled('vehicle_id')) {
|
||||
$query->where('vehicle_id', $vehicleId);
|
||||
}
|
||||
|
||||
if ($request->filled('validation_status')) {
|
||||
$query->where('validation_status', $validationStatus);
|
||||
}
|
||||
|
||||
if ($request->filled('shift')) {
|
||||
$query->where('shift', $shift);
|
||||
}
|
||||
|
||||
if ($search !== '') {
|
||||
$query->where(function ($q) use ($search) {
|
||||
$q->where('transaction_no', 'like', "%{$search}%")
|
||||
->orWhereHas('vehicle', fn($v) => $v->where('code', 'like', "%{$search}%")->orWhere('brand_type', 'like', "%{$search}%"))
|
||||
->orWhereHas('employee', fn($e) => $e->where('name', 'like', "%{$search}%")->orWhere('nik', 'like', "%{$search}%"));
|
||||
});
|
||||
}
|
||||
|
||||
$records = $query->orderByDesc('inspected_at')->get();
|
||||
|
||||
// 4 KPI Metrik Utama
|
||||
$totalInspections = $records->count();
|
||||
$totalApproved = $records->where('validation_status', 'approved')->count();
|
||||
$totalPending = $records->where('validation_status', 'pending')->count();
|
||||
$totalRejected = $records->where('validation_status', 'rejected')->count();
|
||||
$totalDefects = $records->where('summary_condition', 'has_defect')->count();
|
||||
$totalNormal = $records->where('summary_condition', 'good')->count();
|
||||
$totalHm = $records->sum('start_hm');
|
||||
|
||||
// Rekapitulasi per Unit Support
|
||||
$unitSummary = $records->groupBy('vehicle_id')->map(function ($group) {
|
||||
$vehicle = $group->first()->vehicle;
|
||||
return [
|
||||
'vehicle' => $vehicle,
|
||||
'total' => $group->count(),
|
||||
'approved' => $group->where('validation_status', 'approved')->count(),
|
||||
'pending' => $group->where('validation_status', 'pending')->count(),
|
||||
'rejected' => $group->where('validation_status', 'rejected')->count(),
|
||||
'has_defect' => $group->where('summary_condition', 'has_defect')->count(),
|
||||
'good' => $group->where('summary_condition', 'good')->count(),
|
||||
'latest_hm' => $group->max('start_hm'),
|
||||
'latest_inspection' => $group->max('inspected_at'),
|
||||
];
|
||||
})->sortByDesc('total');
|
||||
|
||||
// Daftar Unit Support untuk opsi filter
|
||||
$supportVehicles = Vehicle::where('category', 'unit_support')->orderBy('code')->get();
|
||||
|
||||
return view('qma.p2h_summary', compact(
|
||||
'records',
|
||||
'totalInspections',
|
||||
'totalApproved',
|
||||
'totalPending',
|
||||
'totalRejected',
|
||||
'totalDefects',
|
||||
'totalNormal',
|
||||
'totalHm',
|
||||
'unitSummary',
|
||||
'supportVehicles',
|
||||
'startDate',
|
||||
'endDate'
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tampilkan detail lembar pemeriksaan P2H (seluruh section & butir jawaban).
|
||||
*/
|
||||
public function show(int $id): View
|
||||
{
|
||||
$record = P2hRecord::with(['vehicle', 'employee', 'template', 'validator', 'items'])->findOrFail($id);
|
||||
|
||||
$groupedItems = [];
|
||||
foreach ($record->items as $item) {
|
||||
$groupedItems[$item->section][] = $item;
|
||||
}
|
||||
|
||||
return view('qma.p2h_show', compact('record', 'groupedItems'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Approval / Persetujuan lembar P2H oleh Admin QMA.
|
||||
*/
|
||||
public function approve(Request $request, int $id): RedirectResponse
|
||||
{
|
||||
$record = P2hRecord::with('vehicle')->findOrFail($id);
|
||||
|
||||
$record->update([
|
||||
'validation_status' => 'approved',
|
||||
'validated_by' => Auth::id(),
|
||||
'validated_at' => Carbon::now(),
|
||||
'validation_notes' => $request->input('validation_notes', 'Pemeriksaan P2H disetujui oleh QMA.'),
|
||||
]);
|
||||
|
||||
// Jika unit dinyatakan aman dan sebelumnya breakdown karena review, status unit disetujui operasi
|
||||
if (!$record->hasDefects() && $record->vehicle->status === 'Breakdown') {
|
||||
$record->vehicle->update(['status' => 'Operation']);
|
||||
}
|
||||
|
||||
return back()->with('success', "Inspeksi P2H [{$record->transaction_no}] untuk unit {$record->vehicle->code} berhasil DISETUJUI.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Penolakan lembar P2H oleh Admin QMA (misal data tidak valid atau unit dilarang beroperasi).
|
||||
*/
|
||||
public function reject(Request $request, int $id): RedirectResponse
|
||||
{
|
||||
$request->validate([
|
||||
'validation_notes' => ['required', 'string', 'max:1000'],
|
||||
], [
|
||||
'validation_notes.required' => 'Alasan penolakan / instruksi perbaikan wajib diisi.',
|
||||
]);
|
||||
|
||||
$record = P2hRecord::with('vehicle')->findOrFail($id);
|
||||
|
||||
$record->update([
|
||||
'validation_status' => 'rejected',
|
||||
'validated_by' => Auth::id(),
|
||||
'validated_at' => Carbon::now(),
|
||||
'validation_notes' => $request->input('validation_notes'),
|
||||
]);
|
||||
|
||||
// Kunci status kendaraan ke Breakdown atau Standby jika P2H ditolak
|
||||
$record->vehicle->update(['status' => 'Breakdown']);
|
||||
|
||||
return back()->with('success', "Inspeksi P2H [{$record->transaction_no}] untuk unit {$record->vehicle->code} DITOLAK. Status unit diubah ke Breakdown.");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,351 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers\Qma;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\P2hTemplate;
|
||||
use App\Models\P2hTemplateItem;
|
||||
use App\Models\Vehicle;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class P2hTemplateController extends Controller
|
||||
{
|
||||
/**
|
||||
* Tampilkan daftar Master Template Checksheet P2H Unit Support sesuai kategori aset.
|
||||
*/
|
||||
public function index(Request $request): View
|
||||
{
|
||||
$query = P2hTemplate::withCount(['items', 'vehicles', 'records']);
|
||||
|
||||
if ($request->filled('search')) {
|
||||
$search = trim($request->input('search'));
|
||||
$query->where('name', 'like', "%{$search}%")
|
||||
->orWhere('code', 'like', "%{$search}%");
|
||||
}
|
||||
|
||||
$templates = $query->orderBy('name')->get();
|
||||
|
||||
return view('qma.p2h_templates', compact('templates'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Tampilkan detail butir pertanyaan dalam template tertentu.
|
||||
*/
|
||||
public function show(int $id): View
|
||||
{
|
||||
$template = P2hTemplate::findOrFail($id);
|
||||
|
||||
// Pastikan seluruh nomor urut pertanyaan berurutan otomatis tanpa celah (1, 2, 3... N)
|
||||
$this->resequenceTemplate($template);
|
||||
|
||||
$template->load(['items' => fn($q) => $q->orderBy('sequence')]);
|
||||
|
||||
$groupedItems = [];
|
||||
foreach ($template->items as $item) {
|
||||
$groupedItems[$item->section][] = $item;
|
||||
}
|
||||
|
||||
// Ambil daftar unik nama section yang sudah ada untuk saran/opsi dropdown
|
||||
$availableSections = P2hTemplateItem::where('template_id', $template->id)
|
||||
->distinct()
|
||||
->pluck('section')
|
||||
->values()
|
||||
->all();
|
||||
|
||||
return view('qma.p2h_template_detail', compact('template', 'groupedItems', 'availableSections'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Perbarui butir pertanyaan checksheet P2H yang sudah ada.
|
||||
*/
|
||||
public function updateItem(Request $request, int $templateId, int $itemId): RedirectResponse
|
||||
{
|
||||
$template = P2hTemplate::findOrFail($templateId);
|
||||
$item = P2hTemplateItem::where('template_id', $template->id)->findOrFail($itemId);
|
||||
|
||||
$allowedTypes = [
|
||||
'Multiple Lines Text Box',
|
||||
'Single Line Text Box',
|
||||
'Numerical Value',
|
||||
'Date',
|
||||
'Datetime',
|
||||
'Multiple choice: only one answer',
|
||||
'Multiple choice: multiple answers allowed',
|
||||
'Matrix',
|
||||
'choice',
|
||||
'condition',
|
||||
'number',
|
||||
'text',
|
||||
'datetime',
|
||||
'date',
|
||||
'textarea',
|
||||
];
|
||||
|
||||
$validated = $request->validate([
|
||||
'title' => 'required|string|max:255',
|
||||
'section' => 'required|string|max:100',
|
||||
'question_type' => ['required', 'string', 'max:50', \Illuminate\Validation\Rule::in($allowedTypes)],
|
||||
'sequence' => 'nullable|integer|min:1',
|
||||
]);
|
||||
|
||||
$oldSection = $item->section;
|
||||
$newSection = trim($validated['section']);
|
||||
|
||||
$item->update([
|
||||
'title' => trim($validated['title']),
|
||||
'section' => $newSection,
|
||||
'question_type' => $validated['question_type'],
|
||||
]);
|
||||
|
||||
if ($oldSection !== $newSection) {
|
||||
$targetMaxSeq = P2hTemplateItem::where('template_id', $template->id)
|
||||
->where('section', $newSection)
|
||||
->where('id', '!=', $item->id)
|
||||
->max('sequence');
|
||||
|
||||
if ($targetMaxSeq) {
|
||||
P2hTemplateItem::where('template_id', $template->id)
|
||||
->where('id', '!=', $item->id)
|
||||
->where('sequence', '>', $targetMaxSeq)
|
||||
->increment('sequence', 10);
|
||||
$item->update(['sequence' => $targetMaxSeq + 1]);
|
||||
}
|
||||
}
|
||||
|
||||
$this->resequenceTemplate($template);
|
||||
|
||||
return redirect()
|
||||
->route('qma.p2h.templates.show', $template->id)
|
||||
->with('success', "Butir pertanyaan '{$item->title}' berhasil diperbarui.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Tambah butir pertanyaan baru ke dalam template checksheet.
|
||||
*/
|
||||
public function storeItem(Request $request, int $templateId): RedirectResponse
|
||||
{
|
||||
$template = P2hTemplate::findOrFail($templateId);
|
||||
|
||||
$allowedTypes = [
|
||||
'Multiple Lines Text Box',
|
||||
'Single Line Text Box',
|
||||
'Numerical Value',
|
||||
'Date',
|
||||
'Datetime',
|
||||
'Multiple choice: only one answer',
|
||||
'Multiple choice: multiple answers allowed',
|
||||
'Matrix',
|
||||
'choice',
|
||||
'condition',
|
||||
'number',
|
||||
'text',
|
||||
'datetime',
|
||||
'date',
|
||||
'textarea',
|
||||
];
|
||||
|
||||
// 1. Jika form mengirimkan daftar pertanyaan sekaligus (Tambah Section dengan List Pertanyaan)
|
||||
if ($request->has('questions') && is_array($request->input('questions'))) {
|
||||
$validated = $request->validate([
|
||||
'section' => 'required|string|max:100',
|
||||
'position_type' => 'nullable|string|in:end,start,after,before',
|
||||
'target_section' => 'nullable|string|max:100',
|
||||
'questions' => 'required|array|min:1',
|
||||
'questions.*.title' => 'required|string|max:255',
|
||||
'questions.*.question_type' => ['required', 'string', 'max:50', \Illuminate\Validation\Rule::in($allowedTypes)],
|
||||
'questions.*.sequence' => 'nullable|integer|min:1',
|
||||
]);
|
||||
|
||||
$section = trim($validated['section']);
|
||||
$positionType = $validated['position_type'] ?? 'end';
|
||||
$targetSection = !empty($validated['target_section']) ? trim($validated['target_section']) : null;
|
||||
|
||||
$validQuestions = array_values(array_filter($validated['questions'], fn($q) => !empty(trim($q['title'] ?? ''))));
|
||||
$n = count($validQuestions);
|
||||
|
||||
if ($n === 0) {
|
||||
return redirect()->back()->withErrors(['questions' => 'Minimal harus ada 1 pertanyaan yang terisi.']);
|
||||
}
|
||||
|
||||
\Illuminate\Support\Facades\DB::transaction(function () use ($template, $section, $positionType, $targetSection, $validQuestions, $n) {
|
||||
// Tentukan base sequence awal berdasarkan posisi penempatan
|
||||
if ($positionType === 'start') {
|
||||
// Geser semua item yang sudah ada
|
||||
P2hTemplateItem::where('template_id', $template->id)->increment('sequence', $n + 100);
|
||||
$startSeq = 1;
|
||||
} elseif ($positionType === 'after' && $targetSection) {
|
||||
$targetMaxSeq = P2hTemplateItem::where('template_id', $template->id)
|
||||
->where('section', $targetSection)
|
||||
->max('sequence');
|
||||
|
||||
if ($targetMaxSeq) {
|
||||
P2hTemplateItem::where('template_id', $template->id)
|
||||
->where('sequence', '>', $targetMaxSeq)
|
||||
->increment('sequence', $n + 100);
|
||||
$startSeq = $targetMaxSeq + 1;
|
||||
} else {
|
||||
$startSeq = (P2hTemplateItem::where('template_id', $template->id)->max('sequence') ?? 0) + 1;
|
||||
}
|
||||
} elseif ($positionType === 'before' && $targetSection) {
|
||||
$targetMinSeq = P2hTemplateItem::where('template_id', $template->id)
|
||||
->where('section', $targetSection)
|
||||
->min('sequence');
|
||||
|
||||
if ($targetMinSeq) {
|
||||
P2hTemplateItem::where('template_id', $template->id)
|
||||
->where('sequence', '>=', $targetMinSeq)
|
||||
->increment('sequence', $n + 100);
|
||||
$startSeq = $targetMinSeq;
|
||||
} else {
|
||||
$startSeq = (P2hTemplateItem::where('template_id', $template->id)->max('sequence') ?? 0) + 1;
|
||||
}
|
||||
} else {
|
||||
// Default 'end'
|
||||
$startSeq = (P2hTemplateItem::where('template_id', $template->id)->max('sequence') ?? 0) + 1;
|
||||
}
|
||||
|
||||
foreach ($validQuestions as $idx => $qData) {
|
||||
P2hTemplateItem::create([
|
||||
'template_id' => $template->id,
|
||||
'section' => $section,
|
||||
'title' => trim($qData['title']),
|
||||
'question_type' => $qData['question_type'],
|
||||
'sequence' => $startSeq + $idx,
|
||||
]);
|
||||
}
|
||||
|
||||
// Normalisasi ulang sequence otomatis berurutan dari section pertama hingga akhir
|
||||
$this->resequenceTemplate($template);
|
||||
});
|
||||
|
||||
return redirect()
|
||||
->route('qma.p2h.templates.show', $template->id)
|
||||
->with('success', "Bagian '{$section}' dengan {$n} butir pertanyaan berhasil ditambahkan.");
|
||||
}
|
||||
|
||||
// 2. Format single question (form butir tunggal via modal tambah pertanyaan)
|
||||
$validated = $request->validate([
|
||||
'title' => 'required|string|max:255',
|
||||
'section' => 'required|string|max:100',
|
||||
'question_type' => ['required', 'string', 'max:50', \Illuminate\Validation\Rule::in($allowedTypes)],
|
||||
'sequence' => 'nullable|integer|min:1',
|
||||
]);
|
||||
|
||||
$section = trim($validated['section']);
|
||||
|
||||
\Illuminate\Support\Facades\DB::transaction(function () use ($template, $section, $validated) {
|
||||
$targetSectionMaxSeq = P2hTemplateItem::where('template_id', $template->id)
|
||||
->where('section', $section)
|
||||
->max('sequence');
|
||||
|
||||
if ($targetSectionMaxSeq) {
|
||||
// Geser butir di section setelahnya agar pertanyaan ini diletakkan di akhir section terkait
|
||||
P2hTemplateItem::where('template_id', $template->id)
|
||||
->where('sequence', '>', $targetSectionMaxSeq)
|
||||
->increment('sequence', 10);
|
||||
$seq = $targetSectionMaxSeq + 1;
|
||||
} else {
|
||||
$seq = (P2hTemplateItem::where('template_id', $template->id)->max('sequence') ?? 0) + 1;
|
||||
}
|
||||
|
||||
P2hTemplateItem::create([
|
||||
'template_id' => $template->id,
|
||||
'section' => $section,
|
||||
'title' => trim($validated['title']),
|
||||
'question_type' => $validated['question_type'],
|
||||
'sequence' => $seq,
|
||||
]);
|
||||
|
||||
$this->resequenceTemplate($template);
|
||||
});
|
||||
|
||||
return redirect()
|
||||
->route('qma.p2h.templates.show', $template->id)
|
||||
->with('success', "Butir pertanyaan berhasil ditambahkan ke bagian '{$section}'.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Atur ulang urutan seluruh section dalam template checksheet.
|
||||
*/
|
||||
public function reorderSections(Request $request, int $templateId): RedirectResponse
|
||||
{
|
||||
$template = P2hTemplate::findOrFail($templateId);
|
||||
|
||||
$validated = $request->validate([
|
||||
'sections' => 'required|array|min:1',
|
||||
'sections.*' => 'required|string|max:100',
|
||||
]);
|
||||
|
||||
\Illuminate\Support\Facades\DB::transaction(function () use ($template, $validated) {
|
||||
$currentSequence = 1;
|
||||
|
||||
foreach ($validated['sections'] as $sectionName) {
|
||||
$items = P2hTemplateItem::where('template_id', $template->id)
|
||||
->where('section', $sectionName)
|
||||
->orderBy('sequence')
|
||||
->orderBy('id')
|
||||
->get();
|
||||
|
||||
foreach ($items as $item) {
|
||||
$item->update(['sequence' => $currentSequence]);
|
||||
$currentSequence++;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return redirect()
|
||||
->route('qma.p2h.templates.show', $template->id)
|
||||
->with('success', 'Urutan section berhasil diperbarui.');
|
||||
}
|
||||
|
||||
/**
|
||||
* Hapus butir pertanyaan dari template checksheet.
|
||||
*/
|
||||
public function destroyItem(int $templateId, int $itemId): RedirectResponse
|
||||
{
|
||||
$template = P2hTemplate::findOrFail($templateId);
|
||||
$item = P2hTemplateItem::where('template_id', $template->id)->findOrFail($itemId);
|
||||
|
||||
$itemTitle = $item->title;
|
||||
$item->delete();
|
||||
|
||||
// Normalisasi ulang sequence otomatis agar tidak ada celah/lompatan nomor
|
||||
$this->resequenceTemplate($template);
|
||||
|
||||
return redirect()
|
||||
->route('qma.p2h.templates.show', $template->id)
|
||||
->with('success', "Butir pertanyaan '{$itemTitle}' berhasil dihapus.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Urutkan ulang sequence seluruh butir pertanyaan dalam template
|
||||
* agar berurutan secara konsisten dari section pertama hingga akhir (1, 2, 3... N).
|
||||
*/
|
||||
private function resequenceTemplate(P2hTemplate $template): void
|
||||
{
|
||||
$sections = P2hTemplateItem::where('template_id', $template->id)
|
||||
->select('section', \Illuminate\Support\Facades\DB::raw('MIN(sequence) as min_seq'))
|
||||
->groupBy('section')
|
||||
->orderBy('min_seq')
|
||||
->pluck('section');
|
||||
|
||||
$currentSeq = 1;
|
||||
foreach ($sections as $sectionName) {
|
||||
$items = P2hTemplateItem::where('template_id', $template->id)
|
||||
->where('section', $sectionName)
|
||||
->orderBy('sequence')
|
||||
->orderBy('id')
|
||||
->get();
|
||||
|
||||
foreach ($items as $item) {
|
||||
if ($item->sequence !== $currentSeq) {
|
||||
$item->update(['sequence' => $currentSeq]);
|
||||
}
|
||||
$currentSeq++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,9 +3,13 @@
|
||||
namespace App\Http\Controllers\Qma;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Employee;
|
||||
use App\Models\Gate;
|
||||
use App\Models\P2hTemplate;
|
||||
use App\Models\Vehicle;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\View\View;
|
||||
|
||||
@@ -77,11 +81,11 @@ class VehicleController extends Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* Halaman khusus pengelolaan armada Kendaraan Berat (Unit Support / Alat Berat).
|
||||
* Halaman khusus pengelolaan Kategori Kendaraan Berat (Unit Support / Alat Berat).
|
||||
*/
|
||||
public function indexSupport(Request $request): View
|
||||
{
|
||||
$query = Vehicle::unitSupports();
|
||||
$query = Vehicle::unitSupportCategories()->withCount('units');
|
||||
|
||||
// Filter Status Operasional
|
||||
if ($request->filled('status')) {
|
||||
@@ -112,33 +116,202 @@ class VehicleController extends Controller
|
||||
$vehicles = $query->orderBy('code')->paginate(15)->withQueryString();
|
||||
|
||||
// Statistik Ringkasan Khusus Unit Support
|
||||
$totalSupport = Vehicle::unitSupports()->count();
|
||||
$totalOperation = Vehicle::unitSupports()->where('status', 'Operation')->count();
|
||||
$totalStandby = Vehicle::unitSupports()->where('status', 'Standby')->count();
|
||||
$totalBreakdown = Vehicle::unitSupports()->where('status', 'Breakdown')->count();
|
||||
$totalSupport = Vehicle::unitSupportCategories()->count();
|
||||
$totalUnits = Vehicle::unitSupportPhysical()->count();
|
||||
$totalOperation = Vehicle::unitSupportCategories()->where('status', 'Operation')->count();
|
||||
$totalStandby = Vehicle::unitSupportCategories()->where('status', 'Standby')->count();
|
||||
$totalBreakdown = Vehicle::unitSupportCategories()->where('status', 'Breakdown')->count();
|
||||
|
||||
// Daftar kategori alat berat yang terdaftar untuk opsi filter
|
||||
$availableCategories = Vehicle::unitSupports()
|
||||
$availableCategories = Vehicle::unitSupportCategories()
|
||||
->whereNotNull('unit_category')
|
||||
->distinct()
|
||||
->pluck('unit_category');
|
||||
|
||||
// Master data daftar divisi perusahaan (gabungan standar + data existing di Employee & Vehicle)
|
||||
$standardDivisions = collect([
|
||||
'Civil & Inviro',
|
||||
'GA',
|
||||
'HR',
|
||||
'INFORMATION & TECHNOLOGY',
|
||||
'K3',
|
||||
'Keuangan',
|
||||
'Logistik',
|
||||
'Mechanical',
|
||||
'Operasional',
|
||||
'PG',
|
||||
'Quality Management Asset (QMA)',
|
||||
]);
|
||||
|
||||
$availableDivisions = $standardDivisions
|
||||
->merge(Employee::whereNotNull('division')->where('division', '!=', '')->pluck('division'))
|
||||
->merge(Vehicle::whereNotNull('division')->where('division', '!=', '')->pluck('division'))
|
||||
->map(fn($d) => trim($d))
|
||||
->filter()
|
||||
->unique()
|
||||
->sort()
|
||||
->values()
|
||||
->all();
|
||||
|
||||
// Daftar semua kode unit support untuk validasi unik langsung di form
|
||||
$existingCodes = Vehicle::unitSupports()->pluck('code')->map(fn($c) => strtoupper(trim($c)))->values()->all();
|
||||
|
||||
return view('qma.vehicles_support', compact(
|
||||
'vehicles',
|
||||
'totalSupport',
|
||||
'totalUnits',
|
||||
'totalOperation',
|
||||
'totalStandby',
|
||||
'totalBreakdown',
|
||||
'availableCategories',
|
||||
'availableDivisions',
|
||||
'existingCodes'
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Simpan data aset kendaraan baru (Kendaraan Ringan atau Kendaraan Berat).
|
||||
* Halaman daftar unit fisik berdasarkan kategori Unit Support yang dipilih.
|
||||
*/
|
||||
public function indexSupportUnits(Request $request, int $id): View
|
||||
{
|
||||
$category = Vehicle::unitSupportCategories()->withCount('units')->findOrFail($id);
|
||||
|
||||
$query = $category->units();
|
||||
|
||||
if ($request->filled('status')) {
|
||||
$query->where('status', $request->input('status'));
|
||||
}
|
||||
|
||||
if ($request->filled('search')) {
|
||||
$search = trim($request->input('search'));
|
||||
$query->where(function ($q) use ($search) {
|
||||
$q->where('code', 'like', "%{$search}%")
|
||||
->orWhere('serial_number', 'like', "%{$search}%")
|
||||
->orWhere('license_plate', 'like', "%{$search}%")
|
||||
->orWhere('production_year', 'like', "%{$search}%")
|
||||
->orWhere('location', 'like', "%{$search}%")
|
||||
->orWhere('silo_document', 'like', "%{$search}%")
|
||||
->orWhere('kir_document', 'like', "%{$search}%")
|
||||
->orWhere('brand_type', 'like', "%{$search}%");
|
||||
});
|
||||
}
|
||||
|
||||
$units = $query->paginate(15)->withQueryString();
|
||||
|
||||
$totalUnits = $category->units()->count();
|
||||
$totalOperation = $category->units()->where('status', 'Operation')->count();
|
||||
$totalStandby = $category->units()->where('status', 'Standby')->count();
|
||||
$totalBreakdown = $category->units()->where('status', 'Breakdown')->count();
|
||||
$totalMaintenance = $category->units()->where('status', 'Maintenance')->count();
|
||||
|
||||
$nextUnitNumber = $category->getNextUnitNumber();
|
||||
$nextUnitCode = $category->getNextUnitCode();
|
||||
|
||||
$existingCodes = Vehicle::pluck('code')->map(fn($c) => strtoupper(trim($c)))->values()->all();
|
||||
|
||||
// Master data lokasi penempatan (gabungan pos gerbang aktif & lokasi operasional proyek)
|
||||
$masterLocations = Gate::where('is_active', true)
|
||||
->orderBy('name')
|
||||
->pluck('name')
|
||||
->merge(
|
||||
Vehicle::whereNotNull('location')
|
||||
->where('location', '!=', '')
|
||||
->pluck('location')
|
||||
)
|
||||
->map(fn($loc) => trim($loc))
|
||||
->filter()
|
||||
->unique()
|
||||
->sort()
|
||||
->values()
|
||||
->all();
|
||||
|
||||
return view('qma.vehicles_support_units', compact(
|
||||
'category',
|
||||
'units',
|
||||
'totalUnits',
|
||||
'totalOperation',
|
||||
'totalStandby',
|
||||
'totalBreakdown',
|
||||
'totalMaintenance',
|
||||
'nextUnitNumber',
|
||||
'nextUnitCode',
|
||||
'existingCodes',
|
||||
'masterLocations'
|
||||
));
|
||||
}
|
||||
|
||||
/**
|
||||
* Simpan penambahan unit fisik baru di bawah kategori Unit Support tertentu.
|
||||
*/
|
||||
public function storeSupportUnit(Request $request, int $id): RedirectResponse
|
||||
{
|
||||
$category = Vehicle::unitSupportCategories()->findOrFail($id);
|
||||
|
||||
$request->validate([
|
||||
'unit_number' => ['nullable', 'string', 'max:20'],
|
||||
'code' => ['nullable', 'string', 'max:50'],
|
||||
'serial_number' => ['nullable', 'string', 'max:100'],
|
||||
'license_plate' => ['nullable', 'string', 'max:30'],
|
||||
'production_year' => ['nullable', 'integer', 'min:1980', 'max:' . (date('Y') + 1)],
|
||||
'status' => ['required', 'string', 'in:Operation,Standby,Breakdown,Maintenance'],
|
||||
'current_km' => ['nullable', 'numeric', 'min:0'],
|
||||
'location' => ['nullable', 'string', 'max:150'],
|
||||
'silo_document' => ['nullable', 'string', 'max:150'],
|
||||
'kir_document' => ['nullable', 'string', 'max:150'],
|
||||
'ownership' => ['nullable', 'string', 'max:150'],
|
||||
'division' => ['nullable', 'string', 'max:100'],
|
||||
]);
|
||||
|
||||
return DB::transaction(function () use ($request, $category) {
|
||||
// Tentukan nomor unit dan kode unit
|
||||
$rawUnitNumber = trim((string)$request->input('unit_number'));
|
||||
if ($rawUnitNumber !== '') {
|
||||
if (ctype_digit($rawUnitNumber)) {
|
||||
$unitNumber = str_pad($rawUnitNumber, 3, '0', STR_PAD_LEFT);
|
||||
} else {
|
||||
$unitNumber = $rawUnitNumber;
|
||||
}
|
||||
$code = strtoupper(trim($category->code . '-' . $unitNumber));
|
||||
} elseif ($request->filled('code')) {
|
||||
$code = strtoupper(trim($request->input('code')));
|
||||
} else {
|
||||
$code = $category->getNextUnitCode();
|
||||
}
|
||||
|
||||
// Validasi unik dengan lock for update
|
||||
if (Vehicle::where('code', $code)->lockForUpdate()->exists()) {
|
||||
return back()->withInput()->with('error', "Kode unit [{$code}] sudah terdaftar di sistem. Silakan gunakan nomor urut lain.");
|
||||
}
|
||||
|
||||
$unit = Vehicle::create([
|
||||
'code' => $code,
|
||||
'category' => 'unit_support',
|
||||
'parent_id' => $category->id,
|
||||
'p2h_template_id' => $category->p2h_template_id,
|
||||
'brand_type' => $category->brand_type,
|
||||
'unit_category' => $category->unit_category,
|
||||
'unit_type' => $category->unit_type,
|
||||
'brand' => $category->brand,
|
||||
'model_number' => $category->model_number,
|
||||
'license_plate' => $request->input('license_plate'),
|
||||
'serial_number' => $request->input('serial_number'),
|
||||
'production_year' => $request->input('production_year'),
|
||||
'status' => $request->input('status', 'Operation'),
|
||||
'current_km' => $request->input('current_km', 0),
|
||||
'location' => $request->input('location', $category->location),
|
||||
'ownership' => $request->input('ownership', $category->ownership),
|
||||
'division' => $request->input('division', $category->division),
|
||||
'fuel_consumption' => $category->fuel_consumption,
|
||||
'silo_document' => $request->input('silo_document'),
|
||||
'kir_document' => $request->input('kir_document'),
|
||||
]);
|
||||
|
||||
return back()->with('success', "Unit fisik [{$unit->code}] berhasil ditambahkan ke kategori {$category->unit_category}.");
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Simpan data aset kendaraan baru (Kendaraan Ringan atau Kategori Kendaraan Berat).
|
||||
*/
|
||||
public function store(Request $request): RedirectResponse
|
||||
{
|
||||
@@ -149,10 +322,11 @@ class VehicleController extends Controller
|
||||
'category' => ['required', 'in:light_vehicle,unit_support'],
|
||||
'brand_type' => ['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' => ['required', 'string', 'in:Operation,Standby,Breakdown,Maintenance'],
|
||||
'current_km' => ['required', 'numeric', 'min:0'],
|
||||
'status' => [$category === 'unit_support' ? 'nullable' : 'required', 'string', 'in:Operation,Standby,Breakdown,Maintenance'],
|
||||
'current_km' => [$category === 'unit_support' ? 'nullable' : 'required', 'numeric', 'min:0'],
|
||||
];
|
||||
|
||||
// Atribut opsional spesifik Unit Support (Kendaraan Berat)
|
||||
@@ -180,29 +354,51 @@ class VehicleController extends Controller
|
||||
'status.required' => 'Status operasional wajib dipilih.',
|
||||
]);
|
||||
|
||||
if ($category === 'unit_support') {
|
||||
$validated['status'] = $validated['status'] ?? 'Operation';
|
||||
$validated['current_km'] = $validated['current_km'] ?? 0;
|
||||
}
|
||||
|
||||
$vehicle = Vehicle::create($validated);
|
||||
|
||||
$categoryLabel = $vehicle->isLightVehicle() ? 'Light Vehicle (LV)' : 'Unit Support';
|
||||
if ($vehicle->isSupportCategory()) {
|
||||
// Otomatis buatkan Master Template P2H baru (default kosong tanpa butir pertanyaan)
|
||||
$template = P2hTemplate::firstOrCreate(
|
||||
['code' => $vehicle->code],
|
||||
[
|
||||
'name' => $vehicle->unit_category ?: $vehicle->brand_type,
|
||||
'description' => "Template form inspeksi P2H resmi untuk kategori {$vehicle->brand_type} (Kode: {$vehicle->code}).",
|
||||
'is_active' => true,
|
||||
]
|
||||
);
|
||||
$vehicle->update(['p2h_template_id' => $template->id]);
|
||||
}
|
||||
|
||||
$categoryLabel = $vehicle->isLightVehicle() ? 'Light Vehicle (LV)' : 'Kategori Unit Support';
|
||||
|
||||
return back()->with('success', "Data {$categoryLabel} [{$vehicle->code}] berhasil ditambahkan ke sistem.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Perbarui data aset kendaraan (LV atau Unit Support).
|
||||
* Jika kode Kategori Unit Support diubah, otomatis sinkronisasikan kode seluruh unit fisik di bawahnya serta Master Template P2H.
|
||||
*/
|
||||
public function update(Request $request, int $id): RedirectResponse
|
||||
{
|
||||
$vehicle = Vehicle::findOrFail($id);
|
||||
$oldCode = $vehicle->code;
|
||||
$newCode = strtoupper(trim($request->input('code')));
|
||||
|
||||
$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'],
|
||||
'license_plate' => ['nullable', 'string', 'max:30'],
|
||||
'serial_number' => ['nullable', 'string', 'max:100'],
|
||||
'ownership' => ['nullable', 'string', 'max:150'],
|
||||
'division' => ['nullable', 'string', 'max:100'],
|
||||
'status' => ['required', 'string', 'in:Operation,Standby,Breakdown,Maintenance'],
|
||||
'current_km' => ['required', 'numeric', 'min:0'],
|
||||
'status' => [$vehicle->isSupportCategory() ? 'nullable' : 'required', 'string', 'in:Operation,Standby,Breakdown,Maintenance'],
|
||||
'current_km' => [$vehicle->isSupportCategory() ? 'nullable' : 'required', 'numeric', 'min:0'],
|
||||
'unit_category' => ['nullable', 'string', 'max:100'],
|
||||
'unit_type' => ['nullable', 'string', 'max:100'],
|
||||
'brand' => ['nullable', 'string', 'max:100'],
|
||||
@@ -223,7 +419,48 @@ class VehicleController extends Controller
|
||||
'current_km.required' => 'Nilai KM / HM wajib diisi.',
|
||||
]);
|
||||
|
||||
$vehicle->update($validated);
|
||||
DB::transaction(function () use ($vehicle, $validated, $oldCode, $newCode) {
|
||||
$vehicle->update($validated);
|
||||
|
||||
// Jika ini kategori Unit Support, sinkronkan Master Template P2H dan unit-unit fisik di bawahnya
|
||||
if ($vehicle->isSupportCategory()) {
|
||||
$template = $vehicle->p2hTemplate ?: P2hTemplate::where('code', $oldCode)->first();
|
||||
if ($template) {
|
||||
$template->update([
|
||||
'code' => $newCode,
|
||||
'name' => $vehicle->unit_category ?: $vehicle->brand_type,
|
||||
'description' => "Template form inspeksi P2H resmi untuk kategori {$vehicle->brand_type} (Kode: {$newCode}).",
|
||||
]);
|
||||
if ($vehicle->p2h_template_id !== $template->id) {
|
||||
$vehicle->update(['p2h_template_id' => $template->id]);
|
||||
}
|
||||
} else {
|
||||
$template = P2hTemplate::firstOrCreate(
|
||||
['code' => $newCode],
|
||||
[
|
||||
'name' => $vehicle->unit_category ?: $vehicle->brand_type,
|
||||
'description' => "Template form inspeksi P2H resmi untuk kategori {$vehicle->brand_type} (Kode: {$newCode}).",
|
||||
'is_active' => true,
|
||||
]
|
||||
);
|
||||
$vehicle->update(['p2h_template_id' => $template->id]);
|
||||
}
|
||||
|
||||
if ($oldCode !== $newCode) {
|
||||
$childUnits = $vehicle->units()->lockForUpdate()->get();
|
||||
foreach ($childUnits as $child) {
|
||||
if (str_starts_with($child->code, $oldCode . '-')) {
|
||||
$suffix = substr($child->code, strlen($oldCode . '-'));
|
||||
$child->code = $newCode . '-' . $suffix;
|
||||
} else {
|
||||
$child->code = $newCode . '-' . $child->code;
|
||||
}
|
||||
$child->p2h_template_id = $template->id;
|
||||
$child->save();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return back()->with('success', "Data unit kendaraan [{$vehicle->code}] berhasil diperbarui.");
|
||||
}
|
||||
@@ -240,9 +477,30 @@ class VehicleController extends Controller
|
||||
return back()->with('error', "Unit {$vehicle->code} tidak dapat dihapus karena telah memiliki catatan riwayat pergerakan di pos gerbang.");
|
||||
}
|
||||
|
||||
// Cegah jika memiliki catatan P2H
|
||||
if ($vehicle->p2hRecords()->exists()) {
|
||||
return back()->with('error', "Aset {$vehicle->code} tidak dapat dihapus karena telah memiliki riwayat inspeksi P2H.");
|
||||
}
|
||||
|
||||
// Jika kategori memiliki unit fisik yang punya P2H atau riwayat aktivitas
|
||||
if ($vehicle->isSupportCategory()) {
|
||||
foreach ($vehicle->units as $u) {
|
||||
if ($u->activities()->exists() || $u->p2hRecords()->exists()) {
|
||||
return back()->with('error', "Kategori {$vehicle->code} tidak dapat dihapus karena unit fisik [{$u->code}] di bawahnya telah memiliki riwayat data operasional.");
|
||||
}
|
||||
}
|
||||
|
||||
// Hapus juga master template jika belum ada riwayat inspeksi
|
||||
$template = $vehicle->p2hTemplate ?: P2hTemplate::where('code', $vehicle->code)->first();
|
||||
if ($template && !$template->records()->exists()) {
|
||||
$template->items()->delete();
|
||||
$template->delete();
|
||||
}
|
||||
}
|
||||
|
||||
$code = $vehicle->code;
|
||||
$vehicle->delete();
|
||||
|
||||
return back()->with('success', "Unit kendaraan {$code} berhasil dihapus dari sistem.");
|
||||
return back()->with('success', "Unit/Kategori kendaraan {$code} berhasil dihapus dari sistem.");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user