perbaikan ui kirim surat belum fix
This commit is contained in:
+6
-6
@@ -41,7 +41,7 @@ $("#tabel_data_kirim").DataTable({"paging": true,"lengthChange": true,"searching
|
||||
</thead>
|
||||
<tbody style="color:black">
|
||||
<?php
|
||||
$data=pg_query("SELECT tgl_surat_keluar,perihal,satuan_kerja_id,id,tgl_kirim,no_surat FROM surat WHERE satuan_kerja_id='$satuan_kerja_id'
|
||||
$data=pg_query($koneksi,"SELECT tgl_surat_keluar,perihal,satuan_kerja_id,id,tgl_kirim,no_surat FROM surat WHERE satuan_kerja_id='$satuan_kerja_id'
|
||||
AND jenis_surat_id='3' AND jenis_disposisi_id='3' AND COALESCE(tahun,'') <> 'batal'
|
||||
".($thn2 == '' ? "" : "AND EXTRACT(YEAR FROM DATE(tgl_surat_keluar))='$thn2'")."
|
||||
".($bln2 == '0' ? "" : "AND EXTRACT(MONTH FROM DATE(tgl_surat_keluar))='$bln2'")."
|
||||
@@ -82,12 +82,12 @@ $("#tabel_data_kirim").DataTable({"paging": true,"lengthChange": true,"searching
|
||||
/*$o=pg_query("SELECT jabatan_untuk FROM teruskan WHERE surat_id=$surat_id AND id=(SELECT MAX(id) FROM teruskan WHERE surat_id=$surat_id)");
|
||||
while($ro=pg_fetch_array($o)) {$to=$ro[0];}*/
|
||||
|
||||
$o=pg_query("SELECT t.jabatan_untuk FROM teruskan t INNER JOIN kirim k ON (k.id=t.kirim_id_untuk) WHERE t.surat_id=$surat_id
|
||||
$o=pg_query($koneksi,"SELECT t.jabatan_untuk FROM teruskan t INNER JOIN kirim k ON (k.id=t.kirim_id_untuk) WHERE t.surat_id=$surat_id
|
||||
AND k.isi IS NULL AND t.id=(SELECT MAX(t2.id) FROM teruskan t2 INNER JOIN kirim k2 ON (k2.id=t2.kirim_id_untuk) WHERE t2.surat_id=$surat_id
|
||||
AND k2.isi IS NULL)");
|
||||
while($ro=pg_fetch_array($o)) {$to=$ro[0];}
|
||||
|
||||
$p=pg_query("SELECT u.jabatan_pegawai_id FROM data_user u INNER JOIN jabatan_pegawai j ON (j.id=u.jabatan_pegawai_id) WHERE u.satuan_kerja_id=$satuan_kerja_id");
|
||||
$p=pg_query($koneksi,"SELECT u.jabatan_pegawai_id FROM data_user u INNER JOIN jabatan_pegawai j ON (j.id=u.jabatan_pegawai_id) WHERE u.satuan_kerja_id=$satuan_kerja_id");
|
||||
while($rp=pg_fetch_array($p)) {$tp=$rp[0];}
|
||||
?>
|
||||
|
||||
@@ -124,7 +124,7 @@ $("#tabel_data_kirim").DataTable({"paging": true,"lengthChange": true,"searching
|
||||
>
|
||||
<?php
|
||||
if ($to!=$tp) {
|
||||
$jko=pg_query("SELECT COUNT(*) FROM komen WHERE surat_id=$surat_id");
|
||||
$jko=pg_query($koneksi,"SELECT COUNT(*) FROM komen WHERE surat_id=$surat_id");
|
||||
while($rjko=pg_fetch_array($jko)) {$tjko=$rjko[0];}
|
||||
?>
|
||||
<?php if ($tjko==0) { ?>
|
||||
@@ -144,11 +144,11 @@ $("#tabel_data_kirim").DataTable({"paging": true,"lengthChange": true,"searching
|
||||
</button>
|
||||
-->
|
||||
|
||||
<?php if ($tn>0) { ?>
|
||||
|
||||
<!--<button type="button" name="start_kirim" style="height:22px;"class="btn btn-inverse btn-xs start_kirim" id="<?php echo $r[3];?>" data-content="File" rel="popover" data-placement="top" data-trigger="hover"
|
||||
><i class="fa fa-arrow-right m-r-5"></i>KIRIM
|
||||
</button>-->
|
||||
<?php } else {} ?>
|
||||
|
||||
</td>
|
||||
<td style="display:none" class="xq<?php echo $r[3];?>"><?php echo $tj; ?></td> <!-- 6 -->
|
||||
<td style="display:none" class="xr<?php echo $r[3];?>"><?php echo $tm; ?></td> <!-- 7 -->
|
||||
|
||||
Reference in New Issue
Block a user