diff --git a/app/Exports/JenisLampiranExport.php b/app/Exports/JenisLampiranExport.php new file mode 100644 index 0000000..5873a6e --- /dev/null +++ b/app/Exports/JenisLampiranExport.php @@ -0,0 +1,46 @@ +id, + $row->nama, + $row->deskripsi, + $row->created_at + ]; + } + + public function headings(): array + { + return [ + 'ID', + 'Nama', + 'Deskripsi', + 'Created At' + ]; + } + + public function columnFormats(): array + { + return [ + 'A' => NumberFormat::FORMAT_NUMBER, + 'D' => NumberFormat::FORMAT_DATE_DATETIME + ]; + } +} diff --git a/app/Http/Controllers/JenisLampiranController.php b/app/Http/Controllers/JenisLampiranController.php new file mode 100644 index 0000000..6588dd7 --- /dev/null +++ b/app/Http/Controllers/JenisLampiranController.php @@ -0,0 +1,172 @@ +validated(); + $validated['created_by'] = Auth::id(); + + $jenisLampiran = JenisLampiran::create($validated); + + DB::commit(); + return redirect() + ->route('basicdata.jenis-lampiran.index') + ->with('success', 'Jenis Lampiran berhasil ditambahkan.'); + } catch (Exception $e) { + DB::rollBack(); + return redirect() + ->back() + ->with('error', 'Gagal menambahkan Jenis Lampiran: ' . $e->getMessage()) + ->withInput(); + } + } + + public function create() + { + return view('lpj::jenis_lampiran.create'); + } + + public function show($id) + { + $jenisLampiran = JenisLampiran::findOrFail($id); + return view('lpj::jenis_lampiran.show', compact('jenisLampiran')); + } + + public function edit($id) + { + $jenisLampiran = JenisLampiran::findOrFail($id); + return view('lpj::jenis_lampiran.create', compact('jenisLampiran')); + } + + public function update(JenisLampiranRequest $request, $id) + { + DB::beginTransaction(); + try { + $jenisLampiran = JenisLampiran::findOrFail($id); + $validated = $request->validated(); + $validated['updated_by'] = Auth::id(); + + $jenisLampiran->update($validated); + + DB::commit(); + return redirect() + ->route('basicdata.jenis-lampiran.index') + ->with('success', 'Jenis Lampiran berhasil diperbarui.'); + } catch (Exception $e) { + DB::rollBack(); + return redirect() + ->back() + ->with('error', 'Gagal memperbarui Jenis Lampiran: ' . $e->getMessage()) + ->withInput(); + } + } + + public function destroy($id) + { + DB::beginTransaction(); + try { + $jenisLampiran = JenisLampiran::findOrFail($id); + $jenisLampiran->deleted_by = Auth::id(); + $jenisLampiran->save(); + + $jenisLampiran->delete(); + + DB::commit(); + echo json_encode(['success' => true, 'message' => 'Jenis Lampiran berhasil dihapus.']); + + } catch (Exception $e) { + DB::rollBack(); + echo json_encode([ + 'success' => false, + 'message' => 'Gagal menghapus Jenis Lampiran: ' . $e->getMessage() + ]); + } + } + + public function dataForDatatables(Request $request) + { + // Retrieve data from the database + $query = JenisLampiran::query(); + + // Apply search filter if provided + if ($request->has('search') && !empty($request->get('search'))) { + $search = $request->get('search'); + $query->where(function ($q) use ($search) { + $q->where('nama', 'LIKE', "%$search%") + ->orWhere('deskripsi', 'LIKE', "%$search%"); + }); + } + + // Apply sorting if provided + if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) { + $order = $request->get('sortOrder'); + $column = $request->get('sortField'); + $query->orderBy($column, $order); + } + + // Get the total count of records + $totalRecords = $query->count(); + + // Apply pagination if provided + if ($request->has('page') && $request->has('size')) { + $page = $request->get('page'); + $size = $request->get('size'); + $offset = ($page - 1) * $size; // Calculate the offset + + $query->skip($offset)->take($size); + } + + // Get the filtered count of records + $filteredRecords = $query->count(); + + // Get the data for the current page + $data = $query->get(); + + // Calculate the page count + $pageCount = ceil($totalRecords / $request->get('size')); + + // Calculate the current page number + $currentPage = $request->get('page', 1); + + // Return the response data as a JSON object + return response()->json([ + 'draw' => $request->get('draw'), + 'recordsTotal' => $totalRecords, + 'recordsFiltered' => $filteredRecords, + 'pageCount' => $pageCount, + 'page' => $currentPage, + 'totalCount' => $totalRecords, + 'data' => $data, + ]); + } + + public function export() + { + if (is_null($this->user) || !$this->user->can('jenis_lampiran.export')) { + abort(403, 'Sorry! You are not allowed to export jenis lampiran.'); + } + + return Excel::download(new JenisLampiranExport, 'jenis_lampiran.xlsx'); + } + } diff --git a/app/Http/Controllers/LampiranDokumenController.php b/app/Http/Controllers/LampiranDokumenController.php index 5e1a1ec..d187a82 100644 --- a/app/Http/Controllers/LampiranDokumenController.php +++ b/app/Http/Controllers/LampiranDokumenController.php @@ -18,10 +18,11 @@ public function upload(Request $request) { $request->validate([ - 'permohonan_id' => 'required|exists:permohonan,id', - 'nama_file' => 'nullable|string|max:255', - 'file' => 'required|file|max:10240', - 'keterangan' => 'nullable|string|max:255', + 'permohonan_id' => 'required|exists:permohonan,id', + 'jenis_lampiran_id' => 'required|exists:jenis_lampiran,id', + 'nama_file' => 'nullable|string|max:255', + 'file' => 'required|file|max:10240', + 'keterangan' => 'nullable|string|max:255', ]); $lampiran = LampiranDokumen::uploadLampiran($request->all()); diff --git a/app/Http/Controllers/PenilaianController.php b/app/Http/Controllers/PenilaianController.php index a18f8d5..3c88325 100644 --- a/app/Http/Controllers/PenilaianController.php +++ b/app/Http/Controllers/PenilaianController.php @@ -437,10 +437,10 @@ class PenilaianController extends Controller $header = $headers[$type] ?? 'Pelaporan'; $authorization = null; if ($header === 'SLA') { - $authorization = Authorization::with(['user'])->find($id); - $permohonan = Permohonan::find($authorization->permohonan_id); + $authorization = Authorization::with(['user','permohonan.lampiranDokumen.jenisLampiran'])->find($id); + $permohonan = Permohonan::with(['lampiranDokumen.jenisLampiran'])->find($authorization->permohonan_id); } else { - $permohonan = Permohonan::find($id); + $permohonan = Permohonan::with(['lampiranDokumen.jenisLampiran'])->find($id); } if ($header === 'SLA') { return view('lpj::penilaian.otorisator.sla', compact('permohonan', 'header', 'authorization')); diff --git a/app/Http/Requests/JenisLampiranRequest.php b/app/Http/Requests/JenisLampiranRequest.php new file mode 100644 index 0000000..7ba379b --- /dev/null +++ b/app/Http/Requests/JenisLampiranRequest.php @@ -0,0 +1,54 @@ + [ + 'required', + 'string', + 'max:255', + Rule::unique('jenis_lampiran')->where(function ($query) { + return $query->whereNull('deleted_at'); + })->ignore($this->route('jenis_lampiran')), + ], + 'deskripsi' => 'nullable|string', + ]; + + return $rules; + } + + /** + * Get custom messages for validator errors. + * + * @return array + */ + public function messages() + { + return [ + 'nama.required' => 'Nama jenis lampiran harus diisi.', + 'nama.max' => 'Nama jenis lampiran tidak boleh lebih dari 255 karakter.', + ]; + } + } diff --git a/app/Models/JenisLampiran.php b/app/Models/JenisLampiran.php new file mode 100644 index 0000000..dbd52bc --- /dev/null +++ b/app/Models/JenisLampiran.php @@ -0,0 +1,20 @@ +hasMany(LampiranDokumen::class); + } +} diff --git a/app/Models/LampiranDokumen.php b/app/Models/LampiranDokumen.php index af514f5..7a0654d 100644 --- a/app/Models/LampiranDokumen.php +++ b/app/Models/LampiranDokumen.php @@ -9,7 +9,7 @@ class LampiranDokumen extends Base { 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() { @@ -34,6 +34,7 @@ class LampiranDokumen extends Base return self::create([ 'permohonan_id' => $fileData['permohonan_id'] ?? null, + 'jenis_lampiran_id' => $fileData['jenis_lampiran_id'] ?? null, 'nama_file' => $fileName, 'path_file' => $filePath, 'keterangan' => $fileData['keterangan'] ?? null, @@ -62,4 +63,9 @@ class LampiranDokumen extends Base return false; } + + public function jenisLampiran() + { + return $this->belongsTo(JenisLampiran::class); + } } diff --git a/database/migrations/2025_03_14_013452_create_jenis_lampiran_table.php b/database/migrations/2025_03_14_013452_create_jenis_lampiran_table.php new file mode 100644 index 0000000..5b4d73a --- /dev/null +++ b/database/migrations/2025_03_14_013452_create_jenis_lampiran_table.php @@ -0,0 +1,34 @@ +id(); + $table->string('nama'); + $table->text('deskripsi')->nullable(); + $table->timestamps(); + $table->softDeletes(); + + $table->unsignedBigInteger('created_by')->nullable(); + $table->unsignedBigInteger('updated_by')->nullable(); + $table->unsignedBigInteger('deleted_by')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::dropIfExists('jenis_lampiran'); + } +}; diff --git a/database/migrations/2025_03_14_013537_add_jenis_lampiran_id_to_lampiran_dokumen_table.php b/database/migrations/2025_03_14_013537_add_jenis_lampiran_id_to_lampiran_dokumen_table.php new file mode 100644 index 0000000..ebd6637 --- /dev/null +++ b/database/migrations/2025_03_14_013537_add_jenis_lampiran_id_to_lampiran_dokumen_table.php @@ -0,0 +1,30 @@ +foreignIdFor(JenisLampiran::class)->constrained('jenis_lampiran')->onDelete('cascade')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('lampiran_dokumen', function (Blueprint $table) { + $table->dropForeign(['jenis_lampiran_id']); + $table->dropColumn('jenis_lampiran_id'); + }); + } +}; diff --git a/module.json b/module.json index 74efc94..694f353 100644 --- a/module.json +++ b/module.json @@ -880,6 +880,17 @@ "administrator", "admin" ] + }, + { + "title": "Jenis Lampiran", + "path": "basicdata.jenis-lampiran", + "classes": "", + "attributes": [], + "permission": "", + "roles": [ + "administrator", + "admin" + ] } ] } diff --git a/resources/views/activity/activitydetail.blade.php b/resources/views/activity/activitydetail.blade.php index 3ecbaa8..220c55f 100644 --- a/resources/views/activity/activitydetail.blade.php +++ b/resources/views/activity/activitydetail.blade.php @@ -93,71 +93,7 @@ @endforeach @endif - -
Keterangan : {{ $lampiran->keterangan }}
-Tidak ada lampiran dokumen.
- @endforelse -Keterangan : {{ $lampiran->keterangan }}
-Tidak ada lampiran dokumen.
- @endforelse -Keterangan : {{ $lampiran->keterangan }}
+Jenis Lampiran : {{ str_replace('-',' ',$lampiran->jenisLampiran->nama) }}
+Tidak ada lampiran dokumen.
+ @endforelse +| + + | ++ Nama + + | ++ Deskripsi + + | +Action | +
|---|
| Pemohon | -{{ $authorization->user->name }} | -
| Alasan | -{{ $authorization->keterangan }} | -
| Tanggal Permohonan | -{{ formatTanggalIndonesia($authorization->created_at, 1) }} | -
| Pemohon | +{{ $authorization->user->name }} | +
| Alasan | +{{ $authorization->keterangan }} | +
| Tanggal Permohonan | +{{ formatTanggalIndonesia($authorization->created_at, 1) }} | +
| Diperiksa Oleh | +{{ getUser($authorization->approve_so)->name ?? 'N/A' }} | +{{ $authorization->approve_so_at ? formatTanggalIndonesia($authorization->approve_so_at, 1) : 'N/A' }} + | +|||
| Diperiksa Oleh | -{{ getUser($authorization->approve_so)->name ?? 'N/A' }} | -{{ $authorization->approve_so_at ? formatTanggalIndonesia($authorization->approve_so_at, 1) : 'N/A' }} + | Disetujui Oleh (EO) | +{{ getUser($authorization->approve_eo)->name ?? 'N/A' }} | +{{ $authorization->approve_eo_at ? formatTanggalIndonesia($authorization->approve_eo_at, 1) : 'N/A' }} |
| Disetujui Oleh (EO) | -{{ getUser($authorization->approve_eo)->name ?? 'N/A' }} | -{{ $authorization->approve_eo_at ? formatTanggalIndonesia($authorization->approve_eo_at, 1) : 'N/A' }} - | -|||
| Disetujui Oleh (DD) | -{{ getUser($authorization->approve_dd)->name ?? 'N/A' }} | -{{ $authorization->approve_dd_at ? formatTanggalIndonesia($authorization->approve_dd_at, 1) : 'N/A' }} - | -|||
| Disetujui Oleh (DD) | +{{ getUser($authorization->approve_dd)->name ?? 'N/A' }} | +{{ $authorization->approve_dd_at ? formatTanggalIndonesia($authorization->approve_dd_at, 1) : 'N/A' }} + | +