Merge branch 'rebuild_eletter' of https://git.rssa.top/dwi.firman/eletter into rebuild_eletter

src/app/spengesahan/modal_edit.php

@@ -39,7 +39,7 @@ while ($row = pg_fetch_assoc($query_kdSurat)) {
 $penandatangan = '';
 $query_penandatangan = $penandatangan_id !== ''
   ? pg_query_params($koneksi, 'SELECT id,nama FROM jabatan_pegawai WHERE id = $1', array($penandatangan_id))
-  : pg_query($koneksi, 'SELECT id,nama FROM jabatan_pegawai WHERE id IN (14,661,662,663,664) ORDER BY id ASC;');
+  : pg_query($koneksi, 'SELECT id,nama FROM jabatan_pegawai WHERE id IN (14,661,662,663,664,821) ORDER BY id ASC;');
 while ($row = pg_fetch_assoc($query_penandatangan)) {
   $penandatangan .= "<option value='" . $row['id'] . "'>" . $row['nama'] . "</option>";
 }

src/app/tindaklanjut/crud.php

@@ -15,7 +15,6 @@ switch ($key) {
         $satuan_kerja_penginput = $_POST['satuan_kerja_penginput'];
         $komen = $_POST['komen'];
         $file = $_FILES['file'];
-        // var_dump($file);die();
         $allowed_types = array(
             'application/pdf',
             'application/msword',

src/app/tindaklanjut/js/main.js

@@ -247,29 +247,36 @@ $('#batal_retur').click(function () {
         url: 'app/spengesahan/controller.php',
         data: { surat_id: surat_id, satuan_kerja_penginput: csatker, key: key },
         success: function (response) {
+            $('#notif_jd9').text('');
         }
     });
 });
 
 $('#save_retur').click(function () {
+    var formData = new FormData();
     var surat_id = $('#surat_id_tl').val();
     var jabatan_pegawai_id = $('#jabatan_pegawai_id_tl').val();
     var komen = $('#komen').val();
     var satuan_kerja_penginput = $('#csatker').val();
+    var fileInput = $('#lamp_dok')[0].files[0];
+
+    formData.append('surat_id', surat_id);
+    formData.append('jabatan_pegawai_id', jabatan_pegawai_id);
+    formData.append('satuan_kerja_penginput', satuan_kerja_penginput);
+    formData.append('komen', komen);
+    formData.append('stts_kendali', 99);
+    formData.append('key', 'simpan_komen');
+    formData.append('file', fileInput);
+
     if ((!komen)) {
         infoToast('error', 'Tanggapan harus diisi..!!');
     } else {
         $.ajax({
             type: "POST",
             url: "app/tindaklanjut/crud.php",
-            data: {
+            data: formData,
-                surat_id: surat_id,
+            processData: false,
-                jabatan_pegawai_id: jabatan_pegawai_id,
+            contentType: false,
-                satuan_kerja_penginput: satuan_kerja_penginput,
-                komen: komen,
-                stts_kendali: 99,
-                key: 'simpan_komen'
-            },
             success: function (data) {
                 infoToast('success', 'Data Sudah Tersimpan..!!');
                 $('#tabel_komen').load("app/tindaklanjut/tabel_komen.php", {
@@ -291,10 +298,10 @@ $('#selesai_komen').click(function () {
     var key = "selesai_kepada_tl";;
     var komen = $('#komen').val();
     // if (csatker == 11) {
-        if ($('#lbl_file_up').text() === '') {
+    if ($('#lbl_file_up').text() === '') {
-            infoToast('error', 'Mohon untuk Melampirkan Dokumen..!!');
+        infoToast('error', 'Mohon untuk Melampirkan Dokumen..!!');
-            return;
+        return;
-        }
+    }
     // }
     if (komen == '') {
         infoToast('error', 'Tanggapan Harus Teriisi..!!');
@@ -356,7 +363,7 @@ function simpan_komen_selesai() {
     formData.append('satuan_kerja_penginput', csatker);
     formData.append('komen', komen);
     formData.append('key', 'simpan_komen');
-    formData.append('key2','selesai');
+    formData.append('key2', 'selesai');
     formData.append('file', fileInput);
 
     $('#tabel_kepada_kr').load('app/tindaklanjut/tabel_kepada.php', {
@@ -371,7 +378,7 @@ function simpan_komen_selesai() {
         contentType: false,
         success: function (response) {
             var result = JSON.parse(response);
-           
+
             infoToast(result.icon, result.message);
             $('#tabel_komen').load("app/tindaklanjut/tabel_komen.php", {
                 surat_id: surat_id,
@@ -512,7 +519,7 @@ $('button[name="simpan_no_surat"]').click(function () {
                 $(".no_surat_label").text(result.data.no_surat);
                 $('#no_surat_tl').hide()
                 $('button[name="simpan_no_surat"]').hide()
-            }, 
+            },
             error: function (xhr) {
                 var result = JSON.parse(xhr.responseText);
                 infoToast(result.icon, result.message);

src/app/tindaklanjut/main.php

@@ -47,7 +47,7 @@ while ($r = pg_fetch_array($d)) {
 }
 
 $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
+                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
                 INNER JOIN sifat_surat ss ON s.sifat_surat_id = ss.id 
                 INNER JOIN jenis_surat js ON s.jenis_surat_id = js.id
@@ -191,7 +191,7 @@ while ($row = pg_fetch_assoc($query_kdSurat)) {
 }
 
 $penandatangan = '';
-$query_penandatangan = pg_query($koneksi, 'SELECT id,nama FROM jabatan_pegawai WHERE id IN (14,661,662,663,664) ORDER BY id ASC;');
+$query_penandatangan = pg_query($koneksi, 'SELECT id,nama FROM jabatan_pegawai WHERE id IN (14,661,662,663,664,821) ORDER BY id ASC;');
 while ($row = pg_fetch_assoc($query_penandatangan)) {
     $penandatangan .= "<option value='" . $row['id'] . "'>" . $row['nama'] . "</option>";
 }
@@ -231,7 +231,7 @@ while ($row = pg_fetch_assoc($query_penandatangan)) {
                                 <span style="font-weight: normal;" class="no_surat_label"><?= $surat['no_surat'] ?></span>
                             </p>
                             <?php if ($cek_satker == 66) { ?>
-                                <div style="display: 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'] ?>">
                                     <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>

src/menu.php

@@ -1,4 +1,5 @@
-<?php session_start();include('app/koneksi.php'); ?>
+<?php session_start();
+include('app/koneksi.php'); ?>
 <!DOCTYPE html>
 <html>
 
@@ -402,7 +403,7 @@
                                     $queryu = pg_query($koneksi, "SELECT id FROM role_access WHERE satker_id = $role_satker_id");
                                     $result = pg_fetch_assoc($queryu);
                                     if (!empty($result) && !is_null($result['id'])) {
-                                        ?>
+                                ?>
                                         <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>
@@ -445,13 +446,23 @@
                                         <span class="label label-danger pull-right" id="not_inbox" style="margin-left: 10px;"></span><span>Surat </span>
                                     </a>
                                 </li>
-                                <li class="has_sub" style=" margin-left: 10px;padding: 7px;">
+                                <?php
-                                    <a href="#" class="waves-effect" style="color:#707071" id="inbox_pengesahan" id="inbox_pengesahan">
+                                if (isset($_SESSION['satker']) && is_numeric($_SESSION['satker'])) {
-                                        <i class="fa fa-circle" style="font-size: x-small;"></i>
+                                    $role_satker_id = (int)$_SESSION['satker'];
-                                        <span class="label label-danger pull-right" id="not_inbox_pengesahan" style="margin-left: 10px;"></span>
+                                    $queryu = pg_query($koneksi, "SELECT id FROM role_access WHERE satker_id = $role_satker_id");
-                                        <span>Pengajuan Pengesahan</span>
+                                    $result = pg_fetch_assoc($queryu);
-                                    </a>
+                                    if (!empty($result) && !is_null($result['id']) || in_array($_SESSION['satker'],[66, 172, 11, 71, 72, 73, 74])) {
-                                </li>
+                                ?>
+                                        <li class="has_sub" style=" margin-left: 10px;padding: 7px;">
+                                            <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>
+                                            </a>
+                                        </li>
+                                <?php }
+                                } ?>
+
                             </div>
 
                         <?php

src/supervisord.pid

@@ -0,0 +1 @@
+1