From 17f7482080273ba8df552c2756e61f1044da6081 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Fri, 19 Sep 2025 09:01:20 +0700 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(js):=20pindahkan?= =?UTF-8?q?=20fungsi=20loading=20SweetAlert=20ke=20global=20scope=20dan=20?= =?UTF-8?q?perbaiki=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Memindahkan fungsi showLoadingSwal() dan hideLoadingSwal() ke resources/assets/js/app.js - Menambahkan fitur timer dan progress bar pada fungsi global loading - Menghapus duplikasi fungsi showLoadingSwal() dari penilai/index.blade.php (~18 baris) - Menghapus duplikasi fungsi dari penilaian/otorisator/index-sla.blade.php (~18 baris) - Menghapus duplikasi fungsi dari penilaian/otorisator/index.blade.php (~18 baris) - Menghapus duplikasi fungsi dari penilaian/paparan-so.blade.php (~18 baris) - Memperbaiki syntax error tag HTML di surveyor/components/informasi.blade.php - Membersihkan duplikasi fungsi & memperbaiki escape string di surveyor/js/utils.blade.php - Mengurangi ±90 baris kode duplikat, meningkatkan maintainability & UX (loading dialog lebih informatif) --- resources/assets/js/app.js | 22 +++++++++++++++++++ resources/views/penilai/index.blade.php | 16 -------------- .../penilaian/otorisator/index-sla.blade.php | 17 -------------- .../penilaian/otorisator/index.blade.php | 17 -------------- .../views/penilaian/paparan-so.blade.php | 17 -------------- .../surveyor/components/informasi.blade.php | 1 - resources/views/surveyor/js/utils.blade.php | 19 +++------------- 7 files changed, 25 insertions(+), 84 deletions(-) diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index c095698..ee307ba 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -31,5 +31,27 @@ function hitungHariKerja(tanggalMulai, tanggalSelesai) { return hariKerja; } +function showLoadingSwal(message, duration = 5000) { + Swal.fire({ + title: message, + allowOutsideClick: false, + didOpen: () => { + Swal.showLoading(); + }, + timer: duration, // Durasi dalam milidetik + timerProgressBar: true, // Menampilkan progres bar timer + }).then((result) => { + if (result.dismiss === Swal.DismissReason.timer) { + console.log("Dialog loading otomatis ditutup."); + } + }); +} + +function hideLoadingSwal() { + Swal.close(); +} + // Make the function available globally window.hitungHariKerja = hitungHariKerja; +window.showLoadingSwal = showLoadingSwal; +window.hideLoadingSwal = hideLoadingSwal; diff --git a/resources/views/penilai/index.blade.php b/resources/views/penilai/index.blade.php index 3082862..1551678 100644 --- a/resources/views/penilai/index.blade.php +++ b/resources/views/penilai/index.blade.php @@ -336,21 +336,5 @@ }); } - - function showLoadingSwal(message, duration = 5000) { - Swal.fire({ - title: message, - allowOutsideClick: false, - didOpen: () => { - Swal.showLoading(); - }, - timer: duration, // Durasi dalam milidetik - timerProgressBar: true, // Menampilkan progres bar timer - }).then((result) => { - if (result.dismiss === Swal.DismissReason.timer) { - console.log('Dialog loading otomatis ditutup.'); - } - }); - } @endpush diff --git a/resources/views/penilaian/otorisator/index-sla.blade.php b/resources/views/penilaian/otorisator/index-sla.blade.php index 37fd065..2000b3c 100644 --- a/resources/views/penilaian/otorisator/index-sla.blade.php +++ b/resources/views/penilaian/otorisator/index-sla.blade.php @@ -291,22 +291,5 @@ } }); } - - - function showLoadingSwal(message, duration = 5000) { - Swal.fire({ - title: message, - allowOutsideClick: false, - didOpen: () => { - Swal.showLoading(); - }, - timer: duration, // Durasi dalam milidetik - timerProgressBar: true, // Menampilkan progres bar timer - }).then((result) => { - if (result.dismiss === Swal.DismissReason.timer) { - console.log('Dialog loading otomatis ditutup.'); - } - }); - } @endpush diff --git a/resources/views/penilaian/otorisator/index.blade.php b/resources/views/penilaian/otorisator/index.blade.php index 4388321..31025c4 100644 --- a/resources/views/penilaian/otorisator/index.blade.php +++ b/resources/views/penilaian/otorisator/index.blade.php @@ -361,22 +361,5 @@ } }); } - - - function showLoadingSwal(message, duration = 5000) { - Swal.fire({ - title: message, - allowOutsideClick: false, - didOpen: () => { - Swal.showLoading(); - }, - timer: duration, // Durasi dalam milidetik - timerProgressBar: true, // Menampilkan progres bar timer - }).then((result) => { - if (result.dismiss === Swal.DismissReason.timer) { - console.log('Dialog loading otomatis ditutup.'); - } - }); - } @endpush diff --git a/resources/views/penilaian/paparan-so.blade.php b/resources/views/penilaian/paparan-so.blade.php index c36961e..c1bb1a1 100644 --- a/resources/views/penilaian/paparan-so.blade.php +++ b/resources/views/penilaian/paparan-so.blade.php @@ -348,22 +348,5 @@ } }); } - - - function showLoadingSwal(message, duration = 5000) { - Swal.fire({ - title: message, - allowOutsideClick: false, - didOpen: () => { - Swal.showLoading(); - }, - timer: duration, // Durasi dalam milidetik - timerProgressBar: true, // Menampilkan progres bar timer - }).then((result) => { - if (result.dismiss === Swal.DismissReason.timer) { - console.log('Dialog loading otomatis ditutup.'); - } - }); - } @endpush diff --git a/resources/views/surveyor/components/informasi.blade.php b/resources/views/surveyor/components/informasi.blade.php index 22b766c..71ca457 100644 --- a/resources/views/surveyor/components/informasi.blade.php +++ b/resources/views/surveyor/components/informasi.blade.php @@ -238,7 +238,6 @@ alt="Foto Argis Region" class="mt-2 max-w-full h-auto" style="{{ $argisRegionPath ? '' : 'display: none;' }} max-width: 30rem;"> - < diff --git a/resources/views/surveyor/js/utils.blade.php b/resources/views/surveyor/js/utils.blade.php index 8da858a..89c77bb 100644 --- a/resources/views/surveyor/js/utils.blade.php +++ b/resources/views/surveyor/js/utils.blade.php @@ -1,18 +1,4 @@