feat(qma): show BAST document section only for outside site unit transfers
This commit is contained in:
@@ -192,8 +192,8 @@ class UnitTransferController extends Controller
|
|||||||
'transporter_driver_name' => ['nullable', 'string', 'max:255'],
|
'transporter_driver_name' => ['nullable', 'string', 'max:255'],
|
||||||
'transporter_description' => ['nullable', 'string', 'max:2000'],
|
'transporter_description' => ['nullable', 'string', 'max:2000'],
|
||||||
'update_transporter_location' => ['nullable', 'boolean'],
|
'update_transporter_location' => ['nullable', 'boolean'],
|
||||||
'document_number' => ['required', 'string', 'max:255'],
|
'document_number' => ['nullable', 'required_if:to_site_status,outside_site', 'string', 'max:255'],
|
||||||
'document_title' => ['required', 'string', 'max:255'],
|
'document_title' => ['nullable', 'required_if:to_site_status,outside_site', 'string', 'max:255'],
|
||||||
'document_file' => ['nullable', 'file', 'mimes:pdf,jpg,jpeg,png', 'max:5120'],
|
'document_file' => ['nullable', 'file', 'mimes:pdf,jpg,jpeg,png', 'max:5120'],
|
||||||
], [
|
], [
|
||||||
'vehicle_id.required' => 'Pilih unit alat berat yang dipindahkan.',
|
'vehicle_id.required' => 'Pilih unit alat berat yang dipindahkan.',
|
||||||
@@ -202,8 +202,8 @@ class UnitTransferController extends Controller
|
|||||||
'to_location.required' => 'Lokasi tujuan pemindahan wajib diisi.',
|
'to_location.required' => 'Lokasi tujuan pemindahan wajib diisi.',
|
||||||
'to_site_status.required' => 'Pilih area tujuan (Di Dalam atau Di Luar Site).',
|
'to_site_status.required' => 'Pilih area tujuan (Di Dalam atau Di Luar Site).',
|
||||||
'reported_by.required' => 'Nama pelapor / penanggung jawab wajib diisi.',
|
'reported_by.required' => 'Nama pelapor / penanggung jawab wajib diisi.',
|
||||||
'document_number.required' => 'Nomor surat / berita acara wajib diisi.',
|
'document_number.required_if' => 'Nomor surat / berita acara wajib diisi untuk pemindahan ke luar site.',
|
||||||
'document_title.required' => 'Judul surat / perihal berita acara wajib diisi.',
|
'document_title.required_if' => 'Judul surat / perihal berita acara wajib diisi untuk pemindahan ke luar site.',
|
||||||
'document_file.max' => 'Ukuran berkas surat maksimal 5 MB.',
|
'document_file.max' => 'Ukuran berkas surat maksimal 5 MB.',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@@ -245,6 +245,11 @@ class UnitTransferController extends Controller
|
|||||||
$toLocation = trim($validated['to_location']);
|
$toLocation = trim($validated['to_location']);
|
||||||
$reportedBy = trim($validated['reported_by']);
|
$reportedBy = trim($validated['reported_by']);
|
||||||
|
|
||||||
|
$isOutside = $validated['to_site_status'] === 'outside_site';
|
||||||
|
$docNumber = $isOutside && !empty($validated['document_number']) ? trim($validated['document_number']) : null;
|
||||||
|
$docTitle = $isOutside && !empty($validated['document_title']) ? trim($validated['document_title']) : null;
|
||||||
|
$docFilePath = $isOutside ? $filePath : null;
|
||||||
|
|
||||||
// 1. Simpan Data Transfer Unit
|
// 1. Simpan Data Transfer Unit
|
||||||
$transfer = UnitTransfer::create([
|
$transfer = UnitTransfer::create([
|
||||||
'transfer_no' => $transferNo,
|
'transfer_no' => $transferNo,
|
||||||
@@ -262,19 +267,20 @@ class UnitTransferController extends Controller
|
|||||||
'transporter_driver_id' => $validated['transporter_driver_id'] ?? null,
|
'transporter_driver_id' => $validated['transporter_driver_id'] ?? null,
|
||||||
'transporter_driver_name' => $transporterDriverName,
|
'transporter_driver_name' => $transporterDriverName,
|
||||||
'transporter_description' => !empty($validated['transporter_description']) ? trim($validated['transporter_description']) : null,
|
'transporter_description' => !empty($validated['transporter_description']) ? trim($validated['transporter_description']) : null,
|
||||||
'document_number' => trim($validated['document_number']),
|
'document_number' => $docNumber,
|
||||||
'document_title' => trim($validated['document_title']),
|
'document_title' => $docTitle,
|
||||||
'document_file_path' => $filePath,
|
'document_file_path' => $docFilePath,
|
||||||
'status' => 'completed',
|
'status' => 'completed',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// 2. Perbarui posisi master unit alat berat
|
// 2. Perbarui posisi master unit alat berat
|
||||||
|
$docLabel = $docNumber ? "BAST: {$docNumber}" : "Transfer Internal";
|
||||||
$vehicle->update([
|
$vehicle->update([
|
||||||
'location' => $toLocation,
|
'location' => $toLocation,
|
||||||
'site_status' => $validated['to_site_status'],
|
'site_status' => $validated['to_site_status'],
|
||||||
'location_updated_at' => Carbon::now(),
|
'location_updated_at' => Carbon::now(),
|
||||||
'location_updated_by' => $reportedBy,
|
'location_updated_by' => $reportedBy,
|
||||||
'location_note' => "Transfer Unit (BAST: {$validated['document_number']}) ke {$toLocation}",
|
'location_note' => "Transfer Unit ({$docLabel}) ke {$toLocation}",
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// 3. Catat di audit log riwayat pergerakan unit (VehicleLocationHistory)
|
// 3. Catat di audit log riwayat pergerakan unit (VehicleLocationHistory)
|
||||||
@@ -282,7 +288,8 @@ class UnitTransferController extends Controller
|
|||||||
if ($transporterDriverName) {
|
if ($transporterDriverName) {
|
||||||
$transporterSummary .= " (Driver: {$transporterDriverName})";
|
$transporterSummary .= " (Driver: {$transporterDriverName})";
|
||||||
}
|
}
|
||||||
$historyNote = "Transfer BAST {$validated['document_number']}: {$validated['document_title']}.{$transporterSummary}";
|
$docHeader = $docNumber ? "Transfer BAST {$docNumber}: {$docTitle}" : "Transfer Internal Site ke {$toLocation}";
|
||||||
|
$historyNote = "{$docHeader}.{$transporterSummary}";
|
||||||
if (!empty($validated['description'])) {
|
if (!empty($validated['description'])) {
|
||||||
$historyNote .= " | " . trim($validated['description']);
|
$historyNote .= " | " . trim($validated['description']);
|
||||||
}
|
}
|
||||||
@@ -302,19 +309,25 @@ class UnitTransferController extends Controller
|
|||||||
if ($updateTransporter && !empty($validated['transporter_vehicle_id'])) {
|
if ($updateTransporter && !empty($validated['transporter_vehicle_id'])) {
|
||||||
$transporterVeh = Vehicle::find($validated['transporter_vehicle_id']);
|
$transporterVeh = Vehicle::find($validated['transporter_vehicle_id']);
|
||||||
if ($transporterVeh && $transporterVeh->id !== $vehicle->id) {
|
if ($transporterVeh && $transporterVeh->id !== $vehicle->id) {
|
||||||
|
$transporterNote = $docNumber
|
||||||
|
? "Armada Pengangkut BAST {$docNumber} untuk {$vehicle->code} ke {$toLocation}"
|
||||||
|
: "Armada Pengangkut Transfer Internal untuk {$vehicle->code} ke {$toLocation}";
|
||||||
$transporterVeh->update([
|
$transporterVeh->update([
|
||||||
'location' => $toLocation,
|
'location' => $toLocation,
|
||||||
'site_status' => $validated['to_site_status'],
|
'site_status' => $validated['to_site_status'],
|
||||||
'location_updated_at' => Carbon::now(),
|
'location_updated_at' => Carbon::now(),
|
||||||
'location_updated_by' => $reportedBy,
|
'location_updated_by' => $reportedBy,
|
||||||
'location_note' => "Armada Pengangkut BAST {$validated['document_number']} untuk {$vehicle->code} ke {$toLocation}",
|
'location_note' => $transporterNote,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
$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([
|
VehicleLocationHistory::create([
|
||||||
'vehicle_id' => $transporterVeh->id,
|
'vehicle_id' => $transporterVeh->id,
|
||||||
'site_status' => $validated['to_site_status'],
|
'site_status' => $validated['to_site_status'],
|
||||||
'location' => $toLocation,
|
'location' => $toLocation,
|
||||||
'note' => "Armada Pengangkut: Mengantar {$vehicle->code} ({$vehicle->brand_type}) via BAST {$validated['document_number']} ke {$toLocation}",
|
'note' => $transporterHistNote,
|
||||||
'source' => 'transfer',
|
'source' => 'transfer',
|
||||||
'user_id' => auth()->id(),
|
'user_id' => auth()->id(),
|
||||||
'user_name' => $reportedBy,
|
'user_name' => $reportedBy,
|
||||||
@@ -326,8 +339,10 @@ class UnitTransferController extends Controller
|
|||||||
return $transfer;
|
return $transfer;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$msgSuffix = $transfer->document_number ? " Berita Acara {$transfer->document_number} telah diterbitkan." : "";
|
||||||
|
|
||||||
return redirect()->route('qma.unit_transfers.show', $transfer->id)
|
return redirect()->route('qma.unit_transfers.show', $transfer->id)
|
||||||
->with('success', "Pemindahan unit {$transfer->vehicle->code} berhasil diproses. Berita Acara {$transfer->document_number} telah diterbitkan.");
|
->with('success', "Pemindahan unit {$transfer->vehicle->code} berhasil diproses.{$msgSuffix}");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -357,12 +372,12 @@ class UnitTransferController extends Controller
|
|||||||
Storage::disk('public')->delete($transfer->document_file_path);
|
Storage::disk('public')->delete($transfer->document_file_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
$docNo = $transfer->document_number;
|
$docNo = $transfer->document_number ? "dengan Berita Acara {$transfer->document_number}" : "(Transfer Internal)";
|
||||||
$unitCode = $transfer->vehicle?->code ?? 'Unit';
|
$unitCode = $transfer->vehicle?->code ?? 'Unit';
|
||||||
$transfer->delete();
|
$transfer->delete();
|
||||||
|
|
||||||
return redirect()->route('qma.unit_transfers.index')
|
return redirect()->route('qma.unit_transfers.index')
|
||||||
->with('success', "Data transfer unit {$unitCode} dengan Berita Acara {$docNo} berhasil dihapus.");
|
->with('success', "Data transfer unit {$unitCode} {$docNo} berhasil dihapus.");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -407,8 +422,8 @@ class UnitTransferController extends Controller
|
|||||||
$t->to_site_status_label,
|
$t->to_site_status_label,
|
||||||
$t->transporter_unit_name ?: ($t->transporterVehicle?->code ?? '-'),
|
$t->transporter_unit_name ?: ($t->transporterVehicle?->code ?? '-'),
|
||||||
$t->transporter_driver_name ?: ($t->transporterDriver?->name ?? '-'),
|
$t->transporter_driver_name ?: ($t->transporterDriver?->name ?? '-'),
|
||||||
$t->document_number,
|
$t->document_number ?: '-',
|
||||||
$t->document_title,
|
$t->document_title ?: '-',
|
||||||
$t->reported_by,
|
$t->reported_by,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -477,7 +492,7 @@ class UnitTransferController extends Controller
|
|||||||
$rows[] = [
|
$rows[] = [
|
||||||
$idx + 1,
|
$idx + 1,
|
||||||
$t->transfer_date ? $t->transfer_date->format('d/m/Y') : '-',
|
$t->transfer_date ? $t->transfer_date->format('d/m/Y') : '-',
|
||||||
$t->document_number,
|
$t->document_number ?: '-',
|
||||||
$unitDesc,
|
$unitDesc,
|
||||||
$t->from_location,
|
$t->from_location,
|
||||||
$t->to_location,
|
$t->to_location,
|
||||||
|
|||||||
+30
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*/
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('unit_transfers', function (Blueprint $table) {
|
||||||
|
$table->string('document_number', 255)->nullable()->change();
|
||||||
|
$table->string('document_title', 255)->nullable()->change();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*/
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('unit_transfers', function (Blueprint $table) {
|
||||||
|
$table->string('document_number', 255)->nullable(false)->change();
|
||||||
|
$table->string('document_title', 255)->nullable(false)->change();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -210,6 +210,7 @@
|
|||||||
name="to_site_status"
|
name="to_site_status"
|
||||||
value="inside_site"
|
value="inside_site"
|
||||||
id="radio_inside_site"
|
id="radio_inside_site"
|
||||||
|
onchange="onSiteStatusChanged(this.value)"
|
||||||
{{ old('to_site_status', 'inside_site') === 'inside_site' ? 'checked' : '' }}
|
{{ old('to_site_status', 'inside_site') === 'inside_site' ? 'checked' : '' }}
|
||||||
class="text-[#1b5e20] focus:ring-[#1b5e20]">
|
class="text-[#1b5e20] focus:ring-[#1b5e20]">
|
||||||
<div class="text-left">
|
<div class="text-left">
|
||||||
@@ -223,6 +224,7 @@
|
|||||||
name="to_site_status"
|
name="to_site_status"
|
||||||
value="outside_site"
|
value="outside_site"
|
||||||
id="radio_outside_site"
|
id="radio_outside_site"
|
||||||
|
onchange="onSiteStatusChanged(this.value)"
|
||||||
{{ old('to_site_status') === 'outside_site' ? 'checked' : '' }}
|
{{ old('to_site_status') === 'outside_site' ? 'checked' : '' }}
|
||||||
class="text-amber-600 focus:ring-amber-500">
|
class="text-amber-600 focus:ring-amber-500">
|
||||||
<div class="text-left">
|
<div class="text-left">
|
||||||
@@ -392,15 +394,16 @@
|
|||||||
|
|
||||||
<!-- ============================================================= -->
|
<!-- ============================================================= -->
|
||||||
<!-- BAGIAN 3: BERITA ACARA SERAH TERIMA (BAST) -->
|
<!-- BAGIAN 3: BERITA ACARA SERAH TERIMA (BAST) -->
|
||||||
|
<!-- Hanya muncul untuk Pemindahan ke Luar Site (outside_site) -->
|
||||||
<!-- ============================================================= -->
|
<!-- ============================================================= -->
|
||||||
<div class="bg-white rounded-2xl border border-slate-200/80 shadow-xs p-5 sm:p-6 space-y-5">
|
<div id="bastSectionCard" class="bg-white rounded-2xl border border-slate-200/80 shadow-xs p-5 sm:p-6 space-y-5 transition-all">
|
||||||
<div class="flex items-center space-x-3 pb-3 border-b border-slate-100">
|
<div class="flex items-center space-x-3 pb-3 border-b border-slate-100">
|
||||||
<div class="w-9 h-9 rounded-xl bg-amber-50 text-amber-700 flex items-center justify-center font-bold text-base shrink-0">
|
<div class="w-9 h-9 rounded-xl bg-amber-50 text-amber-700 flex items-center justify-center font-bold text-base shrink-0">
|
||||||
<i class="fa-solid fa-file-contract"></i>
|
<i class="fa-solid fa-file-contract"></i>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<h3 class="text-base font-extrabold text-slate-900">3. Berita Acara Serah Terima (BAST)</h3>
|
<h3 class="text-base font-extrabold text-slate-900">3. Berita Acara Serah Terima (BAST)</h3>
|
||||||
<p class="text-xs text-slate-500">Nomor surat, perihal, dan berkas lampiran berita acara resmi pemindahan alat berat.</p>
|
<p class="text-xs text-slate-500">Nomor surat, perihal, dan berkas lampiran berita acara resmi pemindahan alat berat ke luar site.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -417,7 +420,6 @@
|
|||||||
name="document_number"
|
name="document_number"
|
||||||
id="document_number"
|
id="document_number"
|
||||||
value="{{ old('document_number', $defaultDocNumber) }}"
|
value="{{ old('document_number', $defaultDocNumber) }}"
|
||||||
required
|
|
||||||
placeholder="Contoh: 014/BAST-AB/QMA-KMH/X/2026"
|
placeholder="Contoh: 014/BAST-AB/QMA-KMH/X/2026"
|
||||||
class="w-full pl-9 pr-3.5 py-2.5 text-xs rounded-xl border border-slate-200 focus:outline-none focus:ring-2 focus:ring-[#1b5e20]/20 focus:border-[#1b5e20] transition bg-white text-slate-800 font-mono font-bold">
|
class="w-full pl-9 pr-3.5 py-2.5 text-xs rounded-xl border border-slate-200 focus:outline-none focus:ring-2 focus:ring-[#1b5e20]/20 focus:border-[#1b5e20] transition bg-white text-slate-800 font-mono font-bold">
|
||||||
</div>
|
</div>
|
||||||
@@ -437,8 +439,7 @@
|
|||||||
name="document_title"
|
name="document_title"
|
||||||
id="document_title"
|
id="document_title"
|
||||||
value="{{ old('document_title', 'Berita Acara Pemindahan & Relokasi Unit Alat Berat') }}"
|
value="{{ old('document_title', 'Berita Acara Pemindahan & Relokasi Unit Alat Berat') }}"
|
||||||
required
|
placeholder="Contoh: Berita Acara Pemindahan Excavator ke Workshop Luar"
|
||||||
placeholder="Contoh: Berita Acara Pemindahan Excavator ke Area Adit 2"
|
|
||||||
class="w-full pl-9 pr-3.5 py-2.5 text-xs rounded-xl border border-slate-200 focus:outline-none focus:ring-2 focus:ring-[#1b5e20]/20 focus:border-[#1b5e20] transition bg-white text-slate-800 font-semibold">
|
class="w-full pl-9 pr-3.5 py-2.5 text-xs rounded-xl border border-slate-200 focus:outline-none focus:ring-2 focus:ring-[#1b5e20]/20 focus:border-[#1b5e20] transition bg-white text-slate-800 font-semibold">
|
||||||
</div>
|
</div>
|
||||||
@error('document_title')
|
@error('document_title')
|
||||||
@@ -471,9 +472,10 @@
|
|||||||
Batal
|
Batal
|
||||||
</a>
|
</a>
|
||||||
<button type="submit"
|
<button type="submit"
|
||||||
|
id="submitBtn"
|
||||||
class="px-6 py-2.5 text-xs font-bold text-white bg-[#1b5e20] hover:bg-[#144919] rounded-xl transition shadow-sm cursor-pointer inline-flex items-center space-x-2">
|
class="px-6 py-2.5 text-xs font-bold text-white bg-[#1b5e20] hover:bg-[#144919] rounded-xl transition shadow-sm cursor-pointer inline-flex items-center space-x-2">
|
||||||
<i class="fa-solid fa-check"></i>
|
<i class="fa-solid fa-check"></i>
|
||||||
<span>Simpan & Terbitkan BAST</span>
|
<span id="submitBtnText">Simpan Pemindahan Unit</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@@ -507,8 +509,62 @@
|
|||||||
if (originSelect && originSelect.value) {
|
if (originSelect && originSelect.value) {
|
||||||
onOriginLocationChanged(originSelect.value, "{{ old('vehicle_id', $selectedVehicleId ?? '') }}");
|
onOriginLocationChanged(originSelect.value, "{{ old('vehicle_id', $selectedVehicleId ?? '') }}");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Inisialisasi tampilan BAST berdasarkan status site awal
|
||||||
|
const currentSiteStatus = document.querySelector('input[name="to_site_status"]:checked')?.value || 'inside_site';
|
||||||
|
onSiteStatusChanged(currentSiteStatus);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handler untuk Area Tujuan (Di Dalam Site vs Di Luar Site)
|
||||||
|
* Nomor BAST dan Dokumen hanya muncul saat transfer ke LUAR site.
|
||||||
|
*/
|
||||||
|
function onSiteStatusChanged(status) {
|
||||||
|
const bastSection = document.getElementById('bastSectionCard');
|
||||||
|
const docNumberInput = document.getElementById('document_number');
|
||||||
|
const docTitleInput = document.getElementById('document_title');
|
||||||
|
const docFileInput = document.getElementById('document_file');
|
||||||
|
const submitBtnText = document.getElementById('submitBtnText');
|
||||||
|
|
||||||
|
if (status === 'outside_site') {
|
||||||
|
if (bastSection) {
|
||||||
|
bastSection.classList.remove('hidden');
|
||||||
|
}
|
||||||
|
if (docNumberInput) {
|
||||||
|
docNumberInput.removeAttribute('disabled');
|
||||||
|
docNumberInput.setAttribute('required', 'required');
|
||||||
|
}
|
||||||
|
if (docTitleInput) {
|
||||||
|
docTitleInput.removeAttribute('disabled');
|
||||||
|
docTitleInput.setAttribute('required', 'required');
|
||||||
|
}
|
||||||
|
if (docFileInput) {
|
||||||
|
docFileInput.removeAttribute('disabled');
|
||||||
|
}
|
||||||
|
if (submitBtnText) {
|
||||||
|
submitBtnText.textContent = 'Simpan & Terbitkan BAST';
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (bastSection) {
|
||||||
|
bastSection.classList.add('hidden');
|
||||||
|
}
|
||||||
|
if (docNumberInput) {
|
||||||
|
docNumberInput.removeAttribute('required');
|
||||||
|
docNumberInput.setAttribute('disabled', 'disabled');
|
||||||
|
}
|
||||||
|
if (docTitleInput) {
|
||||||
|
docTitleInput.removeAttribute('required');
|
||||||
|
docTitleInput.setAttribute('disabled', 'disabled');
|
||||||
|
}
|
||||||
|
if (docFileInput) {
|
||||||
|
docFileInput.setAttribute('disabled', 'disabled');
|
||||||
|
}
|
||||||
|
if (submitBtnText) {
|
||||||
|
submitBtnText.textContent = 'Simpan Pemindahan Unit';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handler ketika Lokasi Awal (Asal) berubah
|
* Handler ketika Lokasi Awal (Asal) berubah
|
||||||
* Memfilter unit alat berat yang posisinya berada di lokasi tersebut
|
* Memfilter unit alat berat yang posisinya berada di lokasi tersebut
|
||||||
|
|||||||
@@ -210,7 +210,8 @@
|
|||||||
|
|
||||||
<!-- 3. Berita Acara -->
|
<!-- 3. Berita Acara -->
|
||||||
<td class="py-3.5 px-3.5 min-w-[200px]">
|
<td class="py-3.5 px-3.5 min-w-[200px]">
|
||||||
<div class="font-bold text-slate-900 leading-tight">
|
@if($t->document_number)
|
||||||
|
<div class="font-bold text-slate-900 leading-tight font-mono text-xs">
|
||||||
{{ $t->document_number }}
|
{{ $t->document_number }}
|
||||||
</div>
|
</div>
|
||||||
<div class="text-[11px] text-slate-500 mt-0.5 line-clamp-1" title="{{ $t->document_title }}">
|
<div class="text-[11px] text-slate-500 mt-0.5 line-clamp-1" title="{{ $t->document_title }}">
|
||||||
@@ -222,6 +223,11 @@
|
|||||||
<span>Lihat Lampiran</span>
|
<span>Lihat Lampiran</span>
|
||||||
</a>
|
</a>
|
||||||
@endif
|
@endif
|
||||||
|
@else
|
||||||
|
<span class="inline-flex items-center space-x-1 px-2 py-0.5 rounded text-[11px] font-medium text-slate-500 bg-slate-100 border border-slate-200">
|
||||||
|
<span>Tanpa BAST (Internal Site)</span>
|
||||||
|
</span>
|
||||||
|
@endif
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<!-- 4. Unit Alat Berat -->
|
<!-- 4. Unit Alat Berat -->
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
@extends('layouts.app')
|
@extends('layouts.app')
|
||||||
|
|
||||||
@section('title', 'Berita Acara Transfer Unit - ' . $transfer->document_number . ' | PT Kerinci Merangin Hidro')
|
@section('title', ($transfer->document_number ? 'Berita Acara Transfer Unit - ' . $transfer->document_number : 'Detail Transfer Unit - ' . $transfer->transfer_no) . ' | PT Kerinci Merangin Hidro')
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
<div class="w-full max-w-4xl mx-auto space-y-6 pb-16">
|
<div class="w-full max-w-4xl mx-auto space-y-6 pb-16">
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
onclick="window.print()"
|
onclick="window.print()"
|
||||||
class="px-4 py-2 rounded-xl bg-slate-900 hover:bg-slate-800 text-white text-xs font-bold transition shadow-sm inline-flex items-center space-x-1.5 cursor-pointer">
|
class="px-4 py-2 rounded-xl bg-slate-900 hover:bg-slate-800 text-white text-xs font-bold transition shadow-sm inline-flex items-center space-x-1.5 cursor-pointer">
|
||||||
<i class="fa-solid fa-print"></i>
|
<i class="fa-solid fa-print"></i>
|
||||||
<span>Cetak BAST</span>
|
<span>{{ $transfer->document_number ? 'Cetak BAST' : 'Cetak Bukti Transfer' }}</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<!-- Tombol Buat Baru -->
|
<!-- Tombol Buat Baru -->
|
||||||
@@ -95,14 +95,22 @@
|
|||||||
<!-- JUDUL & NOMOR BERITA ACARA -->
|
<!-- JUDUL & NOMOR BERITA ACARA -->
|
||||||
<div class="text-center space-y-1.5">
|
<div class="text-center space-y-1.5">
|
||||||
<h2 class="text-lg sm:text-xl font-black text-slate-900 uppercase tracking-wide">
|
<h2 class="text-lg sm:text-xl font-black text-slate-900 uppercase tracking-wide">
|
||||||
BERITA ACARA SERAH TERIMA & PEMINDAHAN ALAT BERAT
|
{{ $transfer->document_title ?: 'BUKTI PEMINDAHAN INTERNAL ALAT BERAT' }}
|
||||||
</h2>
|
</h2>
|
||||||
|
@if($transfer->document_number)
|
||||||
<p class="font-mono text-xs sm:text-sm font-bold text-slate-700">
|
<p class="font-mono text-xs sm:text-sm font-bold text-slate-700">
|
||||||
Nomor: {{ $transfer->document_number }}
|
Nomor: {{ $transfer->document_number }}
|
||||||
</p>
|
</p>
|
||||||
|
@else
|
||||||
|
<p class="font-mono text-xs sm:text-sm font-bold text-emerald-800 bg-emerald-50 inline-block px-3 py-1 rounded-md border border-emerald-200">
|
||||||
|
Pemindahan Di Dalam Site (Tanpa BAST)
|
||||||
|
</p>
|
||||||
|
@endif
|
||||||
|
@if($transfer->document_title)
|
||||||
<div class="inline-block mt-1 px-3 py-0.5 rounded-full text-xs font-semibold bg-emerald-50 text-emerald-800 border border-emerald-200">
|
<div class="inline-block mt-1 px-3 py-0.5 rounded-full text-xs font-semibold bg-emerald-50 text-emerald-800 border border-emerald-200">
|
||||||
Perihal: {{ $transfer->document_title }}
|
Perihal: {{ $transfer->document_title }}
|
||||||
</div>
|
</div>
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- PARAGRAF PEMBUKA -->
|
<!-- PARAGRAF PEMBUKA -->
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ class QmaUnitTransferTest extends TestCase
|
|||||||
'vehicle_id' => $this->heavyEquipment->id,
|
'vehicle_id' => $this->heavyEquipment->id,
|
||||||
'transfer_date' => Carbon::now()->format('Y-m-d'),
|
'transfer_date' => Carbon::now()->format('Y-m-d'),
|
||||||
'to_location' => 'Adit 2 Intake',
|
'to_location' => 'Adit 2 Intake',
|
||||||
'to_site_status' => 'inside_site',
|
'to_site_status' => 'outside_site',
|
||||||
'description' => 'Relokasi untuk pengerjaan galian terowongan adit 2.',
|
'description' => 'Relokasi untuk pengerjaan galian terowongan adit 2.',
|
||||||
'reported_by' => 'Budi Santoso QMA',
|
'reported_by' => 'Budi Santoso QMA',
|
||||||
'transporter_vehicle_id' => $this->transporterTruck->id,
|
'transporter_vehicle_id' => $this->transporterTruck->id,
|
||||||
@@ -171,7 +171,7 @@ class QmaUnitTransferTest extends TestCase
|
|||||||
$this->assertEquals($this->heavyEquipment->id, $transfer->vehicle_id);
|
$this->assertEquals($this->heavyEquipment->id, $transfer->vehicle_id);
|
||||||
$this->assertEquals('Main Dam', $transfer->from_location);
|
$this->assertEquals('Main Dam', $transfer->from_location);
|
||||||
$this->assertEquals('Adit 2 Intake', $transfer->to_location);
|
$this->assertEquals('Adit 2 Intake', $transfer->to_location);
|
||||||
$this->assertEquals('inside_site', $transfer->to_site_status);
|
$this->assertEquals('outside_site', $transfer->to_site_status);
|
||||||
$this->assertEquals($this->driver->name, $transfer->transporter_driver_name);
|
$this->assertEquals($this->driver->name, $transfer->transporter_driver_name);
|
||||||
$this->assertNotNull($transfer->document_file_path);
|
$this->assertNotNull($transfer->document_file_path);
|
||||||
Storage::disk('public')->assertExists($transfer->document_file_path);
|
Storage::disk('public')->assertExists($transfer->document_file_path);
|
||||||
@@ -179,7 +179,7 @@ class QmaUnitTransferTest extends TestCase
|
|||||||
// Pastikan posisi master unit alat berat terupdate otomatis
|
// Pastikan posisi master unit alat berat terupdate otomatis
|
||||||
$freshVehicle = $this->heavyEquipment->fresh();
|
$freshVehicle = $this->heavyEquipment->fresh();
|
||||||
$this->assertEquals('Adit 2 Intake', $freshVehicle->location);
|
$this->assertEquals('Adit 2 Intake', $freshVehicle->location);
|
||||||
$this->assertEquals('inside_site', $freshVehicle->site_status);
|
$this->assertEquals('outside_site', $freshVehicle->site_status);
|
||||||
$this->assertEquals('Budi Santoso QMA', $freshVehicle->location_updated_by);
|
$this->assertEquals('Budi Santoso QMA', $freshVehicle->location_updated_by);
|
||||||
|
|
||||||
// Pastikan riwayat audit trail (VehicleLocationHistory) tercatat
|
// Pastikan riwayat audit trail (VehicleLocationHistory) tercatat
|
||||||
@@ -194,23 +194,58 @@ class QmaUnitTransferTest extends TestCase
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Validasi gagal jika field wajib tidak diisi.
|
* Validasi gagal jika field wajib tidak diisi untuk transfer luar site.
|
||||||
*/
|
*/
|
||||||
public function test_validation_errors_when_required_fields_missing(): void
|
public function test_validation_errors_when_required_fields_missing(): void
|
||||||
{
|
{
|
||||||
$response = $this->actingAs($this->qmaAdmin)->post(route('qma.unit_transfers.store'), []);
|
$response = $this->actingAs($this->qmaAdmin)->post(route('qma.unit_transfers.store'), [
|
||||||
|
'to_site_status' => 'outside_site',
|
||||||
|
]);
|
||||||
|
|
||||||
$response->assertSessionHasErrors([
|
$response->assertSessionHasErrors([
|
||||||
'vehicle_id',
|
'vehicle_id',
|
||||||
'transfer_date',
|
'transfer_date',
|
||||||
'to_location',
|
'to_location',
|
||||||
'to_site_status',
|
|
||||||
'reported_by',
|
'reported_by',
|
||||||
'document_number',
|
'document_number',
|
||||||
'document_title',
|
'document_title',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transfer unit di dalam site berhasil tanpa memerlukan nomor berita acara (BAST).
|
||||||
|
*/
|
||||||
|
public function test_qma_admin_can_transfer_inside_site_without_document_number(): void
|
||||||
|
{
|
||||||
|
$payload = [
|
||||||
|
'vehicle_id' => $this->heavyEquipment->id,
|
||||||
|
'from_location' => 'Main Dam',
|
||||||
|
'transfer_date' => Carbon::now()->format('Y-m-d'),
|
||||||
|
'to_location' => 'Adit 1 Intake',
|
||||||
|
'to_site_status' => 'inside_site',
|
||||||
|
'description' => 'Relokasi internal site tanpa surat BAST.',
|
||||||
|
'reported_by' => 'Budi Santoso QMA',
|
||||||
|
];
|
||||||
|
|
||||||
|
$response = $this->actingAs($this->qmaAdmin)->post(route('qma.unit_transfers.store'), $payload);
|
||||||
|
|
||||||
|
$transfer = UnitTransfer::where('vehicle_id', $this->heavyEquipment->id)
|
||||||
|
->where('to_location', 'Adit 1 Intake')
|
||||||
|
->first();
|
||||||
|
|
||||||
|
$this->assertNotNull($transfer);
|
||||||
|
$this->assertNull($transfer->document_number);
|
||||||
|
$this->assertNull($transfer->document_title);
|
||||||
|
$this->assertNull($transfer->document_file_path);
|
||||||
|
$this->assertEquals('inside_site', $transfer->to_site_status);
|
||||||
|
|
||||||
|
$response->assertRedirect(route('qma.unit_transfers.show', $transfer->id));
|
||||||
|
$response->assertSessionHas('success');
|
||||||
|
|
||||||
|
// Pastikan posisi master unit terupdate
|
||||||
|
$this->assertEquals('Adit 1 Intake', $this->heavyEquipment->fresh()->location);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Admin QMA dapat melihat halaman detail Berita Acara Serah Terima (BAST).
|
* Admin QMA dapat melihat halaman detail Berita Acara Serah Terima (BAST).
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user