From f23c9cbd3b630cb8ad216e599fd4e375faad5442 Mon Sep 17 00:00:00 2001 From: "dwi.firman" Date: Fri, 23 Aug 2024 07:55:22 +0700 Subject: [PATCH] perbaikan mapping verivikasi surat pengesahan --- docker-compose.yml | 10 +-- src/app/inbox_pengesahan/crud.php | 40 +++++----- src/app/inbox_pengesahan/tabel.php | 4 +- src/app/master/satker/main.php | 119 ++++++++++++++--------------- src/app/tindaklanjut/crud.php | 62 +++++++-------- src/app/tindaklanjut/js/main.js | 1 + src/app/tindaklanjut/main.php | 7 +- 7 files changed, 122 insertions(+), 121 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 68046d2..87bae23 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,8 +11,8 @@ services: - "8061:80" environment: - APP_ENV=dev - - DB_HOSTNAME=10.10.123.230 - - DB_PORT=5432 - - DB_USERNAME=postgres - - DB_PASSWORD=rumbuk - - DB_NAME=simdistu + - DB_HOSTNAME=10.10.123.165 + - DB_PORT=5000 + - DB_USERNAME=stim + - DB_PASSWORD=stim*RS54 + - DB_NAME=eletter_dev_db diff --git a/src/app/inbox_pengesahan/crud.php b/src/app/inbox_pengesahan/crud.php index cfe26b4..00a9318 100644 --- a/src/app/inbox_pengesahan/crud.php +++ b/src/app/inbox_pengesahan/crud.php @@ -9,31 +9,35 @@ switch ($key) { case 'upd_sm_baca': pg_query($koneksi, "UPDATE kirim SET proses_tu='B' WHERE surat_id='$surat_id' AND satuan_kerja_tujuan='$satker'"); pg_query($koneksi, "UPDATE surat SET flag_baca_tu=1 WHERE id='$surat_id' "); - - // create otomatis lembar kendali - // 66 adalah kode satker dari sub Kordinator TU - $satker_tu = 66; - if ($satker == 66) { - $getSurat = pg_query_params($koneksi, "SELECT * FROM surat WHERE id = $1", array($surat_id)); - while ($row = pg_fetch_assoc($getSurat)) { - $satker_pengirim = $row['satuan_kerja_id']; - $sifat_surat_id = $row['sifat_surat_id']; - $perihal = $row['perihal']; - $kode_surat = $row['kode_id']; - } - $kendali = pg_query($koneksi, "SELECT COALESCE(MAX(no_kendali), 0) + 1 AS count + + $get_stts_kndl = pg_query($koneksi, "SELECT stts_kendali FROM surat WHERE id='$surat_id' "); + $result_stts_kndl = pg_fetch_result($get_stts_kndl, 0, 'stts_kendali'); + if ((int)$result_stts_kndl != 13) { + // create otomatis lembar kendali + // 66 adalah kode satker dari sub Kordinator TU + $satker_tu = 66; + if ($satker == 66) { + $getSurat = pg_query_params($koneksi, "SELECT * FROM surat WHERE id = $1", array($surat_id)); + while ($row = pg_fetch_assoc($getSurat)) { + $satker_pengirim = $row['satuan_kerja_id']; + $sifat_surat_id = $row['sifat_surat_id']; + $perihal = $row['perihal']; + $kode_surat = $row['kode_id']; + } + $kendali = pg_query($koneksi, "SELECT COALESCE(MAX(no_kendali), 0) + 1 AS count FROM surat WHERE date_part('YEAR', tgl_diterima)='$thn_skrg' AND jenis_disposisi_id=2"); - $no_kendali = pg_fetch_result($kendali, 0, 'count'); + $no_kendali = pg_fetch_result($kendali, 0, 'count'); - $ins = pg_query($koneksi, "INSERT INTO surat (satuan_kerja_dari, sifat_surat_id,perihal, tgl_diterima, jam_diterima, jenis_disposisi_id, satuan_kerja_id, jenis_surat_id, no_kendali,kode_id ) + $ins = pg_query($koneksi, "INSERT INTO surat (satuan_kerja_dari, sifat_surat_id,perihal, tgl_diterima, jam_diterima, jenis_disposisi_id, satuan_kerja_id, jenis_surat_id, no_kendali,kode_id ) VALUES($satker_pengirim, $sifat_surat_id, '$perihal', NOW(), NOW(), '2', $satker_tu, '4', '$no_kendali',$kode_surat ) "); - $cek_id = pg_query($koneksi, "SELECT MAX(id) AS count FROM surat"); - $sid = pg_fetch_result($cek_id, 0, 'count'); - $ins_dis = pg_query($koneksi, "INSERT INTO kirim (surat_id, tgl_input, jam_input, satuan_kerja_tujuan, satuan_kerja_penginput ) + $cek_id = pg_query($koneksi, "SELECT MAX(id) AS count FROM surat"); + $sid = pg_fetch_result($cek_id, 0, 'count'); + $ins_dis = pg_query($koneksi, "INSERT INTO kirim (surat_id, tgl_input, jam_input, satuan_kerja_tujuan, satuan_kerja_penginput ) VALUES ('$sid', NOW(), NOW(), $satker_tu, $satker_tu)"); // 66 adalah kode dari satker tatausaha + } } break; diff --git a/src/app/inbox_pengesahan/tabel.php b/src/app/inbox_pengesahan/tabel.php index 9abc400..51689a6 100644 --- a/src/app/inbox_pengesahan/tabel.php +++ b/src/app/inbox_pengesahan/tabel.php @@ -99,7 +99,8 @@ $thn2 = $_POST['thn2']; LEFT JOIN scan kg ON s.id = kg.surat_id AND LOWER(kg.file) LIKE '%jpg' LEFT JOIN scan kh ON s.id = kh.surat_id AND LOWER(kh.file) NOT LIKE '%jpg' WHERE r.satuan_kerja_tujuan = $1 - AND s.satuan_kerja_id <> r.satuan_kerja_tujuan AND s.pengesahan = 1 + --AND s.satuan_kerja_id <> r.satuan_kerja_tujuan + AND s.pengesahan = 1 AND r.lama IS NOT NULL AND r.dis_baca IS NULL AND COALESCE(s.tahun, '') <> 'batal' " . ($thn2 ? "AND EXTRACT(YEAR FROM r.lama) = $2" : "") . " @@ -229,6 +230,7 @@ $thn2 = $_POST['thn2']; }); } }); + var tgl_diterima = currentRow.find("td:eq(9)").text(); if (!tgl_diterima) { $.ajax({ diff --git a/src/app/master/satker/main.php b/src/app/master/satker/main.php index 2a0d663..f8d4722 100644 --- a/src/app/master/satker/main.php +++ b/src/app/master/satker/main.php @@ -1,79 +1,76 @@ - -
-
- -
-
+
+ +
+
-
-
-
-
-
+
+
+
+
+
- + - \ No newline at end of file + }); + \ No newline at end of file diff --git a/src/app/tindaklanjut/crud.php b/src/app/tindaklanjut/crud.php index 8ac1d55..9936373 100644 --- a/src/app/tindaklanjut/crud.php +++ b/src/app/tindaklanjut/crud.php @@ -89,42 +89,37 @@ switch ($key) { if ($stts_kendali == 99) { pg_query($koneksi, "UPDATE surat SET stts_kendali=99,no_surat='',flag_baca_tu=0 WHERE id=$surat_id"); } else { - if ($_POST['key2'] == 'selesai') { - pg_query($koneksi, "UPDATE surat SET stts_kendali = 13 WHERE id=$surat_id"); + if ($_POST['key2'] == 'selesai') { + // 13 status surat selesai + pg_query($koneksi, "UPDATE surat SET stts_kendali =13 WHERE id=$surat_id"); + http_response_code(200); $response = array('icon' => 'success', 'message' => 'Surat Telah Selesai dan Terkirim'); echo json_encode($response); exit; } else { - switch ($jabatan_pegawai_id) { - case 165: - $_verif = 1; // verifikasi TU - break; - case 821: - $_verif = 3; // verifikasi PLT Kabag Umum - break; - case 662: - $_verif = 5; // verifikasi Wadir Pend. dan Pengemb. Mutu Pelayanan - break; - case 663: - $_verif = 7; // verifikasi Wadir Pelayanan Penunjang - break; - case 661: - $_verif = 9; // verifikasi Wadir Pelay. Medik dan Keperawatan - break; - case 664: - $_verif = 11; // verifikasi Wadir Umum dan Keuangan - break; - case 14: - $_verif = 13; // verifikasi Selesai - break; - default: - $_verif = 0; // nilai default jika tidak ada kecocokan - } - pg_query($koneksi, "UPDATE surat SET stts_kendali =$_verif WHERE id=$surat_id"); + $verifikasiMap = [ + 165 => 1, // verifikasi TU + 821 => 3, // verifikasi Plt. Kabag Umum + 771 => 3, // verifikasi Kabag Umum + 662 => 5, // verifikasi Wadir Pend. dan Pengemb. Mutu Pelayanan + 805 => 5, // verifikasi Plt. Wadir Pend. dan Pengemb. Mutu Pelayanan + 663 => 7, // verifikasi Wadir Pelayanan Penunjang + 827 => 7, // verifikasi Plt. Wadir Pelayanan Penunjang + 661 => 9, // verifikasi Wadir Pelay. Medik dan Keperawatan + 828 => 9, // verifikasi Plt. Wadir Pelay. Medik dan Keperawatan + 664 => 11, // verifikasi Wadir Umum dan Keuangan + 829 => 11, // verifikasi Plt. Wadir Umum dan Keuangan + 14 => 13, // verifikasi Selesai + ]; + + $_verif = $verifikasiMap[$jabatan_pegawai_id] ?? 0; // Default 0 jika tidak ada kecocokan + + pg_query($koneksi, "UPDATE surat SET stts_kendali = $_verif WHERE id = $surat_id"); + http_response_code(200); - $response = array('icon' => 'success', 'message' => 'Surat Telah Terkirim'); - echo json_encode($response); + $response = ['icon' => 'success', 'message' => 'Surat Telah Terkirim']; + echo json_encode($response); } } break; @@ -134,11 +129,13 @@ switch ($key) { $d = pg_query($koneksi, "SELECT file FROM scan_komen WHERE komen_id='$id'"); while ($r = pg_fetch_array($d)) { $fil = $r[0]; - $path = "/var/www/simdistu/app/tindaklanjut/dok/" . $fil; + // $path = "/var/www/simdistu/app/tindaklanjut/dok/" . $fil; + $path = "../../public/tindak_lanjut/images/" . $fil; if (file_exists($path)) { unlink($path); } - $path1 = "/var/www/simdistu/app/tindaklanjut/pdf/pdf/" . $fil; + // $path1 = "/var/www/simdistu/app/tindaklanjut/pdf/pdf/" . $fil; + $path1 = "../../public/tindak_lanjut/dokument/" . $fil; if (file_exists($path1)) { unlink($path1); } @@ -262,7 +259,6 @@ switch ($key) { $noSurat_query = pg_query_params($koneksi, "SELECT no_surat FROM surat WHERE no_surat=$1 AND pengesahan = 1 ", array($no_surat)); $noSurat = pg_fetch_assoc($noSurat_query); if (!empty($noSurat['no_surat'])) { - // var_dump($noSurat['no_surat']);die(); http_response_code(400); echo json_encode(['icon' => 'error', 'message' => 'No Surat Sudah Digunakan..!!']); exit; diff --git a/src/app/tindaklanjut/js/main.js b/src/app/tindaklanjut/js/main.js index 3358ced..ced72bb 100644 --- a/src/app/tindaklanjut/js/main.js +++ b/src/app/tindaklanjut/js/main.js @@ -384,6 +384,7 @@ function simpan_komen_selesai() { surat_id: surat_id, jabatan_pegawai_id_tl: jabatan_pegawai_id_tl }); + $('#komen').val(''); $('#inkomen').hide(); } diff --git a/src/app/tindaklanjut/main.php b/src/app/tindaklanjut/main.php index 5bb75bc..6aabec5 100644 --- a/src/app/tindaklanjut/main.php +++ b/src/app/tindaklanjut/main.php @@ -232,7 +232,7 @@ while ($row = pg_fetch_assoc($query_penandatangan)) {

-
+
 
@@ -328,7 +328,8 @@ while ($row = pg_fetch_assoc($query_penandatangan)) {

- +
@@ -365,7 +366,7 @@ while ($row = pg_fetch_assoc($query_penandatangan)) { - +