feat(lampiran-dokumen): tambahkan jenis lampiran pada upload dokumen
- Menambahkan validasi untuk 'jenis_lampiran_id' pada metode upload. - Memperbarui atribut yang dapat diisi pada model LampiranDokumen. - Menambahkan relasi jenisLampiran pada model LampiranDokumen. - Membuat migrasi untuk menambahkan kolom 'jenis_lampiran_id' pada tabel lampiran_dokumen. - Menghapus bagian tampilan yang tidak diperlukan dan menggantinya dengan komponen yang ada.
This commit is contained in:
@@ -19,6 +19,7 @@
|
|||||||
{
|
{
|
||||||
$request->validate([
|
$request->validate([
|
||||||
'permohonan_id' => 'required|exists:permohonan,id',
|
'permohonan_id' => 'required|exists:permohonan,id',
|
||||||
|
'jenis_lampiran_id' => 'required|exists:jenis_lampiran,id',
|
||||||
'nama_file' => 'nullable|string|max:255',
|
'nama_file' => 'nullable|string|max:255',
|
||||||
'file' => 'required|file|max:10240',
|
'file' => 'required|file|max:10240',
|
||||||
'keterangan' => 'nullable|string|max:255',
|
'keterangan' => 'nullable|string|max:255',
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ class LampiranDokumen extends Base
|
|||||||
{
|
{
|
||||||
protected $table = 'lampiran_dokumen';
|
protected $table = 'lampiran_dokumen';
|
||||||
|
|
||||||
protected $fillable = ['permohonan_id', 'nama_file', 'path_file', 'keterangan'];
|
protected $fillable = ['permohonan_id', 'nama_file', 'path_file', 'keterangan','jenis_lampiran_id'];
|
||||||
|
|
||||||
public function permohonan()
|
public function permohonan()
|
||||||
{
|
{
|
||||||
@@ -34,6 +34,7 @@ class LampiranDokumen extends Base
|
|||||||
|
|
||||||
return self::create([
|
return self::create([
|
||||||
'permohonan_id' => $fileData['permohonan_id'] ?? null,
|
'permohonan_id' => $fileData['permohonan_id'] ?? null,
|
||||||
|
'jenis_lampiran_id' => $fileData['jenis_lampiran_id'] ?? null,
|
||||||
'nama_file' => $fileName,
|
'nama_file' => $fileName,
|
||||||
'path_file' => $filePath,
|
'path_file' => $filePath,
|
||||||
'keterangan' => $fileData['keterangan'] ?? null,
|
'keterangan' => $fileData['keterangan'] ?? null,
|
||||||
@@ -62,4 +63,9 @@ class LampiranDokumen extends Base
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function jenisLampiran()
|
||||||
|
{
|
||||||
|
return $this->belongsTo(JenisLampiran::class);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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('lampiran_dokumen', function (Blueprint $table) {
|
||||||
|
$table->unsignedBigInteger('jenis_lampiran_id')->after('permohonan_id');
|
||||||
|
$table->foreign('jenis_lampiran_id')->references('id')->on('jenis_lampiran')->onDelete('restrict');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*/
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('lampiran_dokumen', function (Blueprint $table) {
|
||||||
|
$table->dropForeign(['jenis_lampiran_id']);
|
||||||
|
$table->dropColumn('jenis_lampiran_id');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -93,71 +93,7 @@
|
|||||||
@endforeach
|
@endforeach
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<!-- New section for Lampiran Dokumen -->
|
@include('lpj::component.lampiran-dokumen')
|
||||||
<div class="card border border-agi-100 min-w-full mt-5">
|
|
||||||
<div class="card-header light:bg-agi-50">
|
|
||||||
<h3 class="card-title">
|
|
||||||
Lampiran Dokumen
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
|
||||||
@forelse($permohonan->lampiranDokumen as $lampiran)
|
|
||||||
<div class="border p-4 rounded-lg">
|
|
||||||
<h4 class="font-semibold mb-2">{{ $lampiran->nama_file }}</h4>
|
|
||||||
<p class="text-sm text-gray-600 mb-2">Keterangan : {{ $lampiran->keterangan }}</p>
|
|
||||||
<div class="flex justify-between items-center">
|
|
||||||
<div>
|
|
||||||
<a href="{{ Storage::url($lampiran->path_file) }}" target="_blank" class="text-blue-600 hover:underline">
|
|
||||||
<i class="ki-filled ki-eye mr-2"></i>View
|
|
||||||
</a>
|
|
||||||
<a href="{{ Storage::url($lampiran->path_file) }}" download="{{ Storage::url($lampiran->path_file) }}" class="text-green-600 hover:underline ml-4">
|
|
||||||
<i class="ki-filled ki-cloud-download mr-2"></i>Download
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
@if(Auth::user()->hasRole('administrator'))
|
|
||||||
<form action="{{ route('lampiran.delete', $lampiran->id) }}" method="POST" onsubmit="return confirm('Are you sure you want to delete this lampiran?');">
|
|
||||||
@csrf
|
|
||||||
@method('DELETE')
|
|
||||||
<button type="submit" class="text-red-600 hover:underline">
|
|
||||||
<i class="ki-filled ki-trash mr-2"></i>Delete
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@empty
|
|
||||||
<p class="col-span-3 text-center text-gray-500">Tidak ada lampiran dokumen.</p>
|
|
||||||
@endforelse
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin']))
|
|
||||||
<form action="{{ route('lampiran.upload',) }}" method="POST" enctype="multipart/form-data" class="mt-6">
|
|
||||||
@csrf
|
|
||||||
<input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
|
|
||||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
|
||||||
<div>
|
|
||||||
<label for="nama_file" class="block text-sm font-medium text-gray-700">Nama File</label>
|
|
||||||
<input type="text" name="nama_file" id="nama_file" required class="input mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label for="file" class=" block text-sm font-medium text-gray-700">File</label>
|
|
||||||
<input type="file" name="file" id="file" required class="file-input mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
|
|
||||||
</div>
|
|
||||||
<div class="md:col-span-2">
|
|
||||||
<label for="keterangan" class="block text-sm font-medium text-gray-700">Keterangan</label>
|
|
||||||
<textarea name="keterangan" id="keterangan" rows="3" class="textarea mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md"></textarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="mt-4">
|
|
||||||
<button type="submit" class="inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
|
|
||||||
Upload Lampiran
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="card border border-agi-100 grow" id="activity_2024">
|
<div class="card border border-agi-100 grow" id="activity_2024">
|
||||||
@include('lpj::component.history-permohonan')
|
@include('lpj::component.history-permohonan')
|
||||||
|
|||||||
@@ -352,72 +352,7 @@
|
|||||||
@if (!isset($status))
|
@if (!isset($status))
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- New section for Lampiran Dokumen -->
|
@include('lpj::component.lampiran-dokumen')
|
||||||
<div class="card border border-agi-100 min-w-full mt-5">
|
|
||||||
<div class="card-header light:bg-agi-50">
|
|
||||||
<h3 class="card-title">
|
|
||||||
Lampiran Dokumen
|
|
||||||
</h3>
|
|
||||||
</div>
|
|
||||||
<div class="card-body">
|
|
||||||
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
|
||||||
@forelse($permohonan->lampiranDokumen as $lampiran)
|
|
||||||
<div class="border p-4 rounded-lg">
|
|
||||||
<h4 class="font-semibold mb-2">{{ $lampiran->nama_file }}</h4>
|
|
||||||
<p class="text-sm text-gray-600 mb-2">Keterangan : {{ $lampiran->keterangan }}</p>
|
|
||||||
<div class="flex justify-between items-center">
|
|
||||||
<div>
|
|
||||||
<a href="{{ Storage::url($lampiran->path_file) }}" target="_blank" class="text-blue-600 hover:underline">
|
|
||||||
<i class="ki-filled ki-eye mr-2"></i>View
|
|
||||||
</a>
|
|
||||||
<a href="{{ Storage::url($lampiran->path_file) }}" download="{{ Storage::url($lampiran->path_file) }}" class="text-green-600 hover:underline ml-4">
|
|
||||||
<i class="ki-filled ki-cloud-download mr-2"></i>Download
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
@if(Auth::user()->hasRole('administrator'))
|
|
||||||
<form action="{{ route('lampiran.delete', $lampiran->id) }}" method="POST" onsubmit="return confirm('Are you sure you want to delete this lampiran?');">
|
|
||||||
@csrf
|
|
||||||
@method('DELETE')
|
|
||||||
<button type="submit" class="text-red-600 hover:underline">
|
|
||||||
<i class="ki-filled ki-trash mr-2"></i>Delete
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@empty
|
|
||||||
<p class="col-span-3 text-center text-gray-500">Tidak ada lampiran dokumen.</p>
|
|
||||||
@endforelse
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin','surveyor']))
|
|
||||||
<form action="{{ route('lampiran.upload',) }}" method="POST" enctype="multipart/form-data" class="mt-6">
|
|
||||||
@csrf
|
|
||||||
<input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
|
|
||||||
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
|
||||||
<div>
|
|
||||||
<label for="nama_file" class="block text-sm font-medium text-gray-700">Nama File</label>
|
|
||||||
<input type="text" name="nama_file" id="nama_file" required class="input mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label for="file" class=" block text-sm font-medium text-gray-700">File</label>
|
|
||||||
<input type="file" name="file" id="file" required class="file-input mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
|
|
||||||
</div>
|
|
||||||
<div class="md:col-span-2">
|
|
||||||
<label for="keterangan" class="block text-sm font-medium text-gray-700">Keterangan</label>
|
|
||||||
<textarea name="keterangan" id="keterangan" rows="3" class="textarea mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md"></textarea>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="mt-4">
|
|
||||||
<button type="submit" class="inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
|
|
||||||
Upload Lampiran
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
@endif
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@include('lpj::component.history-permohonan')
|
@include('lpj::component.history-permohonan')
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
75
resources/views/component/lampiran-dokumen.blade.php
Normal file
75
resources/views/component/lampiran-dokumen.blade.php
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
<!-- New section for Lampiran Dokumen -->
|
||||||
|
<div class="card border border-agi-100 min-w-full mt-5">
|
||||||
|
<div class="card-header light:bg-agi-50">
|
||||||
|
<h3 class="card-title">
|
||||||
|
Lampiran Dokumen
|
||||||
|
</h3>
|
||||||
|
</div>
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
||||||
|
@forelse($permohonan->lampiranDokumen as $lampiran)
|
||||||
|
<div class="border p-4 rounded-lg">
|
||||||
|
<h4 class="font-semibold mb-2">{{ $lampiran->nama_file }}</h4>
|
||||||
|
<p class="text-sm text-gray-600 mb-2">Keterangan : {{ $lampiran->keterangan }}</p>
|
||||||
|
<p class="text-sm text-gray-600 mb-2 capitalize">Jenis Lampiran : {{ str_replace('-',' ',$lampiran->jenisLampiran->nama) }}</p>
|
||||||
|
<div class="flex justify-between items-center">
|
||||||
|
<div>
|
||||||
|
<a href="{{ Storage::url($lampiran->path_file) }}" target="_blank" class="text-blue-600 hover:underline">
|
||||||
|
<i class="ki-filled ki-eye mr-2"></i>View
|
||||||
|
</a>
|
||||||
|
<a href="{{ Storage::url($lampiran->path_file) }}" download="{{ Storage::url($lampiran->path_file) }}" class="text-green-600 hover:underline ml-4">
|
||||||
|
<i class="ki-filled ki-cloud-download mr-2"></i>Download
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
@if(Auth::user()->hasRole('administrator'))
|
||||||
|
<form action="{{ route('lampiran.delete', $lampiran->id) }}" method="POST" onsubmit="return confirm('Are you sure you want to delete this lampiran?');">
|
||||||
|
@csrf
|
||||||
|
@method('DELETE')
|
||||||
|
<button type="submit" class="text-red-600 hover:underline">
|
||||||
|
<i class="ki-filled ki-trash mr-2"></i>Delete
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@empty
|
||||||
|
<p class="col-span-3 text-center text-gray-500">Tidak ada lampiran dokumen.</p>
|
||||||
|
@endforelse
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin','surveyor']))
|
||||||
|
<form action="{{ route('lampiran.upload') }}" method="POST" enctype="multipart/form-data" class="mt-6">
|
||||||
|
@csrf
|
||||||
|
<input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">
|
||||||
|
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||||
|
<div>
|
||||||
|
<label for="nama_file" class="block text-sm font-medium text-gray-700">Nama File</label>
|
||||||
|
<input type="text" name="nama_file" id="nama_file" required class="input mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label for="file" class="block text-sm font-medium text-gray-700">File</label>
|
||||||
|
<input type="file" name="file" id="file" required class="file-input mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md">
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label for="jenis_lampiran_id" class="block text-sm font-medium text-gray-700">Jenis Lampiran</label>
|
||||||
|
<select name="jenis_lampiran_id" id="jenis_lampiran_id" required class="tomselect mt-1 block w-full py-2 px-3 border border-gray-300 bg-white rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm">
|
||||||
|
<option value="">Pilih Jenis Lampiran</option>
|
||||||
|
@foreach(\Modules\Lpj\Models\JenisLampiran::all() as $jenisLampiran)
|
||||||
|
<option value="{{ $jenisLampiran->id }}">{{ $jenisLampiran->nama }}</option>
|
||||||
|
@endforeach
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div class="md:col-span-2">
|
||||||
|
<label for="keterangan" class="block text-sm font-medium text-gray-700">Keterangan</label>
|
||||||
|
<textarea name="keterangan" id="keterangan" rows="3" class="textarea mt-1 focus:ring-indigo-500 focus:border-indigo-500 block w-full shadow-sm sm:text-sm border-gray-300 rounded-md"></textarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="mt-4">
|
||||||
|
<button type="submit" class="inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
|
||||||
|
Upload Lampiran
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
Reference in New Issue
Block a user