dwi.firman/eletter
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perbaikan mapping verivikasi surat pengesahan

Browse Source
This commit is contained in:
dwi.firman
2024-08-23 07:55:22 +07:00
parent 12ef53f0af
commit f23c9cbd3b
7 changed files with 122 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.yml
+5 -5
View File
@@ -11,8 +11,8 @@ services:
- "8061:80" - "8061:80"
environment: environment:
- APP_ENV=dev - APP_ENV=dev
- DB_HOSTNAME=10.10.123.230 - DB_HOSTNAME=10.10.123.165
- DB_PORT=5432 - DB_PORT=5000
- DB_USERNAME=postgres - DB_USERNAME=stim
- DB_PASSWORD=rumbuk - DB_PASSWORD=stim*RS54
- DB_NAME=simdistu - DB_NAME=eletter_dev_db
src/app/inbox_pengesahan/crud.php
+22 -18
View File
@@ -9,31 +9,35 @@ switch ($key) {
case 'upd_sm_baca': 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 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' "); pg_query($koneksi, "UPDATE surat SET flag_baca_tu=1 WHERE id='$surat_id' ");
// create otomatis lembar kendali $get_stts_kndl = pg_query($koneksi, "SELECT stts_kendali FROM surat WHERE id='$surat_id' ");
// 66 adalah kode satker dari sub Kordinator TU $result_stts_kndl = pg_fetch_result($get_stts_kndl, 0, 'stts_kendali');
$satker_tu = 66; if ((int)$result_stts_kndl != 13) {
if ($satker == 66) { // create otomatis lembar kendali
$getSurat = pg_query_params($koneksi, "SELECT * FROM surat WHERE id = $1", array($surat_id)); // 66 adalah kode satker dari sub Kordinator TU
while ($row = pg_fetch_assoc($getSurat)) { $satker_tu = 66;
$satker_pengirim = $row['satuan_kerja_id']; if ($satker == 66) {
$sifat_surat_id = $row['sifat_surat_id']; $getSurat = pg_query_params($koneksi, "SELECT * FROM surat WHERE id = $1", array($surat_id));
$perihal = $row['perihal']; while ($row = pg_fetch_assoc($getSurat)) {
$kode_surat = $row['kode_id']; $satker_pengirim = $row['satuan_kerja_id'];
} $sifat_surat_id = $row['sifat_surat_id'];
$kendali = pg_query($koneksi, "SELECT COALESCE(MAX(no_kendali), 0) + 1 AS count $perihal = $row['perihal'];
$kode_surat = $row['kode_id'];
}
$kendali = pg_query($koneksi, "SELECT COALESCE(MAX(no_kendali), 0) + 1 AS count
FROM surat FROM surat
WHERE date_part('YEAR', tgl_diterima)='$thn_skrg' WHERE date_part('YEAR', tgl_diterima)='$thn_skrg'
AND jenis_disposisi_id=2"); 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 ) 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"); $cek_id = pg_query($koneksi, "SELECT MAX(id) AS count FROM surat");
$sid = pg_fetch_result($cek_id, 0, 'count'); $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 ) $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 VALUES ('$sid', NOW(), NOW(), $satker_tu, $satker_tu)"); // 66 adalah kode dari satker tatausaha
}
} }
break; break;
src/app/inbox_pengesahan/tabel.php
+3 -1
View File
@@ -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 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' LEFT JOIN scan kh ON s.id = kh.surat_id AND LOWER(kh.file) NOT LIKE '%jpg'
WHERE r.satuan_kerja_tujuan = $1 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 r.lama IS NOT NULL AND r.dis_baca IS NULL
AND COALESCE(s.tahun, '') <> 'batal' AND COALESCE(s.tahun, '') <> 'batal'
" . ($thn2 ? "AND EXTRACT(YEAR FROM r.lama) = $2" : "") . " " . ($thn2 ? "AND EXTRACT(YEAR FROM r.lama) = $2" : "") . "
@@ -229,6 +230,7 @@ $thn2 = $_POST['thn2'];
}); });
} }
}); });
var tgl_diterima = currentRow.find("td:eq(9)").text(); var tgl_diterima = currentRow.find("td:eq(9)").text();
if (!tgl_diterima) { if (!tgl_diterima) {
$.ajax({ $.ajax({
src/app/master/satker/main.php
+58 -61
View File
@@ -1,79 +1,76 @@
<div class="row"> <div class="row">
<div class="col-lg-2"> <div class="col-lg-2">
<button type="button" id="btn_baru_satker" class="btn btn-danger btn-rounded waves-effect waves-light"> <button type="button" id="btn_baru_satker" class="btn btn-danger btn-rounded waves-effect waves-light">
<i class="fa fa-plus m-r-5"></i> Satuan Kerja <i class="fa fa-plus m-r-5"></i> Satuan Kerja
</button> </button>
</div> </div>
</div> </div>
<br> <br>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div id="tabel_satker"></div> <div id="tabel_satker"></div>
</div> </div>
</div> </div>
<div id="modal_satker" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div id="modal_satker" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header no-border"> <div class="modal-header no-border">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h4 class="modal-title" id="myModalLabel">Add Satuan Kerja</h4> <h4 class="modal-title" id="myModalLabel">Add Satuan Kerja</h4>
</div> </div>
<div class="modal-body" id="modal_body_satker"></div> <div class="modal-body" id="modal_body_satker"></div>
<div class="modal-footer no-border"> <div class="modal-footer no-border">
<button type="button" class="btn btn-default waves-effect" data-dismiss="modal" id="keluar_satker">Keluar</button> <button type="button" class="btn btn-default waves-effect" data-dismiss="modal" id="keluar_satker">Keluar</button>
<button type="button" class="btn btn-primary waves-effect waves-light" id="simpan_satker">Simpan</button> <button type="button" class="btn btn-primary waves-effect waves-light" id="simpan_satker">Simpan</button>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<script> <script>
$('#tabel_satker').load("app/master/satker/tabel.php"); $('#tabel_satker').load("app/master/satker/tabel.php");
$('#btn_baru_satker').click(function(){ $('#btn_baru_satker').click(function() {
var id = 0; var id = 0;
$('#modal_satker').modal('show'); $('#modal_satker').modal('show');
$('#modal_body_satker').html(""); $('#modal_body_satker').html("");
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "app/master/satker/modal.php", url: "app/master/satker/modal.php",
data: 'id='+id, data: 'id=' + id,
success: function(data){ success: function(data) {
$('#modal_body_satker').html(data); $('#modal_body_satker').html(data);
$('#nama_satker').first().focus().selected(); $('#nama_satker').first().focus().selected();
} }
}); });
}); });
$('#simpan_satker').click(function(){ $('#simpan_satker').click(function() {
var id = $('#satuan_kerja_id').val(); var id = $('#satuan_kerja_id').val();
var nama = $('#nama_satker').val(); var nama = $('#nama_satker').val();
var kode_satker = $('#kode_satker').val(); var kode_satker = $('#kode_satker').val();
var key = 'simpan_satker'; var key = 'simpan_satker';
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "app/master/satker/crud.php", url: "app/master/satker/crud.php",
data: 'id='+id data: 'id=' + id +
+'&nama='+nama '&nama=' + nama +
+'&kode_satker='+kode_satker '&kode_satker=' + kode_satker +
+'&key='+key, '&key=' + key,
success: function(data){ success: function(data) {
$('#modal_satker').modal('hide'); $('#modal_satker').modal('hide');
$('body').removeClass('modal-open'); $('body').removeClass('modal-open');
$('.modal-backdrop').remove(); $('.modal-backdrop').remove();
alert('tersimpan..'); alert('tersimpan..');
$('#tabel_satker').load("app/master/satker/tabel.php"); $('#tabel_satker').load("app/master/satker/tabel.php");
} }
}); });
}); });
$("#modal_satker").on("hidden.bs.modal", function () { $("#modal_satker").on("hidden.bs.modal", function() {
$(this).off('hidden.bs.modal'); $(this).off('hidden.bs.modal');
}); });
</script> </script>
src/app/tindaklanjut/crud.php
+29 -33
View File
@@ -89,42 +89,37 @@ switch ($key) {
if ($stts_kendali == 99) { if ($stts_kendali == 99) {
pg_query($koneksi, "UPDATE surat SET stts_kendali=99,no_surat='',flag_baca_tu=0 WHERE id=$surat_id"); pg_query($koneksi, "UPDATE surat SET stts_kendali=99,no_surat='',flag_baca_tu=0 WHERE id=$surat_id");
} else { } else {
if ($_POST['key2'] == 'selesai') { if ($_POST['key2'] == 'selesai') {
pg_query($koneksi, "UPDATE surat SET stts_kendali = 13 WHERE id=$surat_id"); // 13 status surat selesai
pg_query($koneksi, "UPDATE surat SET stts_kendali =13 WHERE id=$surat_id");
http_response_code(200); http_response_code(200);
$response = array('icon' => 'success', 'message' => 'Surat Telah Selesai dan Terkirim'); $response = array('icon' => 'success', 'message' => 'Surat Telah Selesai dan Terkirim');
echo json_encode($response); echo json_encode($response);
exit; exit;
} else { } else {
switch ($jabatan_pegawai_id) { $verifikasiMap = [
case 165: 165 => 1, // verifikasi TU
$_verif = 1; // verifikasi TU 821 => 3, // verifikasi Plt. Kabag Umum
break; 771 => 3, // verifikasi Kabag Umum
case 821: 662 => 5, // verifikasi Wadir Pend. dan Pengemb. Mutu Pelayanan
$_verif = 3; // verifikasi PLT Kabag Umum 805 => 5, // verifikasi Plt. Wadir Pend. dan Pengemb. Mutu Pelayanan
break; 663 => 7, // verifikasi Wadir Pelayanan Penunjang
case 662: 827 => 7, // verifikasi Plt. Wadir Pelayanan Penunjang
$_verif = 5; // verifikasi Wadir Pend. dan Pengemb. Mutu Pelayanan 661 => 9, // verifikasi Wadir Pelay. Medik dan Keperawatan
break; 828 => 9, // verifikasi Plt. Wadir Pelay. Medik dan Keperawatan
case 663: 664 => 11, // verifikasi Wadir Umum dan Keuangan
$_verif = 7; // verifikasi Wadir Pelayanan Penunjang 829 => 11, // verifikasi Plt. Wadir Umum dan Keuangan
break; 14 => 13, // verifikasi Selesai
case 661: ];
$_verif = 9; // verifikasi Wadir Pelay. Medik dan Keperawatan
break; $_verif = $verifikasiMap[$jabatan_pegawai_id] ?? 0; // Default 0 jika tidak ada kecocokan
case 664:
$_verif = 11; // verifikasi Wadir Umum dan Keuangan pg_query($koneksi, "UPDATE surat SET stts_kendali = $_verif WHERE id = $surat_id");
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");
http_response_code(200); http_response_code(200);
$response = array('icon' => 'success', 'message' => 'Surat Telah Terkirim'); $response = ['icon' => 'success', 'message' => 'Surat Telah Terkirim'];
echo json_encode($response); echo json_encode($response);
} }
} }
break; break;
@@ -134,11 +129,13 @@ switch ($key) {
$d = pg_query($koneksi, "SELECT file FROM scan_komen WHERE komen_id='$id'"); $d = pg_query($koneksi, "SELECT file FROM scan_komen WHERE komen_id='$id'");
while ($r = pg_fetch_array($d)) { while ($r = pg_fetch_array($d)) {
$fil = $r[0]; $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)) { if (file_exists($path)) {
unlink($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)) { if (file_exists($path1)) {
unlink($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_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); $noSurat = pg_fetch_assoc($noSurat_query);
if (!empty($noSurat['no_surat'])) { if (!empty($noSurat['no_surat'])) {
// var_dump($noSurat['no_surat']);die();
http_response_code(400); http_response_code(400);
echo json_encode(['icon' => 'error', 'message' => 'No Surat Sudah Digunakan..!!']); echo json_encode(['icon' => 'error', 'message' => 'No Surat Sudah Digunakan..!!']);
exit; exit;
src/app/tindaklanjut/js/main.js
+1
View File
@@ -384,6 +384,7 @@ function simpan_komen_selesai() {
surat_id: surat_id, surat_id: surat_id,
jabatan_pegawai_id_tl: jabatan_pegawai_id_tl jabatan_pegawai_id_tl: jabatan_pegawai_id_tl
}); });
$('#komen').val(''); $('#komen').val('');
$('#inkomen').hide(); $('#inkomen').hide();
} }
src/app/tindaklanjut/main.php
+4 -3
View File
@@ -232,7 +232,7 @@ while ($row = pg_fetch_assoc($query_penandatangan)) {
<span style="font-weight: normal;" class="no_surat_label"><?= $surat['no_surat'] ?></span> <span style="font-weight: normal;" class="no_surat_label"><?= $surat['no_surat'] ?></span>
</p> </p>
<?php if ($cek_satker == 66) { ?> <?php if ($cek_satker == 66) { ?>
<div style="display: <?=($surat['stts_kendali']==99)?'none':'flex'?>; align-items: center;"> <div style="display: <?= ($surat['stts_kendali'] == 99) ? 'none' : 'flex' ?>; align-items: center;">
&nbsp;<input type="text" class="form-control" id="no_surat_tl" style="width: 80%;margin-left: 2rem;display:<?php echo ($surat['no_surat'] != '') ? 'none' : 'block' ?>" value="<?= $surat['no_surat'] ?>"> &nbsp;<input type="text" class="form-control" id="no_surat_tl" style="width: 80%;margin-left: 2rem;display:<?php echo ($surat['no_surat'] != '') ? 'none' : 'block' ?>" value="<?= $surat['no_surat'] ?>">
<button type="button" class="btn btn-success btn-rounded btn-xs " style="font-family:InterSB;font-size:12px;color:blackd;margin-left: 1rem; display:<?php echo ($surat['no_surat'] != '') ? 'none' : 'block' ?>" data-content="Simpan No Surat" name="simpan_no_surat" rel="popover" data-placement="top" data-trigger="hover"><i class="fa fa-floppy-o"></i></button> <button type="button" class="btn btn-success btn-rounded btn-xs " style="font-family:InterSB;font-size:12px;color:blackd;margin-left: 1rem; display:<?php echo ($surat['no_surat'] != '') ? 'none' : 'block' ?>" data-content="Simpan No Surat" name="simpan_no_surat" rel="popover" data-placement="top" data-trigger="hover"><i class="fa fa-floppy-o"></i></button>
</div> </div>
@@ -328,7 +328,8 @@ while ($row = pg_fetch_assoc($query_penandatangan)) {
</div> </div>
<br> <br>
<?php } ?> <?php } ?>
<?php $display = ($cek_satker != $satker_pemilik_surat) ? 'block' : 'none' ?> <?php
$display = ($cek_satker != $satker_pemilik_surat || $cek_satker == '172') ? 'block' : 'none' ?>
<div class="form-group" style="display: <?= $display ?>;"> <div class="form-group" style="display: <?= $display ?>;">
<textarea class="form-control" id="komen" name="message" rows="2" placeholder="Bagaimana tanggapan anda ?" required=""></textarea> <textarea class="form-control" id="komen" name="message" rows="2" placeholder="Bagaimana tanggapan anda ?" required=""></textarea>
</div> </div>
@@ -365,7 +366,7 @@ while ($row = pg_fetch_assoc($query_penandatangan)) {
<button type="button" class="btn btn-info btn-rounded" id="selesai_komen" style="margin-right: 10px;"> <button type="button" class="btn btn-info btn-rounded" id="selesai_komen" style="margin-right: 10px;">
<i class="fa fa-check m-r-5"></i> Selesai <i class="fa fa-check m-r-5"></i> Selesai
</button> </button>
<?php if(!in_array($cek_satker,[11])){?> <?php if (!in_array($cek_satker, [11])) { ?>
<button type="button" class="btn btn-success btn-rounded" id="simpan_komen"> <button type="button" class="btn btn-success btn-rounded" id="simpan_komen">
<i class="mdi mdi-send m-r-5"></i> Kirim <i class="mdi mdi-send m-r-5"></i> Kirim
</button> </button>