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

perubahan pasca diskusi tgl 23 agustus

Browse Source
This commit is contained in:
dwi.firman
2024-09-04 12:59:29 +07:00
parent dca44baecd
commit 97df70a547
12 changed files with 285 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -26,7 +26,7 @@ src/application/logs/*
src/application/config/
src/application/application/logs/
src/logs/
# src/public/
src/public/
### CodeIgniter Patch ###
src/app/inbox_pengesahan/crud.php
+34 -1
View File
@@ -9,7 +9,7 @@ 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' ");
$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) {
@@ -44,4 +44,37 @@ switch ($key) {
case 'approve_keluar':
$u = pg_query($koneksi, "UPDATE kirim SET tgl_diterima=NOW() WHERE surat_id='$surat_id' AND satuan_kerja_tujuan='$satker'");
break;
case 'penanda_ajudan':
$getSurat = pg_query_params($koneksi, 'SELECT penanda_ajudan FROM kirim WHERE surat_id = $1 AND kepada =$2', array($surat_id,$_POST['idJabatan']));
// Mengambil hasil query
$resultGetsSurat = pg_fetch_assoc($getSurat,);
// var_dump(['a'=>$resultGetsSurat,'b'=>$surat_id]);die();
if ($resultGetsSurat['penanda_ajudan'] == 1) {
$result='ada';
pg_query_params($koneksi, "UPDATE kirim r
SET penanda_ajudan = 0
FROM surat s
INNER JOIN data_user u ON u.satuan_kerja_id = s.satuan_kerja_id
INNER JOIN jabatan_pegawai j ON j.id = u.jabatan_pegawai_id
WHERE r.surat_id = s.id AND s.id = $1 AND r.kepada=$2", array($surat_id,$_POST['idJabatan']));
// pg_query_params($koneksi, 'UPDATE kirim SET penanda_ajudan = 0 WHERE id = $1', array( $surat_id));
} else {
pg_query_params($koneksi, "UPDATE kirim r
SET penanda_ajudan = 1
FROM surat s
INNER JOIN data_user u ON u.satuan_kerja_id = s.satuan_kerja_id
INNER JOIN jabatan_pegawai j ON j.id = u.jabatan_pegawai_id
WHERE r.surat_id = s.id AND s.id = $1 AND r.kepada=$2", array($surat_id,$_POST['idJabatan']));
// pg_query_params($koneksi, 'UPDATE kirim SET penanda_ajudan = 1 WHERE id = $1', array( $surat_id));
$result='tidak ada';
}
http_response_code(200);
echo json_encode(['icon' => 'success', 'message' => $result]);
break;
}
src/app/inbox_pengesahan/main.php
+1
View File
@@ -1,4 +1,5 @@
<?php
session_start();
include('../koneksi.php');
$bln_auto = date('m');
$thn_auto = date('Y');
src/app/inbox_pengesahan/tabel.php
+41 -5
View File
@@ -1,4 +1,5 @@
<?php
session_start();
include("../koneksi.php");
$satuan_kerja_id = $_POST['satker'];
$jenis_user = $_POST['jenis'];
@@ -6,7 +7,6 @@ $sess_nama = $_POST['sess_nama'];
$bln2 = $_POST['bln2'];
$thn2 = $_POST['thn2'];
?>
<style type="text/css">
/*
@@ -24,6 +24,7 @@ $thn2 = $_POST['thn2'];
<script type="text/javascript">
$('button[name="terima_inbox"]').popover();
$('button[name="proses_tl"]').popover();
$('button[name="tanda_ajudan"]').popover();
$("#tabel_data_inbox").DataTable({
"paging": true,
"lengthChange": true,
@@ -47,6 +48,7 @@ $thn2 = $_POST['thn2'];
<input type="hidden" id="jenis" value="<?php echo $jenis_user; ?>">
<input type="hidden" id="sess_nama" value="<?php echo $sess_nama; ?>">
<input type="hidden" id="satuan_kerja_id" value="<?php echo $satuan_kerja_id; ?>">
<input type="hidden" id="idJabatan" value="<?= $_SESSION['idJabatan']; ?>">
<input type="hidden" id="disp_bln" value="<?php echo $bln2; ?>">
<input type="hidden" id="disp_thn" value="<?php echo $thn2; ?>">
@@ -90,7 +92,7 @@ $thn2 = $_POST['thn2'];
$data = pg_query_params(
$koneksi,
"SELECT r.lama,s.perihal,s.satuan_kerja_id,s.id,j.nama,r.proses_tu,s.no_register, COUNT(kg.*) AS count_kg, COUNT(kh.*) AS count_kh,
s.no_surat,r.id AS kirimid,r.tgl_diterima,r.isi,s.stts_kendali,s.sifat_surat_id, ss.sifat AS ket_sifat
s.no_surat,r.id AS kirimid,r.tgl_diterima,r.isi,s.stts_kendali,s.sifat_surat_id, ss.sifat AS ket_sifat,r.penanda_ajudan
FROM surat s
INNER JOIN data_user u ON u.satuan_kerja_id = s.satuan_kerja_id
INNER JOIN jabatan_pegawai j ON j.id = u.jabatan_pegawai_id
@@ -106,7 +108,7 @@ $thn2 = $_POST['thn2'];
" . ($thn2 ? "AND EXTRACT(YEAR FROM r.lama) = $2" : "") . "
" . ($bln2 && $bln2 != '0' ? "AND EXTRACT(MONTH FROM r.lama) = $3" : "") . "
GROUP BY
r.lama, s.perihal, s.satuan_kerja_id, s.id, j.nama, r.proses_tu, r.id, s.no_surat, r.tgl_diterima, r.isi,s.stts_kendali,s.sifat_surat_id, ss.sifat
r.lama, s.perihal, s.satuan_kerja_id, s.id, j.nama, r.proses_tu, r.id, s.no_surat, r.tgl_diterima, r.isi,s.stts_kendali,s.sifat_surat_id, ss.sifat,s.no_register
ORDER BY
r.lama DESC;
",
@@ -120,6 +122,8 @@ $thn2 = $_POST['thn2'];
$tk = $r['count_kh'];
$isi = $r['isi'];
$surat_id = $r['id'];
$noRegister = $r['no_register'];
$penandaAjudan = (int)$r['penanda_ajudan'];
if ($r['sifat_surat_id'] == 1) {
$colors = '#CCCCCC !important;color:black;';
} elseif ($r['sifat_surat_id'] == 2) {
@@ -131,10 +135,20 @@ $thn2 = $_POST['thn2'];
} elseif ($r['sifat_surat_id'] == 5) {
$colors = '#5A5A5A !important;';
}
// penanda Ajudan Wadir
$display = ($_SESSION['jenis'] == 'Sekretaris') ? 'inline' : 'none';
$checkAjudan = ($penandaAjudan == 1) ? 'checked' : '';
?>
<tr style="color: <?= $r['proses_tu'] == 'B' ? '#7E7474' : 'black'; ?>">
<td class="kiri" style="font-family: InterSB"><?= htmlspecialchars($r['nama']); ?></td>
<td>
<span>
<input type="checkbox" name="tanda_ajudan" id="tanda_ajudan" style="display: <?= htmlspecialchars($display); ?>;" <?= $checkAjudan; ?>>
</span>
<?= htmlspecialchars($r['no_register']); ?><br>
<p class="label label-danger" id="badge" style="background-color: <?= $colors ?> "><?= htmlspecialchars($r['ket_sifat']); ?></p>
<input type="hidden" name="surat_id" id="surat_id" value="<?= htmlspecialchars($surat_id); ?>">
@@ -151,7 +165,7 @@ $thn2 = $_POST['thn2'];
0 => '<span style="color:#0069D3;font-weight: 600;">Pengajuan</span>',
1 => '<span style="color:#44A2FF;font-weight: 600;">Verifikasi TU</span>',
3 => '<span style="color:#44A2FF;font-weight: 600;">Verifikasi Kabag Umum</span>',
5 => '<span style="color:#44A2FF;font-weight: 600;">Verifikasi Wadir Pelay. Medik dan Keperawatan</span>',
5 => '<span style="color:#44A2FF;font-weight: 600;">Verifikasi Wadir Pel. Medik dan Keperawatan</span>',
7 => '<span style="color:#44A2FF;font-weight: 600;">Verifikasi Wadir Pend. dan Pengemb. Mutu Pelayanan</span>',
9 => '<span style="color:#44A2FF;font-weight: 600;">Verifikasi Wadir Pelayanan Penunjang</span>',
11 => '<span style="color:#44A2FF;font-weight: 600;">Verifikasi Wadir Umum dan Keuangan</span>',
@@ -185,6 +199,7 @@ $thn2 = $_POST['thn2'];
?>
<?= $tjko == 0 ? '<i class="fa fa-ellipsis-h"></i>' : '<span style="font-family: Arial; font-weight: bold;">' . htmlspecialchars($tjko) . '</span>'; ?>
</button>
</td>
<td style="display:none"><?= htmlspecialchars($r['kirimid']); ?></td>
<td style="display:none"><?= htmlspecialchars($r['tgl_diterima']); ?></td>
@@ -217,7 +232,8 @@ $thn2 = $_POST['thn2'];
cek_satker: cek_satker,
kirimid: kirimid,
link: 's_pengesahan',
key: "pembaca"
key: "pembaca",
inbox:'pengesahan'
},
success: function(data) {
$('#modal_tl').modal('show');
@@ -260,6 +276,26 @@ $thn2 = $_POST['thn2'];
}
});
$("#tabel_data_inbox").on('click', 'input[name="tanda_ajudan"]', function() {
var suratId = $(this).closest('td').find('#surat_id').val();
var cek_satker = $('#satuan_kerja_id').val();
var idJabatan = $('#idJabatan').val();
$.ajax({
type: "POST",
url: "app/inbox_pengesahan/crud.php",
data: {
id: suratId,
idJabatan: idJabatan,
key: 'penanda_ajudan'
},
success: function(response) {
var result = JSON.parse(response);
// $("#tanda_ajudan").checked =true;
}
});
});
function updateTabelInbox() {
var sat = $('#sat').val();
var thn2 = $('#thn').val();
src/app/skeluar/crud.php
+113 -11
View File
@@ -84,10 +84,14 @@ switch ($key) {
$no_pinjam = (int) substr($no_kendali2, 0, 5);
$no_kendali = sprintf("%05s", $no_pinjam);
$data = [
'surat_id' => $id, 'perihal' => $perihal, 'kode_satker' => $kode_satker,
'surat_id' => $id,
'perihal' => $perihal,
'kode_satker' => $kode_satker,
'kode_surat' => ['kode_id' => $kode_id, 'kd_surat' => $kd_surat, 'nm_kode' => $nm_kode],
'no_register' => $no_register,
'satuan_kerja' => $satuan_kerja, 'no_kendali' => $no_kendali, 'kepada' => $kepada,
'satuan_kerja' => $satuan_kerja,
'no_kendali' => $no_kendali,
'kepada' => $kepada,
];
http_response_code(200);
echo json_encode($data);
@@ -144,6 +148,7 @@ switch ($key) {
if ($a == NULL) {
if ($j == 'kndl') {
// create no urut
$queryu = pg_query($koneksi, "SELECT COALESCE(MAX(no_urut),0) + 1 FROM surat WHERE date_part('YEAR', tgl_surat_keluar)='$thn_skrg' AND jenis_disposisi_id IN ('2','3')");
list($no_urutd) = pg_fetch_array($queryu);
$upd = pg_query($koneksi, "UPDATE surat SET kode_id='$kode_id', kepada='$kepada', uraian='$uraian', tgl_surat_keluar=NOW(),
@@ -151,21 +156,118 @@ switch ($key) {
WHERE id='$surat_id'
");
$getSurat = pg_query($koneksi, "SELECT id AS surat_id FROM surat WHERE perihal ILIKE '$perihal' AND no_register IS NOT NULL");
$id_surat = pg_fetch_result($getSurat, 0, 'surat_id');
pg_query($koneksi, "UPDATE surat SET no_surat = $no_urutd WHERE id = $id_surat");
// $getSurat = pg_query($koneksi, "SELECT id AS surat_id FROM surat
// WHERE perihal ILIKE '$perihal' AND no_register IS NOT NULL
// AND date_part('YEAR', tgl_surat_keluar)='$thn_skrg'
// ");
// $id_surat = pg_fetch_result($getSurat, 0, 'surat_id');
// _____________________________________
// $aq = pg_query($koneksi, "SELECT no_urut,no_register FROM surat WHERE perihal = '$perihal' AND date_part('YEAR', tgl_surat_keluar)='$thn_skrg' ORDER BY id DESC");
// $arr_test = [];
// // Mengisi array dengan hasil query
// while ($row = pg_fetch_assoc($aq)) {
// $arr_test[] = $row['no_urut'];
// }
// // Mengulang query lagi untuk memastikan pointer kembali ke awal
// $aqq = pg_query($koneksi, "SELECT no_urut,no_register,id as id_surat FROM surat WHERE perihal = '$perihal' AND date_part('YEAR', tgl_surat_keluar)='$thn_skrg' ORDER BY id DESC LIMIT 2");
// // Memeriksa apakah ada nilai yang sama dan menambahkannya
// while ($loop = pg_fetch_assoc($aqq)) {
// if (in_array($loop['no_urut'], $arr_test)) {
// // Cari indeks elemen yang sama dalam array
// $index = array_search($loop['no_urut'], $arr_test);
// // Tambahkan 1 pada nilai yang sama tersebut
// $no_urut = $arr_test[$index] += 1;
// $no_regSurat = $loop['no_register'];
// $id_surat = $loop['id_surat'];
// }
// }
// $getSurat = pg_query($koneksi, "SELECT id AS surat_id FROM surat
// WHERE no_register = '$no_regSurat'
// ",);
// $id_surat = pg_fetch_result($getSurat, 0, 'surat_id');
// $bu = [
// 'arr_test' => $arr_test,
// 'loop' => [
// 'a' => $no_urut,
// 'b' => [
// 'aa' => $no_regSurat,
// 'bb' => $id_surat
// ],
// 'c' => $id_surat
// ],
// 'dataBaru' => $arr_test[0]
// ];
// var_dump($id_surat);
// var_dump($bu);die();
// var_dump("UPDATE surat SET no_surat = '".$arr_test[0]."' WHERE id = '".$id_surat."'");die();
// pg_query($koneksi, "UPDATE surat SET no_surat = '".$arr_test[0]."' WHERE id = '".$id_surat."'");
// pg_query_params($koneksi, "UPDATE surat SET no_surat = $1 WHERE id = $2", array((string)$arr_test[0], $id_surat));
// Ambil semua no_urut dari tabel surat berdasarkan perihal dan tahun surat keluar
$aq = pg_query($koneksi, "SELECT no_urut, no_register FROM surat WHERE perihal = '$perihal' AND date_part('YEAR', tgl_surat_keluar) = '$thn_skrg' ORDER BY id DESC");
$arr_test = [];
// Mengisi array dengan hasil query
while ($row = pg_fetch_assoc($aq)) {
$arr_test[] = $row['no_urut'];
}
// Mengulang query dengan limit 2 untuk memeriksa duplikasi no_urut
$aqq = pg_query($koneksi, "SELECT no_urut, no_register, id AS id_surat FROM surat WHERE perihal = '$perihal' AND date_part('YEAR', tgl_surat_keluar) = '$thn_skrg' ORDER BY id DESC LIMIT 2");
$no_urut = null;
$no_regSurat = null;
$id_surat = null;
// Memeriksa apakah ada nilai yang sama dan menambahkannya
while ($loop = pg_fetch_assoc($aqq)) {
if (in_array($loop['no_urut'], $arr_test)) {
// Cari indeks elemen yang sama dalam array
$index = array_search($loop['no_urut'], $arr_test);
// Tambahkan 1 pada nilai yang sama tersebut
$no_urut = $arr_test[$index] + 1;
$no_regSurat = $loop['no_register'];
$id_surat = $loop['id_surat'];
$pg_query = pg_query($koneksi, "UPDATE surat SET no_surat = '" . $arr_test[0] . "' WHERE id = " . $id_surat . "");
}
}
// Jika id_surat ditemukan, perbarui no_surat di database
if ($id_surat) {
try {
pg_query_params($koneksi, "UPDATE surat SET no_surat = $1 WHERE id = $2", array($arr_test[0], $id_surat));
// $get_array_query = pg_fetch_array($pg_query);
// var_dump($get_array_query);
// var_dump("UPDATE surat SET no_surat = '" . $arr_test[0] . "' WHERE id = " . $id_surat . "");
} catch (Exception $e) {
//throw $th;
var_dump($e->getMessage());
}
}
} else {
$upd = pg_query($koneksi, "UPDATE surat SET kode_id='$kode_id', kepada='$kepada', uraian='$uraian', tgl_surat_keluar=NOW(), jam_kirim=NOW(),
tujuan_id='$tujuan_id', balasan='$balasan', konten='$konten', satuan_kerja_dari='$satuan_kerja_dari', perihal='$perihal'
WHERE id='$surat_id'
");
tujuan_id='$tujuan_id', balasan='$balasan', konten='$konten', satuan_kerja_dari='$satuan_kerja_dari', perihal='$perihal'
WHERE id='$surat_id'
");
}
} else {
if ($j == 'kndl') {
$upd = pg_query($koneksi, "UPDATE surat SET
kode_id='$kode_id', kepada='$kepada', uraian='$uraian', tgl_surat_keluar=NOW(),
jam_kirim=NOW(), tujuan_id='$tujuan_id', balasan='$balasan'
WHERE id='$surat_id'
kode_id='$kode_id', kepada='$kepada', uraian='$uraian', tgl_surat_keluar=NOW(),
jam_kirim=NOW(), tujuan_id='$tujuan_id', balasan='$balasan'
WHERE id='$surat_id'
");
} else {
/*$upd=pg_query($koneksi,"UPDATE surat SET
src/app/skeluar/main.php
+1 -1
View File
@@ -50,7 +50,7 @@ $thn = date('Y');
<div class="row">
<div class="col-lg-4">
<button type="button" class="btn btn-danger btn-rounded" id="tambah_skeluar"><i class="fa fa-plus m-r-5"></i>Surat Keluar</button>
<button type="button" class="btn btn-success btn-rounded" id="tambah_sertifikat"><i class="fa fa-plus m-r-5"></i>Surat Sertifikat</button>
<!-- <button type="button" class="btn btn-success btn-rounded" id="tambah_sertifikat"><i class="fa fa-plus m-r-5"></i>Surat Sertifikat</button> -->
</div>
<div class="col-lg-5">
<div class="input-group my-group" style="margin-left:-60px">
src/app/skeluar/modal.php
+9 -3
View File
@@ -84,7 +84,7 @@ $sess_satker = $_POST['sess_satker'];
<br>
<div class="form-group">
<input type="hidden" id="surat_id" value="<?php echo $id; ?>">
<input type="hidden" id="surat_id" value="<?php echo $id; ?>">
<label>Perihal</label>
<input type="text" class="form-control" id="perihal" value="<?php echo $perihal; ?>">
@@ -305,10 +305,16 @@ $sess_satker = $_POST['sess_satker'];
$('#pengolah').val(result.kode_satker + ' / ' + result.satuan_kerja);
$('#no_kendali').val(result.no_kendali);
$('#surat_id').val(result.surat_id);
$('#kode_id').val(result.kode_surat.kd_surat + ' - ' + result.kode_surat.nm_kode);
// $('#kode_id').val(result.kode_surat.kd_surat + ' - ' + result.kode_surat.nm_kode);
if (result.kode_surat && result.kode_surat.kd_surat && result.kode_surat.nm_kode) {
$('#kode_id').val(result.kode_surat.kd_surat + ' - ' + result.kode_surat.nm_kode);
} else {
$('#kode_id').val(''); // Kosongkan input jika hasilnya null
}
$('#pengolah').prop('disabled', true);
$('#perihal').prop('disabled', true);
$('#kode_id').prop('disabled', true);
// $('#kode_id').prop('disabled', true);
}
}
src/app/spengesahan/table.php
+1 -1
View File
@@ -108,7 +108,7 @@ $thn2 = $_POST['thn2'] ?? '';
0 => 'Pengajuan',
1 => 'Verifikasi TU',
3 => 'Verifikasi Kabag Umum',
5 => 'Verifikasi Wadir Pelay. Medik dan Keperawatan',
5 => 'Verifikasi Wadir Pel. Medik dan Keperawatan',
7 => 'Verifikasi Wadir Pend. dan Pengemb. Mutu Pelayanan',
9 => 'Verifikasi Wadir Pelayanan Penunjang',
11 => 'Verifikasi Wadir Umum dan Keuangan',
src/app/tindaklanjut/js/main.js
+5 -1
View File
@@ -60,9 +60,13 @@ $('button[name="kepada_inbox"]').click(function () {
var surat_id = $('#surat_id_tl').val();
var jabatan_pegawai_id_tl = $('#jabatan_pegawai_id_tl').val();
var flag_pengesahan = $('#flag_pengesahan').val();
var satker_pemilik_surat = $('#satker_pemilik_surat').val();
$('#tabel_komen').load("app/tindaklanjut/tabel_komen.php", {
surat_id: surat_id,
jabatan_pegawai_id_tl: jabatan_pegawai_id_tl
jabatan_pegawai_id_tl: jabatan_pegawai_id_tl,
satker_pemilik_surat: satker_pemilik_surat,
flag_pengesahan : flag_pengesahan
});
var jmlsm = $('#jmlsm').val();
var jmlter = $('#jmlter').val();
src/app/tindaklanjut/main.php
+17 -11
View File
@@ -1,3 +1,6 @@
<?php if (session_status() == PHP_SESSION_NONE) {
session_start();
} ?>
<script src="assets/vendor/sweetalert2/sweetalert2.all.min.js"></script>
<style>
.modal-backdrop {
@@ -36,7 +39,6 @@ $dayList = array(
'Sat' => 'Sabtu'
);
$id = $_POST['id'];
$kirimid = $_POST['kirimid'];
$surat_id = $_POST['surat_id'];
@@ -45,7 +47,6 @@ while ($r = pg_fetch_array($d)) {
$tgl_surat_keluar = $r['tgl_surat_keluar'];
$satker_pemilik_surat = $r['satuan_kerja_id'];
}
$surat_query = pg_query($koneksi, "SELECT s.no_surat,ss.sifat AS sifat_surat, js.jenis AS jenis_surat,s.pengesahan,k.id AS kode_id, k.kode AS kode_surat,
k.keterangan AS kode_keterangan,jbtn.nama AS penandatangan, ss.id AS sifat_id, js.id AS jenis_id, jbtn.id AS jbtn_id, s.stts_kendali
FROM surat s
@@ -65,12 +66,14 @@ if (($tgl_surat_keluar == null) || ($tgl_surat_keluar == '')) {
} else {
$tgl_surat_keluar1 = date('d', strtotime($tgl_surat_keluar)) . ' ' . $bulan[date('m', strtotime($tgl_surat_keluar))] . ' ' . date('Y', strtotime($tgl_surat_keluar)) . ' ' . date('H:i', strtotime($tgl_surat_keluar));
}
$jb = pg_query($koneksi, "SELECT j.id,j.nama
FROM data_user k
INNER JOIN jabatan_pegawai j ON (j.id=k.jabatan_pegawai_id)
INNER JOIN satuan_kerja s ON (s.id=k.satuan_kerja_id)
WHERE s.id=$cek_satker");
$jb = pg_query($koneksi, "SELECT jbtn.id, jbtn.nama
FROM data_user users
INNER JOIN jabatan_pegawai jbtn ON (jbtn.id = users.jabatan_pegawai_id)
INNER JOIN satuan_kerja satker ON (satker.id = users.satuan_kerja_id)
WHERE satker.id = $cek_satker
ORDER BY jbtn.id ASC
LIMIT 1;
");
while ($rjb = pg_fetch_array($jb)) {
$jabatan_pegawai_id = $rjb[0];
}
@@ -89,7 +92,6 @@ $jb2 = pg_query($koneksi, "SELECT t.jabatan_untuk,k.isi FROM teruskan t INNER JO
while ($rjb2 = pg_fetch_array($jb2)) {
$jab_terakir = $rjb2[0];
}
$jb3 = pg_query($koneksi, "SELECT COUNT(*) FROM teruskan WHERE surat_id=$id");
while ($rjb3 = pg_fetch_array($jb3)) {
$jmlter = $rjb3[0];
@@ -316,7 +318,7 @@ while ($row = pg_fetch_assoc($query_penandatangan)) {
</div>
<br>
<div id="inkomen">
<div id="inkomen" style="display: <?= ((int)$surat['stts_kendali'] == 13) ? 'none' : '' ?>;">
<?php if ($key != 'kirim_awal' && !((int)$cek_satker == 11 && $_POST['link'] == 's_pengesahan')) { ?>
<div class="row">
<div class="col-lg-12">
@@ -329,7 +331,11 @@ while ($row = pg_fetch_assoc($query_penandatangan)) {
<br>
<?php } ?>
<?php
$display = ($cek_satker != $satker_pemilik_surat || $cek_satker == '172') ? 'block' : 'none' ?>
// 771 adalah id Jabatan KBU, dan 821 adalah plt KBU
$display = (($cek_satker != $satker_pemilik_surat) || in_array($_SESSION['idJabatan'], [771, 821])) ? 'block' : 'none';
$display = ($_POST['inbox'] == 'pengesahan') ? 'block' : 'none';
?>
<div class="form-group" style="display: <?= $display ?>;">
<textarea class="form-control" id="komen" name="message" rows="2" placeholder="Bagaimana tanggapan anda ?" required=""></textarea>
</div>
src/app/tindaklanjut/tabel_komen.php
+39 -6
View File
@@ -1,3 +1,4 @@
<?php session_start() ?>
<script>
$('button[name="jpg_kirim_tl"]').popover();
$('button[name="file_kirim_tl"]').popover();
@@ -7,6 +8,8 @@
include('../koneksi.php');
$surat_id = $_POST['surat_id'];
$jabatan_pegawai_id_tl = $_POST['jabatan_pegawai_id_tl'];
$flag_pengesahan = $_POST['flag_pengesahan'];
$satker_pemilik_surat = $_POST['satker_pemilik_surat'];
$bulan = array(
'01' => 'Januari',
'02' => 'Februari',
@@ -38,18 +41,19 @@ $dayList = array(
$d = pg_query(
$koneksi,
"SELECT k.id,k.jabatan_pegawai_id,k.tanggal,k.komen,k.induk_id,
j.nama as nama_jabatan,t.jabatan_untuk,j1.nama as jabuntuk,r.isi,r.id as kirimid
j.nama as nama_jabatan,t.jabatan_untuk,j1.nama as jabuntuk,r.isi,r.id as kirimid,srt.stts_kendali
FROM komen k
INNER JOIN teruskan t ON (k.id=t.komen_id)
INNER JOIN jabatan_pegawai j ON (j.id=k.jabatan_pegawai_id)
INNER JOIN jabatan_pegawai j1 ON (j1.id=t.jabatan_untuk)
INNER JOIN kirim r ON (r.id=t.kirim_id_untuk)
INNER JOIN surat srt ON k.surat_id = srt.id
WHERE k.surat_id=$surat_id AND k.induk_id IS NULL
AND r.isi IS NULL
AND r.isi IS NULL
ORDER BY id DESC,t.kirim_id_untuk ASC"
);
$no = 0;
while ($r = pg_fetch_array($d)) {
// var_dump();
$komen_id = $r['id'];
$tanggal = $r['tanggal'];
$jbid = $r['jabatan_pegawai_id'];
@@ -114,13 +118,39 @@ $dayList = array(
</tr>
<?php
}
// tinggal validasi tampil komen
$tampil = '';
if ($flag_pengesahan != '1') {
$tampil = 'block';
} else {
$get_pengirim = pg_query($koneksi, "SELECT satuan_kerja_id FROM surat WHERE id=$surat_id AND pengesahan =1");
$result = pg_fetch_assoc($get_pengirim);
// var_dump($result);
// var_dump($_SESSION['satker']);
// var_dump($no);
if ($result['satuan_kerja_id'] == $_SESSION['satker']) {
if ($no == 0) {
$tampil = 'block';
} else {
$tampil = 'none';
}
} else {
$tampil = 'block';
}
// if(in_array($r['stts_kendali'], [13, 99])){$tampil='block';
// }else{
// $tampil='none';
// }
// if(){}else{}
// $tampil = 'none';
}
?>
</table><br>
<div class="isi_komen" id="isi_komen<?php echo $r['id']; ?>">
<div class="portlet">
<div class="portlet" style="display: <?= $tampil; ?>;">
<div id="bg-default" class="panel-collapse collapse in">
<div class="portlet-body">
<p id="txtkomen<?php echo $r['id']; ?>" style="font-family:InterSB;color:black"><?php echo '" ' . $r['komen'] . ' "'; ?></p>
<p id="txtkomen<?php echo $r['id']; ?>" style="font-family:InterSB;color:black"><?= $r['komen'] ?></p>
</div>
</div>
</div>
@@ -194,6 +224,7 @@ $dayList = array(
</li>
<?php
$no++;
}
?>
</ul>
@@ -390,7 +421,9 @@ while ($rkmn = pg_fetch_array($kmn)) {
$.ajax({
type: "POST",
url: "app/tindaklanjut/modal_vfile.php",
data:{id:id},
data: {
id: id
},
success: function(data) {
$('#modal_body_file').html(data);
$('#judul_modal_file').html('View Lampiran File');
src/menu.php
+23 -18
View File
@@ -1,5 +1,9 @@
<?php session_start();
include('app/koneksi.php'); ?>
<?php
session_start();
include('app/koneksi.php');
?>
<!DOCTYPE html>
<html>
@@ -261,21 +265,22 @@ include('app/koneksi.php'); ?>
</div>
<input type="hidden" id="cek_nama" value="<?php echo $_SESSION['username']; ?>">
<input type="hidden" id="cek_password" value="<?php echo $_SESSION['pass']; ?>">
<input type="hidden" id="cek_data_user_id" value="<?php echo $_SESSION['idUser']; ?>">
<input type="hidden" id="cek_nampeg" value="<?php echo $_SESSION['namaPegawai']; ?>">
<input type="hidden" id="cek_jabatan_id" value="<?php echo $_SESSION['idJabatan']; ?>">
<input type="hidden" id="cek_jabatan" value="<?php echo $_SESSION['jabatan']; ?>">
<input type="hidden" id="cek_satker_nama" value="<?php echo $_SESSION['nama_satker']; ?>">
<input type="hidden" id="cek_satker" value="<?php echo $_SESSION['satker']; ?>"> <!-- ID SATKER -->
<input type="hidden" id="cek_jenis" value="<?php echo $_SESSION['jenis']; ?>">
<input type="hidden" id="cek_nama" value="<?= $_SESSION['username']; ?>">
<input type="hidden" id="cek_password" value="<?= $_SESSION['pass']; ?>">
<input type="hidden" id="cek_data_user_id" value="<?= $_SESSION['idUser']; ?>">
<input type="hidden" id="cek_nampeg" value="<?= $_SESSION['namaPegawai']; ?>">
<input type="hidden" id="cek_jabatan_id" value="<?= $_SESSION['idJabatan']; ?>">
<input type="hidden" id="cek_jabatan" value="<?= $_SESSION['jabatan']; ?>">
<input type="hidden" id="cek_satker_nama" value="<?= $_SESSION['nama_satker']; ?>">
<input type="hidden" id="cek_satker" value="<?= $_SESSION['satker']; ?>"> <!-- ID SATKER -->
<input type="hidden" id="cek_jenis" value="<?= $_SESSION['jenis']; ?>">
<!-- LOGO -->
<div class="topbar-left" style="background-color:#f3f3f3;width: 5%;" id="compose">
<a href="#" class="logo"><img style="padding:10px;margin-left:10px; width: 100%;" src="assets/images/logo_rssa2.png"></a>
</div>
<!-- Button mobile view to collapse sidebar menu -->
<div class="navbar navbar-default" role="navigation" style="margin-left:5%">
@@ -331,7 +336,7 @@ include('app/koneksi.php'); ?>
<!-- ========== Left Sidebar Start ========== -->
<div class="left side-menu" style="background-color:white;width: 290px;">
<div class="left side-menu" style="background-color:white;">
<div class="sidebar-inner slimscrollleft">
<!--- Sidemenu -->
<div id="sidebar-menu"><br><br><br><br><br><br><br>
@@ -406,7 +411,7 @@ include('app/koneksi.php'); ?>
?>
<li class="has_sub" style=" margin-left: 10px;padding: 7px;">
<a href="#" class="waves-effect" style="color:#707071" id="s_pengesahan">
<i class="fa fa-circle" style="font-size: x-small;"></i> <span>Pengajuan Pengesahan</span>
<i class="fa fa-circle" style="font-size: x-small;"></i> <span>Pengesahan</span>
</a>
</li>
<?php }
@@ -436,14 +441,14 @@ include('app/koneksi.php'); ?>
</div>
</div> -->
<button class="collapsible has_sub" style="padding-left: 25px;"><i class="mdi mdi-email-outline" style="margin-right: 20px;"></i>
<span class="label label-danger pull-right" id="all_inbox_smasuk" style="margin-left: 20px;"></span>Surat Masuk</button>
<button class="collapsible has_sub" style="padding-left: 25px;"><i class="mdi mdi-email-outline" style="margin-right: 15px;"></i>
<span class="label label-danger pull-right" id="all_inbox_smasuk" ></span>Surat Masuk</button>
<!-- <button class="collapsible has_sub" style="padding-left: 25px;"><i class="mdi mdi-email-outline" style="margin-right: 20px;"></i>
<span class="label label-danger pull-right" id="all_inbox_smasuk" style="margin-left: 10px;"></span>Masuk</button> -->
<div class="contain">
<li class="has_sub" style="margin-left: 10px;padding: 7px;">
<a href="#" class="waves-effect" style="color:#707071" id="inbox"><i class="fa fa-circle" style="font-size: x-small;"></i>
<span class="label label-danger pull-right" id="not_inbox" style="margin-left: 10px;"></span><span>Surat </span>
<span class="label label-danger pull-right" id="not_inbox" style="margin-left: 6px;"></span><span>Surat </span>
</a>
</li>
<?php
@@ -466,7 +471,7 @@ include('app/koneksi.php'); ?>
<a href="#" class="waves-effect" style="color:#707071" id="inbox_pengesahan" id="inbox_pengesahan">
<i class="fa fa-circle" style="font-size: x-small;"></i>
<span class="label label-danger pull-right" id="not_inbox_pengesahan" style="margin-left: 10px;"></span>
<span>Pengajuan Pengesahan</span>
<span>Pengesahan</span>
</a>
</li>
<?php }
@@ -588,7 +593,7 @@ include('app/koneksi.php'); ?>
<div class="content-page">
<div class="content">
<div class="container" id="main_tag" style="margin-left: 70px;"></div> <!-- container -->
<div class="container" id="main_tag" style="margin-left: 30px;"></div> <!-- container -->
</div> <!-- content -->
<!--
<footer class="footer text-right">