remove join table mfwp

app/Controllers/Kewilayahan/Monitoring.php

@@ -0,0 +1,25 @@
+<?php
+namespace App\Controllers\Kewilayahan;
+
+use CodeIgniter\API\ResponseTrait;
+use CodeIgniter\Controller;
+
+class Monitoring extends Controller
+{
+
+    use ResponseTrait;
+
+    public function index()
+    {
+        if (session('isLogin')) {
+            echo view('inc/head');
+            echo view('inc/navbar');
+            echo view('inc/sidebar');
+            echo view('kewilayahan/monitoring/monitoring');
+            echo view('inc/footer');
+        } else {
+            return redirect()->to('auth');
+        }
+    }
+
+}

app/Controllers/Kewilayahan/Ref.php

@@ -389,6 +389,29 @@ class Ref extends Controller
         return json_encode($data);
     }
 
+    public function kppMultiKanwil()
+    {
+        $Ald      = new AldLibrary;
+        $username = session('nip');
+        $kanwil   = [];
+        foreach ($this->request->getPost('kanwil') as $key => $value) {
+            $kanwil[] = $Ald->decryptMe($value, $username);
+        }
+
+        $db   = \Config\Database::connect();
+        $data = $db->table('DIM_KANTOR')
+            ->select('KD_KPP as value,  NM_KANTOR as label')
+            ->where('KD_KANWIL', $kanwil)
+            ->whereIn('ID_JNS_KANTOR', [22, 24])
+            ->orderBy('NM_KANTOR')->get()->getResult();
+
+        foreach ($data as $key => $val) {
+            $val->value = $Ald->encryptMe($val->value, $username);
+        }
+
+        return json_encode($data);
+    }
+
     public function seksi()
     {
         $Ald      = new AldLibrary;

app/Controllers/Kewilayahan/Sebaran/JenisStatus.php

@@ -133,7 +133,9 @@ class JenisStatus extends \App\Controllers\Kewilayahan\Kytp
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
 
         $db   = \Config\Database::connect();
-        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()->select('A.NPWP, A.STATUS_SPT_TAHUNAN_TERAKHIR, JNS_WP_MFWP, STATUS_WP_MFWP, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
+        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()->select('A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.TANGGAL_DAFTAR,JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
 
         if ($opsiWilZona == 'wilayah') {
             $data->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -153,8 +155,8 @@ class JenisStatus extends \App\Controllers\Kewilayahan\Kytp
         $npwp = $data;
 
         $data = $db->newQuery()->fromSubquery($npwp, "A")
-            ->join('MFWP B', "A.NPWP = B.NPWP", "left")
+        // ->join('MFWP B', "A.NPWP = B.NPWP", "left")
-            ->join('REF_KPP D', "B.KPPADM = D.KD_KPP", "left")
+            ->join('REF_KPP D', "A.KPPADM_MFWP = D.KD_KPP", "left")
             ->join('KPDL_REF_STATUS_SPT E', "A.STATUS_SPT_TAHUNAN_TERAKHIR = E.ID_STATUS_SPT", "left");
 
         $kolom = "JNS_WP_MFWP";
@@ -172,7 +174,7 @@ class JenisStatus extends \App\Controllers\Kewilayahan\Kytp
         $data->where($kolom, $query);
 
         if ($globalFilter) {
-            $columnFilter = ["NAMA_WP", "ALAMAT"];
+            $columnFilter = ["NAMA_WP", "ALAMAT_MFWP"];
             $data->GroupStart();
             $data->orGroupStart();
             foreach ($columnFilter as $key => $value) {
@@ -209,9 +211,9 @@ class JenisStatus extends \App\Controllers\Kewilayahan\Kytp
             return $data->get();
         }
         if ($type == 'raw') {
-            $data = $data->select("A.NPWP, B.NAMA_WP, B.ALAMAT, B.KELURAHAN, B.KECAMATAN, B.KOTA, B.PROPINSI,
+            $data = $data->select("A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
-            B.KPPADM, B.NAMA_AR, B.FLAG_WPS_WPK, D.NM_KANTOR, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
-            B.TANGGAL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR, E.KETERANGAN");
+            A.TANGGAL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR,  D.NM_KANTOR, E.KETERANGAN");
             // print_r($data->getCompiledSelect());
             // exit;
             return $data->get($size - 1, $start);

app/Controllers/Kewilayahan/Sebaran/KLU.php

@@ -136,10 +136,11 @@ class KLU extends \App\Controllers\Kewilayahan\Kytp
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
 
         $db   = \Config\Database::connect();
-        $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select("A.NPWP, A.STATUS_WP_MFWP, A.JNS_WP_MFWP,A.STATUS_SPT_TAHUNAN_TERAKHIR,
+        $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select("A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
-                                            NVL(KD_GOLPOK,'ZZ') KD_GOLPOK,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
-                                            NVL(NM_GOLPOK,'TIDAK DIKETAHUI') NM_GOLPOK,
+            A.TANGGAL_DAFTAR, NVL(KD_GOLPOK,'ZZ') KD_GOLPOK,
-                                            NVL(JUMLAH_PEMBAYARAN_THN_TERAKHIR,0) JUMLAH_PEMBAYARAN_THN_TERAKHIR")
+            NVL(NM_GOLPOK,'TIDAK DIKETAHUI') NM_GOLPOK,
+            NVL(JUMLAH_PEMBAYARAN_THN_TERAKHIR,0) JUMLAH_PEMBAYARAN_THN_TERAKHIR")
             ->distinct()
             ->where('NPWP IS NOT NULL'); //default jenis chart = kluterdaftar
 
@@ -168,8 +169,8 @@ class KLU extends \App\Controllers\Kewilayahan\Kytp
         }
 
         $data = $db->newQuery()->fromSubquery($npwp, "A")
-            ->join('MFWP B', "A.NPWP = B.NPWP", "left")
+        // ->join('MFWP B', "A.NPWP = B.NPWP", "left")
-            ->join('REF_KPP D', "B.KPPADM = D.KD_KPP", "left")
+            ->join('REF_KPP D', "A.KPPADM_MFWP = D.KD_KPP", "left")
             ->join('KPDL_REF_STATUS_SPT E', "A.STATUS_SPT_TAHUNAN_TERAKHIR = E.ID_STATUS_SPT", "left");
 
         if ($query != 'lainnya') {
@@ -183,7 +184,7 @@ class KLU extends \App\Controllers\Kewilayahan\Kytp
         }
 
         if ($globalFilter) {
-            $columnFilter = ["NAMA_WP", "ALAMAT"];
+            $columnFilter = ["NAMA_WP", "ALAMAT_MFWP"];
             $data->GroupStart();
             $data->orGroupStart();
             foreach ($columnFilter as $key => $value) {
@@ -222,9 +223,9 @@ class KLU extends \App\Controllers\Kewilayahan\Kytp
             return $data->get();
         }
         if ($type == 'raw') {
-            $data = $data->select("A.NPWP, A.KD_GOLPOK,A.NM_GOLPOK, B.NAMA_WP, B.ALAMAT, B.KELURAHAN, B.KECAMATAN, B.KOTA, B.PROPINSI,
+            $data = $data->select("A.NPWP,  A.KD_GOLPOK,A.NM_GOLPOK, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
-            B.KPPADM, B.NAMA_AR, B.FLAG_WPS_WPK, D.NM_KANTOR, A.STATUS_WP_MFWP, A.JNS_WP_MFWP,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
-            B.TANGGAL_DAFTAR, A.JUMLAH_PEMBAYARAN_THN_TERAKHIR,E.KETERANGAN");
+            A.TANGGAL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR,  D.NM_KANTOR, E.KETERANGAN");
             // print_r($data->getCompiledSelect());
             // exit;
             return $data->get($size - 1, $start);

app/Controllers/Kewilayahan/Sebaran/PayComp.php

@@ -125,7 +125,11 @@ class PayComp extends \App\Controllers\Kewilayahan\Kytp
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
 
         $db   = \Config\Database::connect();
-        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()->select('A.NPWP, A.STATUS_SPT_TAHUNAN_TERAKHIR, JNS_WP_MFWP, STATUS_WP_MFWP, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
+        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()
+            ->select('A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.TANGGAL_DAFTAR,
+            JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
 
         if ($opsiWilZona == 'wilayah') {
             $data->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -149,16 +153,16 @@ class PayComp extends \App\Controllers\Kewilayahan\Kytp
         $tahun         = $tahunBulanArr[0];
         $bulan         = $tahunBulanArr[1];
         $data          = $db->newQuery()->fromSubquery($npwp, "A")
-            ->join('MFWP B', "A.NPWP = B.NPWP", "left")
+        // ->join('MFWP B', "A.NPWP = B.NPWP", "left")
             ->join('KPDL_MV_PENERIMAAN_AGG_PC C', "A.NPWP = C.NPWP AND C.THNBYR = '" . $tahun . "' and BULAN=" . $bulan, "left")
-            ->join('REF_KPP D', "B.KPPADM = D.KD_KPP", "left")
+            ->join('REF_KPP D', "A.KPPADM_MFWP = D.KD_KPP", "left")
             ->join('KPDL_REF_STATUS_SPT E', "A.STATUS_SPT_TAHUNAN_TERAKHIR = E.ID_STATUS_SPT", "left");
 
         $bulanPc = explode(" ", $query)[0]; //dari string '1 bulan' '2 bulan' '12 bulan'
         $data->where("C.JML", (float) $bulanPc);
 
         if ($globalFilter) {
-            $columnFilter = ["NAMA_WP", "ALAMAT"];
+            $columnFilter = ["NAMA_WP", "ALAMAT_MFWP"];
             $data->GroupStart();
             $data->orGroupStart();
             foreach ($columnFilter as $key => $value) {
@@ -195,10 +199,9 @@ class PayComp extends \App\Controllers\Kewilayahan\Kytp
             return $data->get();
         }
         if ($type == 'raw') {
-            $data = $data->select("A.NPWP, B.NAMA_WP, B.ALAMAT, B.KELURAHAN, B.KECAMATAN, B.KOTA, B.PROPINSI,
+            $data = $data->select("A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
-            B.KPPADM, B.NAMA_AR, B.FLAG_WPS_WPK, D.NM_KANTOR, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
-            B.TANGGAL_DAFTAR,C.JML,JUMLAH_PEMBAYARAN_THN_TERAKHIR,
+            A.TANGGAL_DAFTAR, C.JML, JUMLAH_PEMBAYARAN_THN_TERAKHIR,  D.NM_KANTOR, E.KETERANGAN");
-            E.KETERANGAN");
             // print_r($data->getCompiledSelect());
             // exit;
             return $data->get($size - 1, $start);

app/Controllers/Kewilayahan/Sebaran/Pembayaran.php

@@ -136,7 +136,10 @@ class Pembayaran extends \App\Controllers\Kewilayahan\Kytp
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
 
         $db   = \Config\Database::connect();
-        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()->select('A.NPWP, A.STATUS_SPT_TAHUNAN_TERAKHIR, JNS_WP_MFWP, STATUS_WP_MFWP')->where('A.NPWP IS NOT NULL');
+        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()
+            ->select('A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.TANGGAL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
 
         if ($opsiWilZona == 'wilayah') {
             $data->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -160,9 +163,9 @@ class Pembayaran extends \App\Controllers\Kewilayahan\Kytp
         $tahun         = $tahunBulanArr[0];
         $bulan         = $tahunBulanArr[1];
         $data          = $db->newQuery()->fromSubquery($npwp, "A")
-            ->join('MFWP B', "A.NPWP = B.NPWP", "left")
+        // ->join('MFWP B', "A.NPWP = B.NPWP", "left")
             ->join('KPDL_MV_PENERIMAAN_AGG C', "A.NPWP = C.NPWP AND C.THNBYR = '" . $tahun . "' and BULAN=" . $bulan, "left")
-            ->join('REF_KPP D', "B.KPPADM = D.KD_KPP", "left")
+            ->join('REF_KPP D', "A.KPPADM_MFWP = D.KD_KPP", "left")
             ->join('KPDL_REF_STATUS_SPT E', "A.STATUS_SPT_TAHUNAN_TERAKHIR = E.ID_STATUS_SPT", "left");
         if ($query == 'black') {
             $data->groupStart();
@@ -176,7 +179,7 @@ class Pembayaran extends \App\Controllers\Kewilayahan\Kytp
         }
 
         if ($globalFilter) {
-            $columnFilter = ["NAMA_WP", "ALAMAT"];
+            $columnFilter = ["NAMA_WP", "ALAMAT_MFWP"];
             $data->GroupStart();
             $data->orGroupStart();
             foreach ($columnFilter as $key => $value) {
@@ -215,10 +218,10 @@ class Pembayaran extends \App\Controllers\Kewilayahan\Kytp
             return $data->get();
         }
         if ($type == 'raw') {
-            $data = $data->select("A.NPWP, B.NAMA_WP, B.ALAMAT, B.KELURAHAN, B.KECAMATAN, B.KOTA, B.PROPINSI,
+            $data = $data->select("A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
-            B.KPPADM, B.NAMA_AR, B.FLAG_WPS_WPK, D.NM_KANTOR, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
-            B.TANGGAL_DAFTAR,COALESCE(C.JML,0) JML,CASE WHEN C.WARNA_BYR IS NULL THEN 'BLACK' ELSE C.WARNA_BYR END WARNA_BYR,
+            A.TANGGAL_DAFTAR,COALESCE(C.JML,0) JML,CASE WHEN C.WARNA_BYR IS NULL THEN 'BLACK' ELSE C.WARNA_BYR END WARNA_BYR,
-            E.KETERANGAN");
+            E.KETERANGAN, D.NM_KANTOR");
             // print_r($data->getCompiledSelect());
             // exit;
             return $data->get($size - 1, $start);

app/Controllers/Kewilayahan/Sebaran/Pengampu.php

@@ -133,7 +133,10 @@ class Pengampu extends \App\Controllers\Kewilayahan\Kytp
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
 
         $db   = \Config\Database::connect();
-        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()->select('A.NPWP, A.KPPADM_PENGAMPU, A.STATUS_SPT_TAHUNAN_TERAKHIR, JNS_WP_MFWP, STATUS_WP_MFWP, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
+        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()
+            ->select('A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.TANGGAL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
 
         if ($opsiWilZona == 'wilayah') {
             $data->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -153,8 +156,8 @@ class Pengampu extends \App\Controllers\Kewilayahan\Kytp
         $npwp = $data;
 
         $data = $db->newQuery()->fromSubquery($npwp, "A")
-            ->join('MFWP B', "A.NPWP = B.NPWP", "left")
+        // ->join('MFWP B', "A.NPWP = B.NPWP", "left")
-            ->join('REF_KPP D', "B.KPPADM = D.KD_KPP", "left")
+            ->join('REF_KPP D', "A.KPPADM_MFWP = D.KD_KPP", "left")
             ->join('KPDL_REF_STATUS_SPT E', "A.STATUS_SPT_TAHUNAN_TERAKHIR = E.ID_STATUS_SPT", "left");
 
         switch ($jenisChart) {
@@ -170,10 +173,10 @@ class Pengampu extends \App\Controllers\Kewilayahan\Kytp
                 break;
         }
 
-        $data->where("KPPADM_PENGAMPU", $query);
+        $data->where("KPPADM_MFWP", $query);
 
         if ($globalFilter) {
-            $columnFilter = ["NAMA_WP", "ALAMAT"];
+            $columnFilter = ["NAMA_WP", "ALAMAT_MFWP"];
             $data->GroupStart();
             $data->orGroupStart();
             foreach ($columnFilter as $key => $value) {
@@ -210,9 +213,9 @@ class Pengampu extends \App\Controllers\Kewilayahan\Kytp
             return $data->get();
         }
         if ($type == 'raw') {
-            $data = $data->select("A.NPWP, B.NAMA_WP, B.ALAMAT, B.KELURAHAN, B.KECAMATAN, B.KOTA, B.PROPINSI,
+            $data = $data->select("A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
-            B.KPPADM, B.NAMA_AR, B.FLAG_WPS_WPK, D.NM_KANTOR, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
-            B.TANGGAL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR, E.KETERANGAN");
+            A.TANGGAL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR,  D.NM_KANTOR, E.KETERANGAN");
             // print_r($data->getCompiledSelect());
             // exit;
             return $data->get($size - 1, $start);

app/Controllers/Kewilayahan/Sebaran/SPTTAhunan.php

@@ -122,7 +122,9 @@ class SPTTAhunan extends \App\Controllers\Kewilayahan\Kytp
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
 
         $db   = \Config\Database::connect();
-        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()->select('A.NPWP, A.STATUS_SPT_TAHUNAN_TERAKHIR, JNS_WP_MFWP, STATUS_WP_MFWP, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
+        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()->select('A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.TANGGAL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
 
         if ($opsiWilZona == 'wilayah') {
             $data->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -149,7 +151,7 @@ class SPTTAhunan extends \App\Controllers\Kewilayahan\Kytp
         $data->where("STATUS_SPT_TAHUNAN_TERAKHIR", $query);
 
         if ($globalFilter) {
-            $columnFilter = ["NAMA_WP", "ALAMAT"];
+            $columnFilter = ["NAMA_WP", "ALAMAT_MFWP"];
             $data->GroupStart();
             $data->orGroupStart();
             foreach ($columnFilter as $key => $value) {
@@ -186,9 +188,9 @@ class SPTTAhunan extends \App\Controllers\Kewilayahan\Kytp
             return $data->get();
         }
         if ($type == 'raw') {
-            $data = $data->select("A.NPWP, B.NAMA_WP, B.ALAMAT, B.KELURAHAN, B.KECAMATAN, B.KOTA, B.PROPINSI,
+            $data = $data->select("A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
-            B.KPPADM, B.NAMA_AR, B.FLAG_WPS_WPK, D.NM_KANTOR, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
-            B.TANGGAL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR, E.KETERANGAN");
+            A.TANGGAL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR,  D.NM_KANTOR, E.KETERANGAN");
             // print_r($data->getCompiledSelect());
             // exit;
             return $data->get($size - 1, $start);

app/Controllers/Kewilayahan/Sebaran/Sof.php

@@ -140,7 +140,9 @@ class Sof extends \App\Controllers\Kewilayahan\Kytp
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
 
         $db   = \Config\Database::connect();
-        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()->select('A.NPWP, A.STATUS_SPT_TAHUNAN_TERAKHIR, JNS_WP_MFWP, STATUS_WP_MFWP, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
+        $data = $db->table('KPDL_MV_LOKASI_SUBJEK A')->distinct()->select('A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.TANGGAL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL');
 
         if ($opsiWilZona == 'wilayah') {
             $data->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -164,15 +166,15 @@ class Sof extends \App\Controllers\Kewilayahan\Kytp
         $tahun         = $tahunBulanArr[0];
         $bulan         = $tahunBulanArr[1];
         $data          = $db->newQuery()->fromSubquery($npwp, "A")
-            ->join('MFWP B', "A.NPWP = B.NPWP", "left")
+        // ->join('MFWP B', "A.NPWP = B.NPWP", "left")
             ->join('KPDL_MV_PENERIMAAN_AGG_SF C', "A.NPWP = C.NPWP AND C.THNBYR = '" . $tahun . "' and BULAN=" . $bulan, "left")
-            ->join('REF_KPP D', "B.KPPADM = D.KD_KPP", "left")
+            ->join('REF_KPP D', "A.KPPADM_MFWP = D.KD_KPP", "left")
             ->join('KPDL_REF_STATUS_SPT E', "A.STATUS_SPT_TAHUNAN_TERAKHIR = E.ID_STATUS_SPT", "left");
 
         $data->where("C.LAPISAN", $query);
 
         if ($globalFilter) {
-            $columnFilter = ["NAMA_WP", "ALAMAT"];
+            $columnFilter = ["NAMA_WP", "ALAMAT_MFWP"];
             $data->GroupStart();
             $data->orGroupStart();
             foreach ($columnFilter as $key => $value) {
@@ -209,9 +211,9 @@ class Sof extends \App\Controllers\Kewilayahan\Kytp
             return $data->get();
         }
         if ($type == 'raw') {
-            $data = $data->select("A.NPWP, B.NAMA_WP, B.ALAMAT, B.KELURAHAN, B.KECAMATAN, B.KOTA, B.PROPINSI,
+            $data = $data->select("A.NPWP, A.NAMA_WP, A.ALAMAT_MFWP, A.KELURAHAN_MFWP, A.KECAMATAN_MFWP, A.KOTA_MFWP, A.PROPINSI_MFWP,
-            B.KPPADM, B.NAMA_AR, B.FLAG_WPS_WPK, D.NM_KANTOR, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.KPPADM_MFWP, A.NAMA_AR_MFWP, A.FLAG_WPS_WPK, A.STATUS_WP_MFWP, A.JNS_WP_MFWP, A.STATUS_SPT_TAHUNAN_TERAKHIR,
-            B.TANGGAL_DAFTAR,C.LAPISAN,JUMLAH_PEMBAYARAN_THN_TERAKHIR,
+            A.TANGGAL_DAFTAR, C.LAPISAN,JUMLAH_PEMBAYARAN_THN_TERAKHIR, D.NM_KANTOR,
             E.KETERANGAN");
             // print_r($data->getCompiledSelect());
             // exit;

app/Views/inc/sidebar.php

@@ -78,6 +78,9 @@
                         <div class="submenu-content">
                             <a href="<?=base_url()?>kewilayahan/kytp" class="menu-item">Dashboard Matoa</a>
                         </div>
+                        <div class="submenu-content">
+                            <a href="<?=base_url()?>kewilayahan/monitoring" class="menu-item">Monitoring Kegiatan</a>
+                        </div>
                         <div class="submenu-content">
                             <a href="<?=base_url()?>kewilayahan/peta" class="menu-item">Peta</a>
                         </div>

app/Views/kewilayahan/dist/monitoring.js.LICENSE.txt

@@ -0,0 +1,55 @@
+/*!
+	Copyright (c) 2018 Jed Watson.
+	Licensed under the MIT License (MIT), see
+	http://jedwatson.github.io/classnames
+*/
+
+/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * use-sync-external-store-with-selector.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */

app/Views/kewilayahan/kytp/componentProgresifitas/JenisStatusWp.js

@@ -168,15 +168,15 @@ const JenisStatusWp = ({ dataSend }) => {
         header: 'Nama'
       },
       {
-        accessorKey: 'ALAMAT',
+        accessorKey: 'ALAMAT_MFWP',
         header: 'Alamat'
       },
       {
-        accessorKey: 'KELURAHAN',
+        accessorKey: 'KELURAHAN_MFWP',
         header: 'Wil. Adm.',
         Cell: (data) => {
           const dataRow = data.row.original
-          return `${dataRow.KELURAHAN ?? ''} ${dataRow.KECAMATAN ?? ''} ${dataRow.KOTA ?? ''} ${dataRow.PROPINSI ?? ''}`
+          return `${dataRow.KELURAHAN_MFWP ?? ''} ${dataRow.KECAMATAN_MFWP ?? ''} ${dataRow.KOTA_MFWP ?? ''} ${dataRow.PROPINSI_MFWP ?? ''}`
         }
       },
       {
@@ -192,7 +192,7 @@ const JenisStatusWp = ({ dataSend }) => {
         header: 'KPP Terdaftar'
       },
       {
-        accessorKey: 'NAMA_AR',
+        accessorKey: 'NAMA_AR_MFWP',
         header: 'AR'
       },
       {

app/Views/kewilayahan/kytp/componentProgresifitas/KLU.js

@@ -252,15 +252,15 @@ const KLU = ({ dataSend }) => {
         header: 'Nama'
       },
       {
-        accessorKey: 'ALAMAT',
+        accessorKey: 'ALAMAT_MFWP',
         header: 'Alamat'
       },
       {
-        accessorKey: 'KELURAHAN',
+        accessorKey: 'KELURAHAN_MFWP',
         header: 'Wil. Adm.',
         Cell: (data) => {
           const dataRow = data.row.original
-          return `${dataRow.KELURAHAN ?? ''} ${dataRow.KECAMATAN ?? ''} ${dataRow.KOTA ?? ''} ${dataRow.PROPINSI ?? ''}`
+          return `${dataRow.KELURAHAN_MFWP ?? ''} ${dataRow.KECAMATAN_MFWP ?? ''} ${dataRow.KOTA_MFWP ?? ''} ${dataRow.PROPINSI_MFWP ?? ''}`
         }
       },
       {
@@ -276,7 +276,7 @@ const KLU = ({ dataSend }) => {
         header: 'KPP Terdaftar'
       },
       {
-        accessorKey: 'NAMA_AR',
+        accessorKey: 'NAMA_AR_MFWP',
         header: 'AR'
       },
       {

app/Views/kewilayahan/kytp/componentProgresifitas/PayComp.js

@@ -183,15 +183,15 @@ const PayComp = ({ dataSend }) => {
         header: 'Nama'
       },
       {
-        accessorKey: 'ALAMAT',
+        accessorKey: 'ALAMAT_MFWP',
         header: 'Alamat'
       },
       {
-        accessorKey: 'KELURAHAN',
+        accessorKey: 'KELURAHAN_MFWP',
         header: 'Wil. Adm.',
         Cell: (data) => {
           const dataRow = data.row.original
-          return `${dataRow.KELURAHAN ?? ''} ${dataRow.KECAMATAN ?? ''} ${dataRow.KOTA ?? ''} ${dataRow.PROPINSI ?? ''}`
+          return `${dataRow.KELURAHAN_MFWP ?? ''} ${dataRow.KECAMATAN_MFWP ?? ''} ${dataRow.KOTA_MFWP ?? ''} ${dataRow.PROPINSI_MFWP ?? ''}`
         }
       },
       {
@@ -207,7 +207,7 @@ const PayComp = ({ dataSend }) => {
         header: 'KPP Terdaftar'
       },
       {
-        accessorKey: 'NAMA_AR',
+        accessorKey: 'NAMA_AR_MFWP',
         header: 'AR'
       },
       {

app/Views/kewilayahan/kytp/componentProgresifitas/Pembayaran.js

@@ -183,15 +183,15 @@ const Pembayaran = ({ dataSend }) => {
         header: 'Nama'
       },
       {
-        accessorKey: 'ALAMAT',
+        accessorKey: 'ALAMAT_MFWP',
         header: 'Alamat'
       },
       {
-        accessorKey: 'KELURAHAN',
+        accessorKey: 'KELURAHAN_MFWP',
         header: 'Wil. Adm.',
         Cell: (data) => {
           const dataRow = data.row.original
-          return `${dataRow.KELURAHAN ?? ''} ${dataRow.KECAMATAN ?? ''} ${dataRow.KOTA ?? ''} ${dataRow.PROPINSI ?? ''}`
+          return `${dataRow.KELURAHAN_MFWP ?? ''} ${dataRow.KECAMATAN_MFWP ?? ''} ${dataRow.KOTA_MFWP ?? ''} ${dataRow.PROPINSI_MFWP ?? ''}`
         }
       },
       {
@@ -207,7 +207,7 @@ const Pembayaran = ({ dataSend }) => {
         header: 'KPP Terdaftar'
       },
       {
-        accessorKey: 'NAMA_AR',
+        accessorKey: 'NAMA_AR_MFWP',
         header: 'AR'
       },
       {

app/Views/kewilayahan/kytp/componentProgresifitas/Pengampu.js

@@ -168,15 +168,15 @@ const Pengampu = ({ dataSend }) => {
         header: 'Nama'
       },
       {
-        accessorKey: 'ALAMAT',
+        accessorKey: 'ALAMAT_MFWP',
         header: 'Alamat'
       },
       {
-        accessorKey: 'KELURAHAN',
+        accessorKey: 'KELURAHAN_MFWP',
         header: 'Wil. Adm.',
         Cell: (data) => {
           const dataRow = data.row.original
-          return `${dataRow.KELURAHAN ?? ''} ${dataRow.KECAMATAN ?? ''} ${dataRow.KOTA ?? ''} ${dataRow.PROPINSI ?? ''}`
+          return `${dataRow.KELURAHAN_MFWP ?? ''} ${dataRow.KECAMATAN_MFWP ?? ''} ${dataRow.KOTA_MFWP ?? ''} ${dataRow.PROPINSI_MFWP ?? ''}`
         }
       },
       {
@@ -192,7 +192,7 @@ const Pengampu = ({ dataSend }) => {
         header: 'KPP Terdaftar'
       },
       {
-        accessorKey: 'NAMA_AR',
+        accessorKey: 'NAMA_AR_MFWP',
         header: 'AR'
       },
       {

app/Views/kewilayahan/kytp/componentProgresifitas/SPTTahunan.js

@@ -162,15 +162,15 @@ const SPTTahunan = ({ dataSend }) => {
         header: 'Nama'
       },
       {
-        accessorKey: 'ALAMAT',
+        accessorKey: 'ALAMAT_MFWP',
         header: 'Alamat'
       },
       {
-        accessorKey: 'KELURAHAN',
+        accessorKey: 'KELURAHAN_MFWP',
         header: 'Wil. Adm.',
         Cell: (data) => {
           const dataRow = data.row.original
-          return `${dataRow.KELURAHAN ?? ''} ${dataRow.KECAMATAN ?? ''} ${dataRow.KOTA ?? ''} ${dataRow.PROPINSI ?? ''}`
+          return `${dataRow.KELURAHAN_MFWP ?? ''} ${dataRow.KECAMATAN_MFWP ?? ''} ${dataRow.KOTA_MFWP ?? ''} ${dataRow.PROPINSI_MFWP ?? ''}`
         }
       },
       {
@@ -186,7 +186,7 @@ const SPTTahunan = ({ dataSend }) => {
         header: 'KPP Terdaftar'
       },
       {
-        accessorKey: 'NAMA_AR',
+        accessorKey: 'NAMA_AR_MFWP',
         header: 'AR'
       },
       {

app/Views/kewilayahan/kytp/componentProgresifitas/Sof.js

@@ -128,15 +128,15 @@ const Sof = ({ dataSend }) => {
         header: 'Nama'
       },
       {
-        accessorKey: 'ALAMAT',
+        accessorKey: 'ALAMAT_MFWP',
         header: 'Alamat'
       },
       {
-        accessorKey: 'KELURAHAN',
+        accessorKey: 'KELURAHAN_MFWP',
         header: 'Wil. Adm.',
         Cell: (data) => {
           const dataRow = data.row.original
-          return `${dataRow.KELURAHAN ?? ''} ${dataRow.KECAMATAN ?? ''} ${dataRow.KOTA ?? ''} ${dataRow.PROPINSI ?? ''}`
+          return `${dataRow.KELURAHAN_MFWP ?? ''} ${dataRow.KECAMATAN_MFWP ?? ''} ${dataRow.KOTA_MFWP ?? ''} ${dataRow.PROPINSI_MFWP ?? ''}`
         }
       },
       {
@@ -152,7 +152,7 @@ const Sof = ({ dataSend }) => {
         header: 'KPP Terdaftar'
       },
       {
-        accessorKey: 'NAMA_AR',
+        accessorKey: 'NAMA_AR_MFWP',
         header: 'AR'
       },
       {

app/Views/kewilayahan/kytp/kpdl.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react'
 import ReactDOM from 'react-dom'
-import { Button, Card, CardBody, CardHeader, CardText, CardTitle, Col, Label, Nav, NavItem, NavLink, Row, TabContent, TabPane } from 'reactstrap'
+import { Card, CardBody, CardHeader, CardText, CardTitle, Col, Label, Nav, NavItem, NavLink, Row, TabContent, TabPane } from 'reactstrap'
 import Select from 'react-select'
 import jquery, { data, getJSON } from 'jquery'
 import collect from 'collect.js'

app/Views/kewilayahan/monitoring/index.js

@@ -0,0 +1,100 @@
+import React, { useEffect, useRef, useState } from 'react'
+import ReactDOM from 'react-dom'
+import { Card, CardBody, CardHeader, CardText, CardTitle, Col, Label, Nav, NavItem, NavLink, Row, TabContent, TabPane } from 'reactstrap'
+
+import collect from 'collect.js'
+import { MultiSelect } from 'react-multi-select-component'
+
+import { Toast } from 'primereact/toast'
+import { Button as ButtonP } from 'primereact/button'
+import 'primereact/resources/themes/bootstrap4-light-blue/theme.css'
+import 'primeflex/primeflex.css'
+import { store } from '../kytp/store/store'
+import { Provider } from 'react-redux'
+
+const App = () => {
+  const base_url = '<?=base_url()?>'
+  const [kanwil, setKanwil] = useState([])
+  const [kanwilSelected, setKanwilSelected] = useState([])
+  const [kpp, setKpp] = useState([])
+  const [kppSelected, setKppSelected] = useState([])
+
+  useEffect(() => {
+    $.ajax({
+      url: base_url + 'kewilayahan/ref/kanwil',
+      method: 'GET',
+      dataType: 'json',
+      success: (data) => {
+        setKanwil(data)
+      }
+    })
+  }, [])
+
+  useEffect(() => {
+    $.ajax({
+      url: base_url + 'kewilayahan/ref/kpp',
+      method: 'POST',
+      dataType: 'json',
+      success: (data) => {
+        setKpp(data)
+      }
+    })
+  }, [kanwilSelected])
+
+  return (
+    <>
+      <Card>
+        <CardBody>
+          <Row className="mt-2">
+            <Col md="4">
+              <Label className="form-label" for="Pilih Kanwil">
+                Kanwil
+              </Label>
+              <MultiSelect
+                className="me-1 w-full"
+                hasSelectAll={true}
+                debounceDuration={300}
+                options={kanwil}
+                value={kanwilSelected}
+                onChange={(e) => {
+                  setKanwilSelected(e)
+                }}
+                labelledBy="Pilih Kanwil"
+                overrideStrings={{ allItemsAreSelected: 'Semua dipilih', selectSomeItems: 'Pilih Kanwil' }}
+              />
+            </Col>
+            <Col md="4">
+              <Label className="form-label" for="Pilih KPP">
+                KPP
+              </Label>
+              <MultiSelect
+                className="me-1 w-full"
+                hasSelectAll={true}
+                debounceDuration={300}
+                options={kpp}
+                value={kppSelected}
+                onChange={(e) => {
+                  setKppSelected(e)
+                }}
+                labelledBy="Pilih KPP"
+                overrideStrings={{ allItemsAreSelected: 'Semua dipilih', selectSomeItems: 'Pilih KPP' }}
+              />
+            </Col>
+            <Col md="3" className="pt-4">
+              <ButtonP onClick={() => buttonProsesOnClick()} label="Proses" severity="" rounded className="w-10rem text-white text-base" />
+            </Col>
+          </Row>
+        </CardBody>
+      </Card>
+    </>
+  )
+}
+
+const container = document.getElementById('app')
+const component = (
+  <Provider store={store}>
+    <App />
+  </Provider>
+)
+
+ReactDOM.render(component, container)

app/Views/kewilayahan/monitoring/monitoring.php

@@ -0,0 +1,27 @@
+
+<style>
+    .highcharts-credits{
+        visibility: hidden;
+    }
+</style>
+<?php
+helper('Kpdl');
+?>
+
+<div class="main-content">
+    <div class="container-fluid">
+        <div id="app"></div>
+
+    </div>
+</div>
+
+
+
+<?php $isDevelopment = ENVIRONMENT === 'development';?>
+
+<script type="text/javascript">
+
+<?php echo view('kewilayahan/dist/monitoring.js') ?>
+</script>
+
+<?php echo view('inc/js.php') ?>

package.json

@@ -44,5 +44,9 @@
     "style-loader": "^4.0.0",
     "webpack": "^5.94.0",
     "webpack-dev-server": "^5.1.0"
+  },
+  "scripts": {
+    "start": "npx webpack --config webpack-dev.config.js --watch",
+    "build": "npx webpack --config webpack.config.js"
   }
-}
+}

webpack-dev.config.js

@@ -0,0 +1,46 @@
+const path = require('path')
+//__dirname,
+module.exports = {
+  // entry: "./App.js",
+  entry: {
+    kpdl: './app/Views/kewilayahan/kytp/kpdl.js',
+    monitoring: './app/Views/kewilayahan/monitoring/index.js'
+    // peta: './app/Views/kewilayahan/peta/peta.js'
+  },
+  output: {
+    path: path.resolve('./app/Views/kewilayahan/dist'),
+    filename: '[name].js'
+  },
+  optimization: {
+    minimize: false
+  },
+  module: {
+    rules: [
+      {
+        exclude: /node_modules/,
+        use: {
+          loader: 'babel-loader',
+          options: {
+            presets: ['@babel/preset-react'],
+            plugins: ['@babel/plugin-proposal-optional-chaining', '@babel/plugin-proposal-nullish-coalescing-operator']
+          }
+        }
+      },
+      {
+        test: /\.css$/i,
+        // type: "asset"
+        use: ['style-loader', 'css-loader']
+      }
+    ]
+  },
+  // mode: 'production'
+  mode: 'development'
+  // devServer: {
+  //   static: {
+  //     directory: path.join(__dirname, 'public/kpdl'),
+  //     serveIndex: true
+  //   },
+  //   compress: false,
+  //   port: 9000
+  // }
+}

webpack.config.js

@@ -3,7 +3,8 @@ const path = require('path')
 module.exports = {
   // entry: "./App.js",
   entry: {
-    kpdl: './app/Views/kewilayahan/kytp/kpdl.js'
+    kpdl: './app/Views/kewilayahan/kytp/kpdl.js',
+    monitoring: './app/Views/kewilayahan/monitoring/index.js'
     // peta: './app/Views/kewilayahan/peta/peta.js'
   },
   output: {