diff --git a/app/inbox/main.php b/app/inbox/main.php index 413167a..b1ae2e2 100644 --- a/app/inbox/main.php +++ b/app/inbox/main.php @@ -3,8 +3,8 @@ include('../koneksi.php'); $bln_auto = date('m'); $thn_auto = date('Y'); -$disp_bln = $_POST['disp_bln']; -$disp_thn = $_POST['disp_thn']; +$disp_bln = $_POST['disp_bln'] ?? null; +$disp_thn = $_POST['disp_thn'] ?? null; if (($disp_bln == NULL) || ($disp_bln == '')) { $bln = $bln_auto; @@ -218,12 +218,10 @@ if (($disp_thn == NULL) || ($disp_thn == '')) { var satker_count = $('#cek_satker').val(); } - $.ajax({ type: "POST", url: "app/inbox/count.php", - data: 'thn_count=' + thn_count + - '&satker_count=' + satker_count, + data: {thn_count:thn_count,satker_count:satker_count}, success: function(data) { var b = data.split('^'); if (b[0] == 0) { diff --git a/app/inbox/tabel.php b/app/inbox/tabel.php index 18ccaf1..614e889 100644 --- a/app/inbox/tabel.php +++ b/app/inbox/tabel.php @@ -72,34 +72,35 @@ $thn2 = $_POST['thn2']; /* * TERBARU :: 10/12/2021 - $data=pg_query("SELECT r.lama,s.perihal,s.satuan_kerja_id,s.id,j.nama,r.proses_tu - 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) - INNER JOIN kirim r ON (s.id=r.surat_id) - WHERE r.satuan_kerja_tujuan='$satuan_kerja_id' - AND s.jenis_surat_id='3' AND s.jenis_disposisi_id='3' AND r.lama IS NOT NULL - ORDER BY r.lama DESC - "); + $data=pg_query("SELECT r.lama,s.perihal,s.satuan_kerja_id,s.id,j.nama,r.proses_tu + 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) + INNER JOIN kirim r ON (s.id=r.surat_id) + WHERE r.satuan_kerja_tujuan='$satuan_kerja_id' + AND s.jenis_surat_id='3' AND s.jenis_disposisi_id='3' AND r.lama IS NOT NULL + ORDER BY r.lama DESC + "); */ /* * OPTIMIZER 10/12/2021 */ $data = pg_query($koneksi, "SELECT r.lama,s.perihal,s.satuan_kerja_id,s.id,j.nama,r.proses_tu,COUNT(kg.*), -(SELECT COUNT(kh.*) FROM scan kh WHERE LOWER(kh.file) NOT LIKE '%jpg' AND kh.surat_id=s.id),s.no_surat,r.id as kirimid,r.tgl_diterima,r.isi -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) -INNER JOIN kirim r ON (s.id=r.surat_id) -LEFT OUTER JOIN (SELECT k.* FROM scan k WHERE LOWER(k.file) LIKE '%jpg') kg ON (s.id=kg.surat_id) -WHERE r.satuan_kerja_tujuan='$satuan_kerja_id' AND (s.satuan_kerja_id <> r.satuan_kerja_tujuan) -AND s.jenis_surat_id='3' AND s.jenis_disposisi_id='3' AND r.lama IS NOT NULL AND r.dis_baca IS NULL AND COALESCE(s.tahun,'') <> 'batal' -" . ($thn2 == '' ? "" : "AND EXTRACT(YEAR FROM DATE(r.lama))='$thn2'") . " -" . ($bln2 == '0' ? "" : "AND EXTRACT(MONTH FROM DATE(r.lama))='$bln2'") . " -GROUP BY r.lama,s.perihal,s.satuan_kerja_id,s.id,j.nama,r.proses_tu,r.id -ORDER BY r.lama DESC -"); + (SELECT COUNT(kh.*) FROM scan kh WHERE LOWER(kh.file) NOT LIKE '%jpg' + AND kh.surat_id=s.id),s.no_surat,r.id as kirimid,r.tgl_diterima,r.isi + 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) + INNER JOIN kirim r ON (s.id=r.surat_id) + LEFT OUTER JOIN (SELECT k.* FROM scan k WHERE LOWER(k.file) LIKE '%jpg') kg ON (s.id=kg.surat_id) + WHERE r.satuan_kerja_tujuan='$satuan_kerja_id' AND (s.satuan_kerja_id <> r.satuan_kerja_tujuan) + AND s.jenis_surat_id='3' AND s.jenis_disposisi_id='3' AND r.lama IS NOT NULL AND r.dis_baca IS NULL AND COALESCE(s.tahun,'') <> 'batal' + " . ($thn2 == '' ? "" : "AND EXTRACT(YEAR FROM DATE(r.lama))='$thn2'") . " + " . ($bln2 == '0' ? "" : "AND EXTRACT(MONTH FROM DATE(r.lama))='$bln2'") . " + GROUP BY r.lama,s.perihal,s.satuan_kerja_id,s.id,j.nama,r.proses_tu,r.id + ORDER BY r.lama DESC + "); while ($r = pg_fetch_array($data)) { $dsa = $r['id']; @@ -108,16 +109,16 @@ ORDER BY r.lama DESC $isi = $r['isi']; $surat_id = $r[3]; /* - $l=pg_query("SELECT COUNT(*) - FROM scan k INNER JOIN surat s ON (k.surat_id=s.id) - WHERE k.surat_id='$dsa' AND LOWER(k.file) LIKE '%jpg'"); - while($rl=pg_fetch_array($l)) {$tj=$rl[0];} + $l=pg_query("SELECT COUNT(*) + FROM scan k INNER JOIN surat s ON (k.surat_id=s.id) + WHERE k.surat_id='$dsa' AND LOWER(k.file) LIKE '%jpg'"); + while($rl=pg_fetch_array($l)) {$tj=$rl[0];} - $m=pg_query("SELECT COUNT(*) - FROM scan k INNER JOIN surat s ON (k.surat_id=s.id) - WHERE k.surat_id='$dsa' AND LOWER(k.file) NOT LIKE '%jpg'"); - while($rm=pg_fetch_array($m)) {$tk=$rm[0];} - */ + $m=pg_query("SELECT COUNT(*) + FROM scan k INNER JOIN surat s ON (k.surat_id=s.id) + WHERE k.surat_id='$dsa' AND LOWER(k.file) NOT LIKE '%jpg'"); + while($rm=pg_fetch_array($m)) {$tk=$rm[0];} + */ ?>