diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 9110fbb..3e8ee3b 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -662,7 +662,6 @@ class DashboardController extends Controller } - $status = null; // if(auth()->user()->masterPersetujuan){ // $unitPegawaiIds = auth()->user()->masterPersetujuan->details->pluck('unit_pegawai_id')->unique()->toArray(); // $status = in_array($id_unit_kerja, $unitPegawaiIds) @@ -679,6 +678,8 @@ class DashboardController extends Controller 'pegawai_nama_entry' => auth()->user()->dataUser->namalengkap ?? null, 'tanggal_terbit' => $data['date_active'] ?? null, 'no_dokumen' => $data['no_dokumen'] ?? null, + 'nama_dokumen' => $data['nama_dokumen'] ?? null, + 'tgl_expired' => $data['tgl_expired'] ?? null, 'permission_file' => ($data['is_permission'] ?? null) == "1", 'status_action' => $status, 'action_by' => $status && $status === "approved" ? auth()->user()->objectpegawaifk : null, @@ -710,7 +711,8 @@ class DashboardController extends Controller DB::connection('dbDirectory')->commit(); return response()->json([ 'status' => true, - 'message' => 'Data berhasil disimpan' + 'message' => 'Data berhasil disimpan', + 'status_action' => $isAtasan ? 'approved' : null ], 200); } catch (\Throwable $th) { DB::connection('dbDirectory')->rollback(); diff --git a/resources/views/dashboard/modal/create.blade.php b/resources/views/dashboard/modal/create.blade.php index 80f0cf6..7381506 100644 --- a/resources/views/dashboard/modal/create.blade.php +++ b/resources/views/dashboard/modal/create.blade.php @@ -73,7 +73,7 @@
- Bisa upload lebih dari 1 file. Format yang didukung: PDF. + Format yang didukung: PDF.
diff --git a/resources/views/dataUmum/index.blade.php b/resources/views/dataUmum/index.blade.php index d9de0d2..f7bd87a 100644 --- a/resources/views/dataUmum/index.blade.php +++ b/resources/views/dataUmum/index.blade.php @@ -183,11 +183,10 @@ - Nomor Surat - File + No Dokumen + Nama Dokumen Kategori Unit - Sub Unit Tanggal Upload @@ -223,6 +222,21 @@ const checkAllEl = document.getElementById('checkAllRows'); const selectedIds = new Set(); + document.addEventListener('change', function(e){ + if(!e.target.classList.contains('toggle-expired')) return; + const targetId = e.target.getAttribute('data-target'); + if(!targetId) return; + const fieldWrap = document.getElementById(targetId); + if(!fieldWrap) return; + if(e.target.checked){ + fieldWrap.classList.remove('d-none'); + }else{ + fieldWrap.classList.add('d-none'); + const input = fieldWrap.querySelector('input[type="date"]'); + if(input) input.value = ''; + } + }); + if(pageSizeSelect){ const initialSize = parseInt(pageSizeSelect.value); if(!isNaN(initialSize)) tableState.pageSize = initialSize; @@ -290,7 +304,7 @@ - ${fileName} + ${item.nama_dokumen || '-'} - - -
- - ${ - item.permission_file - ? ` - - Umum - - ` - : ` - - Internal Unit - - ` - } -
- @@ -355,9 +330,6 @@ ${unitName} - - ${subName} - ${formatTanggal(item.entry_at)} `; @@ -730,7 +702,7 @@ -
+
# @@ -739,18 +711,35 @@ name="data[${colCount}][no_dokumen]" placeholder="Contoh: 001/RS/IT/I/2026">
-
Opsional, isi jika ada nomor resmi dokumen.
+
+
+
+ +
-
+
+ name="data[${colCount}][date_active]">
- -
+
+
+ + +
+
+
+ + +
+
@@ -779,7 +768,6 @@
-
{ + if(result.isConfirmed){ + window.location.href = '/pengajuan-file'; + } + }); + return; + } } else { throw new Error(responseData.message || 'Terjadi kesalahan saat menyimpan data.'); } diff --git a/resources/views/dataUmum/modal/create.blade.php b/resources/views/dataUmum/modal/create.blade.php index a59cf5f..14b996f 100644 --- a/resources/views/dataUmum/modal/create.blade.php +++ b/resources/views/dataUmum/modal/create.blade.php @@ -14,39 +14,61 @@
+
+
+ Informasi Dokumen +
Lengkapi detail dokumen sebelum upload.
+
+
+
-
+
#
-
+
+ + +
+
-
+
+
+ + +
+
+
+ + + +
+
@@ -64,6 +86,7 @@
+
@@ -73,7 +96,7 @@
- Bisa upload lebih dari 1 file. Format yang didukung: PDF. + Format yang didukung: PDF.
diff --git a/resources/views/dataUnit/index.blade.php b/resources/views/dataUnit/index.blade.php index 27fde2c..3123189 100644 --- a/resources/views/dataUnit/index.blade.php +++ b/resources/views/dataUnit/index.blade.php @@ -202,12 +202,12 @@ - Nomor Surat - File + No Dokumen + Nama Dokumen Kategori Unit - Sub Unit Tanggal Upload + Pengunggah @@ -245,6 +245,21 @@ const checkAllEl = document.getElementById('checkAllRows'); const selectedIds = new Set(); + document.addEventListener('change', function(e){ + if(!e.target.classList.contains('toggle-expired')) return; + const targetId = e.target.getAttribute('data-target'); + if(!targetId) return; + const fieldWrap = document.getElementById(targetId); + if(!fieldWrap) return; + if(e.target.checked){ + fieldWrap.classList.remove('d-none'); + }else{ + fieldWrap.classList.add('d-none'); + const input = fieldWrap.querySelector('input[type="date"]'); + if(input) input.value = ''; + } + }); + if(pageSizeSelect){ const initialSize = parseInt(pageSizeSelect.value); if(!isNaN(initialSize)) tableState.pageSize = initialSize; @@ -307,13 +322,13 @@ - ${fileName} + ${item.nama_dokumen || '-'}
@@ -323,10 +338,8 @@ ${unitName} - - ${subName} - ${formatTanggal(item.entry_at)} + ${item.pegawai_nama_entry || '-'} `; } @@ -698,7 +711,7 @@
-
+
# @@ -707,18 +720,40 @@ name="data[${colCount}][no_dokumen]" placeholder="Contoh: 001/RS/IT/I/2026">
-
Opsional, isi jika ada nomor resmi dokumen.
+
+
+
+ +
-
+
+ name="data[${colCount}][date_active]"> +
+
+
+ + +
-
+
+ + +
+ +
@@ -953,11 +988,26 @@ color: "#fff", } }).showToast(); + const modalInstance = bootstrap.Modal.getInstance(modalCreate); + modalInstance?.hide(); resetCreateForm(); fetchData() submitBtn.prop('disabled', false).text('Simpan') - const modalInstance = bootstrap.Modal.getInstance(modalCreate); - modalInstance?.hide(); + if(responseData.status_action === null || responseData.status_action === undefined){ + Swal.fire({ + icon: 'info', + title: 'Perlu Persetujuan', + text: 'Dokumen yang Anda upload butuh persetujuan dari atasan. Untuk melihatnya, kunjungi halaman Pengajuan File atau klik Tutup untuk tetap di sini.', + showCancelButton: true, + confirmButtonText: 'Ke Pengajuan File', + cancelButtonText: 'Tutup' + }).then((result) => { + if(result.isConfirmed){ + window.location.href = '/pengajuan-file'; + } + }); + return; + } } else { throw new Error(responseData.message || 'Terjadi kesalahan saat menyimpan data.'); } diff --git a/resources/views/dataUnit/modal/create.blade.php b/resources/views/dataUnit/modal/create.blade.php index a59cf5f..a8c1aaa 100644 --- a/resources/views/dataUnit/modal/create.blade.php +++ b/resources/views/dataUnit/modal/create.blade.php @@ -14,39 +14,61 @@
+
+
+ Informasi Dokumen +
Lengkapi detail dokumen sebelum upload.
+
+
+
-
+
#
-
+
+ + +
+
-
+
+
+ + +
+
+
+ + + +
+
@@ -64,6 +86,7 @@
+
@@ -73,7 +96,7 @@
- Bisa upload lebih dari 1 file. Format yang didukung: PDF. + Format yang didukung: PDF.