diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index f6ba20c..e95d037 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -1776,7 +1776,7 @@ class DashboardController extends Controller return [ 'file_directory_id' => $item->file_directory_id, 'pegawai_nama_entry' => $item->pegawai_nama_entry, - 'part' => $dataSlice[0] . '/' . $dataSlice[1], + 'part' => $dataSlice[0], 'folder' => $dataSlice[2], 'fileName' =>$dataSlice[3], 'file' => $item->file, diff --git a/public/js/pengajuanFile/index.js b/public/js/pengajuanFile/index.js index 84f55ef..9a3ce2f 100644 --- a/public/js/pengajuanFile/index.js +++ b/public/js/pengajuanFile/index.js @@ -47,10 +47,19 @@ document.addEventListener('DOMContentLoaded', () => { let tanggalTerbit = item.tanggal_terbit ? formatTanggal(item.tanggal_terbit) : '-'; const aksi = `
- + - @@ -206,7 +215,7 @@ document.addEventListener('DOMContentLoaded', () => { }); } - window.infoReject = function(id, fileName){ + window.infoReject = function(id){ const item = getItemById(id); const revision = item?.revision ? String(item.revision) : 'Tidak ada catatan revisi.'; Swal.fire({ @@ -216,6 +225,39 @@ document.addEventListener('DOMContentLoaded', () => { confirmButtonText: 'Tutup' }); } + window.infoDok = function(e){ + let fileUrl = $(e).data('file'); + let noDokumen = $(e).data('no_dokumen') + let tanggalTerbit = $(e).data('tanggal_terbit') + let permissionFile = $(e).data('permission_file') + let fileName = $(e).data('fileName') + currentFile = fileUrl; + idDirectory = $(e).data('id'); + + + const titleEl = document.getElementById('confirm_preview_file'); + if (titleEl) titleEl.textContent = fileName; + + + const noEl = document.getElementById('confirm-upload-dokumen'); + if (noEl) noEl.textContent = noDokumen; + + const tglEl = document.getElementById('confirm-time-dokumen'); + if (tglEl) tglEl.textContent = tanggalTerbit; + + const permEl = document.getElementById('confirm-permission'); + if (permEl) { + const publicDoc = isPublic(permissionFile); + permEl.textContent = publicDoc ? 'Umum' : 'Internal Unit'; + permEl.className = 'badge ' + (publicDoc ? 'bg-success' : 'bg-secondary'); + } + let previewBox = document.getElementById('file-preview'); + previewBox.innerHTML = `
+
`; + openPreview(idDirectory); + $("#previewModal").modal('show') + + } function initEditSelects(){ if (editUnitSelect.length) { @@ -285,7 +327,7 @@ document.addEventListener('DOMContentLoaded', () => { }); } - window.editFileReject = function(id, fileName){ + window.editFileReject = function(id){ const item = getItemById(id); if (!item) { Swal.fire({ icon: 'error', title: 'Gagal', text: 'Data tidak ditemukan.' }); @@ -319,7 +361,8 @@ document.addEventListener('DOMContentLoaded', () => { expiredFieldEl.classList.toggle('d-none', !hasExpired); } if (currentFileEl) { - currentFileEl.textContent = fileName ? `File saat ini: ${fileName}` : ''; + const displayName = item.fileName || (item.file ? String(item.file).split('/').pop() : ''); + currentFileEl.textContent = displayName ? `File saat ini: ${displayName}` : ''; } const parts = (item.file || '').split('/'); diff --git a/resources/views/dataUmum/index.blade.php b/resources/views/dataUmum/index.blade.php index 0c87480..bffbecf 100644 --- a/resources/views/dataUmum/index.blade.php +++ b/resources/views/dataUmum/index.blade.php @@ -45,16 +45,16 @@
-

Data Umum

+

Dokumen Umum

- Download Excel - + --}}
- + --}}
@@ -113,11 +113,12 @@ + Aksi No Dokumen Nama Dokumen Kategori Unit - Tanggal Upload + Tanggal Unggah @@ -299,23 +300,49 @@ : (expiryStatus === 'soon' ? `Akan Expired` : ''); return ` + + +
+ + + + + +
+ + ${item.no_dokumen || '-'}
- - - +
+
+ `; + openPreview(idDirectory); + const deleteWrapper = document.getElementById('deleteData'); + + if (Number(pegawai_id_entry) === Number(authPegawai)) { + deleteWrapper.classList.remove('d-none'); + } else { + deleteWrapper.classList.add('d-none'); + } + $("#previewModal").modal('show') + } @endsection diff --git a/resources/views/dataUnit/index.blade.php b/resources/views/dataUnit/index.blade.php index 1c5e3aa..84f7dd4 100644 --- a/resources/views/dataUnit/index.blade.php +++ b/resources/views/dataUnit/index.blade.php @@ -42,7 +42,7 @@
-

Data Unit

+

Dokumen Unit

+ Aksi No Dokumen Nama Dokumen Kategori Unit - Tanggal Upload + Tanggal Unggah Pengunggah @@ -214,7 +215,7 @@ selectionCssClass: 'select2-filter-selection', dropdownCssClass: 'select2-filter-dropdown', ajax: { - url: '/select-unit-kerja-option', + url: '/select-unit-kerja-mapping', dataType: 'json', delay: 250, data: function (params) { @@ -310,12 +311,38 @@ data-id="${item.file_directory_id}" ${checked}> + +
+ + + + + +
+ ${item.no_dokumen || '-'}
-
-
+
+
+
+ `; + openPreview(idDirectory); + const deleteWrapper = document.getElementById('deleteData'); + + if (Number(pegawai_id_entry) === Number(authPegawai)) { + deleteWrapper.classList.remove('d-none'); + } else { + deleteWrapper.classList.add('d-none'); + } + $("#previewModal").modal('show') + } @endsection diff --git a/resources/views/dataUnit/modal/create.blade.php b/resources/views/dataUnit/modal/create.blade.php index 9f254db..0af6ece 100644 --- a/resources/views/dataUnit/modal/create.blade.php +++ b/resources/views/dataUnit/modal/create.blade.php @@ -63,7 +63,7 @@
-
+
diff --git a/resources/views/layout/main.blade.php b/resources/views/layout/main.blade.php index 48e0bd2..2e6dba7 100644 --- a/resources/views/layout/main.blade.php +++ b/resources/views/layout/main.blade.php @@ -25,7 +25,7 @@ .modal-content, .modal-body, .message-body { - color-scheme: black; + color-scheme: light; scrollbar-color: auto; scrollbar-width: auto; } diff --git a/resources/views/layout/partials/sidenav.blade.php b/resources/views/layout/partials/sidenav.blade.php index 61d3f3a..b5cc4a6 100644 --- a/resources/views/layout/partials/sidenav.blade.php +++ b/resources/views/layout/partials/sidenav.blade.php @@ -31,14 +31,14 @@
    • diff --git a/resources/views/logActivity/index.blade.php b/resources/views/logActivity/index.blade.php index 92e7400..da1348d 100644 --- a/resources/views/logActivity/index.blade.php +++ b/resources/views/logActivity/index.blade.php @@ -48,10 +48,9 @@ File Kategori Unit - Sub Unit Pengunggah - Jumlah Pegawai Melihat - Jumlah Pegawai Mengunduh + Jumlah User Melihat + Jumlah User Mengunduh @@ -106,7 +105,6 @@ document.addEventListener('DOMContentLoaded', () => { ${item.nama_dokumen || '-'} ${item.kategori || '-'} ${item.unit || '-'} - ${item.sub_unit || '-'} ${item.pengunggah || '-'} ${totalViews} ${item.total_download} diff --git a/resources/views/pengajuanFile/index.blade.php b/resources/views/pengajuanFile/index.blade.php index d71e280..6a43948 100644 --- a/resources/views/pengajuanFile/index.blade.php +++ b/resources/views/pengajuanFile/index.blade.php @@ -50,7 +50,7 @@ Akses Nama Kategori - Unit/Sub Unit + Unit Tanggal Terbit Tanggal Expired Tanggal Upload