fixed git ignore

.gitignore

@@ -6,4 +6,7 @@
 !**/cache/v3
 
 # ignore mysql.php
-**/mysql.php
+**/mysql.php
+
+# ignore old
+**/old/

emusrenbang/apps/js/usul/tjslp.js

@@ -16,15 +16,15 @@ var MUsulTJSLPJS = {
     KODE: '',
 
     loading: function(){
-        $('#butKEC').click(function(){
+        $('#butKEC').click(() => {
             if ($('#KecID').val()>0) this.show_hide(1);
-        }.bind(this));
+        });
-        $('#butKEL').click(function(){
+        $('#butKEL').click(() => {
             if ($('#KelID').val()>0) this.show_hide(2);
-        }.bind(this));
+        });
-        $('#butBEL').click(function(){
+        $('#butBEL').click(() => {
             if ($('#BelID').val()>0) this.show_hide(3);
-        }.bind(this));
+        });
         this.show_hide(1);
     },
 
@@ -80,11 +80,11 @@ var MUsulTJSLPJS = {
         new Request.JSON({
             url: this.PHP,
             sendParam: ['data=detail-keg','mode_detail='+mode,'Hak_Usulan','UsulanLID='+ID],
-            onSuccess: function(ajson){
+            onSuccess: (ajson) => {
                 var tombol = [{},{i:'butTutup'},{i:'butWSimpan',v:'Simpan',c:'success'}];
                 if ($('#Hak_Usulan').val()==0) tombol.pop();
-                this.winDKeg = FoniaJS.showWindow('DKeg', 'Detail Usulan Kegiatan Desa', ajson.html, 'xl', tombol, function(){
+                this.winDKeg = FoniaJS.showWindow('DKeg', 'Detail Usulan Kegiatan Desa', ajson.html, 'xl', tombol, () => {
-                    $('#winDKeg').find('#butWSimpan').click(function(){this.keg_simpan();}.bind(this));
+                    $('#winDKeg').find('#butWSimpan').click(() => this.keg_simpan());
                     $('#formUsulDesa').validate({
                         rules: {
                             required: true,
@@ -94,8 +94,8 @@ var MUsulTJSLPJS = {
                             Rupiah: {required:true, double_id:true}
                         }
                     });
-                }.bind(this));
+                });
-            }.bind(this)
+            }
         }).send();
     },
 
@@ -108,15 +108,13 @@ var MUsulTJSLPJS = {
     },
 
     keg_hapus: function(acell){
-        FoniaJS.showConfirm('Konfirmasi', 'Hapus usulan <b>"'+acell[2]+'"</b> ?', function(){
+        FoniaJS.showConfirm('Konfirmasi', 'Hapus usulan <b>"'+acell[2]+'"</b> ?', () => {
             new Request.JSONF({
                 url: this.PHP,
                 sendParam: ['data=tabel-keg','mode_detail=delete','Hak_Usulan','KecID','KelID','BelID','UsulanLID='+acell[0]],
-                onSuccess: function(adata){
+                onSuccess: () => FoniaJS.showInfo('Proses hapus data sukses!')
-                    FoniaJS.showInfo('Proses hapus data sukses!');
-                }.bind(this)
             }).send();
-        }.bind(this), 'danger');
+        }, 'danger');
     },
 
     keg_simpan: function(){
@@ -125,10 +123,10 @@ var MUsulTJSLPJS = {
         new Request.JSONF({
             url: this.PHP,
             sendParam: ['data=tabel-keg','mode_detail','Hak_Usulan','OPDID','KecID','KelID','BelID','UsulanLID','Lokasi','Dusun','RT','Masalah','Usulan','Sasaran','Waktu','Volume','SatuanID','Rupiah'],
-            onSuccess: function(){
+            onSuccess: () => {
                 FoniaJS.closeWindow(this.winDKeg);
                 FoniaJS.showInfo('Sukses menyimpan Usulan Kegiatan.');
-            }.bind(this)
+            }
         }).send();
     },
 

emusrenbang/apps/php/repo/usul_desa.php

@@ -111,7 +111,7 @@ if ( $data == "print" ) {
         ->setCategory("Rekap Usulan RKP Desa")
         ->setSubject("Rekap Usulan RKP Desa")
         ->setDescription("Rekap Usulan RKP Desa")
-        ->setCompany("Bappeda Kabupaten Sambas");
+        ->setCompany("BAPPERIDA Kabupaten Sambas");
     $sheet = $ssheet->getActiveSheet();
     $sheet->setTitle("USULAN DESA");
 

emusrenbang/apps/php/usul/tjslp.php

@@ -61,7 +61,7 @@ if ( $data == "tabel-kec" ) {
     $qakses .= ($_SESSION['__WEB_USER']['Level']==2) ? " AND KecID IN (".$_SESSION['__WEB_USER']['AK_KEC'].")": "";
 
     $obj = new Table($db);
-    $obj->set_query("SELECT K.*,IFNULL(K.Waktu,'0000-00-00 00:00:00') Waktu0,M.LokasiID KecID2,M.K_Lokasi,M.N_Lokasi,".$f_usul." Hak_Usulan FROM (SELECT * FROM para_lokasi WHERE ".$msql.") M LEFT JOIN (SELECT KecID,COUNT(DISTINCT KelID) ITEM_KEL,COUNT(*) ITEM_KEG,SUM(Rupiah) TOT_RUPIAH,MAX(DateStamp) Waktu FROM mus_usulan_desa WHERE ".$qsql." GROUP BY KecID) K ON (K.KecID=M.LokasiID) LEFT JOIN (SELECT KecID,Hak_Usulan FROM sippd_akses_mus WHERE ".$qakses." ORDER BY KecID) H ON (H.KecID=M.LokasiID)");
+    $obj->set_query("SELECT K.*,IFNULL(K.Waktu,'0000-00-00 00:00:00') Waktu0,M.LokasiID KecID2,M.K_Lokasi,M.N_Lokasi,".$f_usul." Hak_Usulan FROM (SELECT * FROM para_lokasi WHERE ".$msql.") M LEFT JOIN (SELECT KecID,COUNT(DISTINCT KelID) ITEM_KEL,COUNT(*) ITEM_KEG,SUM(Rupiah) TOT_RUPIAH,MAX(DateStamp) Waktu FROM mus_usulan_tjslp WHERE ".$qsql." GROUP BY KecID) K ON (K.KecID=M.LokasiID) LEFT JOIN (SELECT KecID,Hak_Usulan FROM sippd_akses_mus WHERE ".$qakses." ORDER BY KecID) H ON (H.KecID=M.LokasiID)");
     $obj->add_field("KecID2", "ID", "hid");
     $obj->add_field("Hak_Usulan", "Akses", "hid");
     $obj->add_field("K_Lokasi", "Kode", "c");
@@ -78,7 +78,7 @@ if ( $data == "tabel-kec" ) {
 
 } else if ( $data == "tabel-kel" ) {
     $obj = new Table($db);
-    $obj->set_query("SELECT K.*,M.LokasiID KelID2,M.K_Lokasi,M.N_Lokasi FROM (SELECT * FROM para_lokasi WHERE ".$msql.") M LEFT JOIN (SELECT KelID,COUNT(*) ITEM_KEG,SUM(Rupiah) TOT_RUPIAH FROM mus_usulan_desa WHERE ".$qsql." GROUP BY KelID) K ON (K.KelID=M.LokasiID)");
+    $obj->set_query("SELECT K.*,M.LokasiID KelID2,M.K_Lokasi,M.N_Lokasi FROM (SELECT * FROM para_lokasi WHERE ".$msql.") M LEFT JOIN (SELECT KelID,COUNT(*) ITEM_KEG,SUM(Rupiah) TOT_RUPIAH FROM mus_usulan_tjslp WHERE ".$qsql." GROUP BY KelID) K ON (K.KelID=M.LokasiID)");
     $obj->add_field("KelID2", "ID", "hid");
     $obj->add_field("K_Lokasi", "Kode", "c");
     $obj->add_field("N_Lokasi", "Nama Desa", "awr");
@@ -92,7 +92,7 @@ if ( $data == "tabel-kec" ) {
 
 } else if ( $data == "tabel-bel" ) {
     $obj = new Table($db);
-    $obj->set_query("SELECT K.*,M.BelID BelID2,M.K_Belanja,M.N_Belanja FROM (SELECT * FROM para_belanja WHERE ".$msql.") M LEFT JOIN (SELECT BelID,COUNT(*) ITEM_KEG,SUM(Rupiah) TOT_RUPIAH FROM mus_usulan_desa WHERE ".$qsql." GROUP BY BelID) K ON (K.BelID=M.BelID)");
+    $obj->set_query("SELECT K.*,M.BelID BelID2,M.K_Belanja,M.N_Belanja FROM (SELECT * FROM para_tematik WHERE ".$msql.") M LEFT JOIN (SELECT BelID,COUNT(*) ITEM_KEG,SUM(Rupiah) TOT_RUPIAH FROM mus_usulan_tjslp WHERE ".$qsql." GROUP BY BelID) K ON (K.BelID=M.BelID)");
     $obj->add_field("BelID2", "ID", "hid");
     $obj->add_field("K_Belanja", "Kode", "c");
     $obj->add_field("N_Belanja", "Jenis Belanja", "awr");
@@ -107,7 +107,7 @@ if ( $data == "tabel-kec" ) {
 } else if ( $data == "tabel-keg" ) {
     if (in_array($mode_detail, ["insert","update","delete"])) {
         $sql = new SQL($db);
-        $sql->set_table("mus_usulan_desa");
+        $sql->set_table("mus_usulan_tjslp");
         $sql->add_param("Lokasi");
         $sql->add_param("Dusun");
         $sql->add_param("RT");
@@ -142,13 +142,13 @@ if ( $data == "tabel-kec" ) {
             $sql->DeleteDB();
         }
         if (in_array($mode_detail, ["insert","update"])) {
-            $db->Query("UPDATE mus_usulan_desa SET Lokasi2=Lokasi,Dusun2=Dusun,RT2=RT,Masalah2=Masalah,Usulan2=Usulan,Sasaran2=Sasaran,Waktu2=Waktu,Volume2=Volume,SatuanID2=SatuanID,Rupiah2=Rupiah WHERE RPJMDID='".$id_rpjmd."' AND Tahun='".$thn_renja."' AND UsulanLID='".$id_usul."' AND FUbah=0");
+            $db->Query("UPDATE mus_usulan_tjslp SET Lokasi2=Lokasi,Dusun2=Dusun,RT2=RT,Masalah2=Masalah,Usulan2=Usulan,Sasaran2=Sasaran,Waktu2=Waktu,Volume2=Volume,SatuanID2=SatuanID,Rupiah2=Rupiah WHERE RPJMDID='".$id_rpjmd."' AND Tahun='".$thn_renja."' AND UsulanLID='".$id_usul."' AND FUbah=0");
         }
     }
 
     $obj = new Table($db);
-    $obj->set_query("SELECT R.*,CONCAT(R.Volume,' ',S.N_Satuan) N_Satuan FROM (SELECT *,IF(BAksi=0,'Belum Verifikasi','Ok') XKet,IF(BAksi=0,0,1) XAksi FROM mus_usulan_desa WHERE ".$qsql.") R LEFT JOIN para_satuan S ON (R.SatuanID=S.SatuanID)");
+    $obj->set_query("SELECT R.*,CONCAT(R.Volume,' ',S.N_Satuan) N_Satuan FROM (SELECT *,IF(BAksi=0,'Belum Verifikasi','Ok') XKet,IF(BAksi=0,0,1) XAksi FROM mus_usulan_tjslp WHERE ".$qsql.") R LEFT JOIN para_satuan S ON (R.SatuanID=S.SatuanID)");
-    $obj->set_query_footer("SELECT R.*,CONCAT(R.Item,' Usulan') N_Satuan FROM (SELECT COUNT(*) Item,SUM(Rupiah) Rupiah FROM mus_usulan_desa WHERE ".$qsql.") R");
+    $obj->set_query_footer("SELECT R.*,CONCAT(R.Item,' Usulan') N_Satuan FROM (SELECT COUNT(*) Item,SUM(Rupiah) Rupiah FROM mus_usulan_tjslp WHERE ".$qsql.") R");
     $obj->add_field("UsulanLID", "ID", "hid");
     $obj->add_field("Kode", "Kode", "c");
     $obj->add_field("Usulan", "Usulan Kegiatan", "awr");
@@ -176,7 +176,7 @@ if ( $data == "tabel-kec" ) {
     $enable = ($emus_enable) ? true : false;
     $adetail = ['UsulanLID'=>0, 'Kode'=>"Usulan Baru"];
     if ($id_usul > 0) {
-        $db->Query("SELECT * FROM mus_usulan_desa WHERE RPJMDID='".$id_rpjmd."' AND Tahun='".$thn_renja."' AND UsulanLID='".$id_usul."' LIMIT 1");
+        $db->Query("SELECT * FROM mus_usulan_tjslp WHERE RPJMDID='".$id_rpjmd."' AND Tahun='".$thn_renja."' AND UsulanLID='".$id_usul."' LIMIT 1");
         if ($db->Next()) $adetail = $db->AllRow();
     }
 

emusrenbang/apps/php/usul/valid.php

@@ -220,7 +220,7 @@ if ( $data == "tabel-kec" ) {
 } else if ( $data == "default") {
     echo '
     <div class="fade-in">
-    <div class="card"><div class="card-header custom-style">Verifikasi Bappeda atas Usulan Desa - Tahun Perencanaan '.$thn_renja.'</div><div class="card-body">
+    <div class="card"><div class="card-header custom-style">Verifikasi BAPPERIDA atas Usulan Desa - Tahun Perencanaan '.$thn_renja.'</div><div class="card-body">
     <div class="row mb-1">
         <div class="col">
             <div class="input-group">