diff --git a/app/Controllers/Kewilayahan/Kytp.php b/app/Controllers/Kewilayahan/Kytp.php index 04213e8b..1b89ad61 100644 --- a/app/Controllers/Kewilayahan/Kytp.php +++ b/app/Controllers/Kewilayahan/Kytp.php @@ -100,7 +100,7 @@ class Kytp extends Controller public function sebaranPengampu() { - + ini_set('max_input_vars', 3000); $sebaran = new Pengampu; $dataReturn['assign'] = $sebaran->data($this->request, 'assign'); $dataReturn['unassign'] = $sebaran->data($this->request, 'unassign'); @@ -110,7 +110,7 @@ class Kytp extends Controller private function get_poi_agg() { - + ini_set('max_input_vars', 3000); $opsiWilZona = $this->request->getPost('opsiWilZona') ?? null; $adm4_pcode = $this->request->getPost('adm4_pcode') ?? []; $id_poly_zona = $this->request->getPost('id_poly_zona') ?? []; diff --git a/app/Controllers/Kewilayahan/Ref.php b/app/Controllers/Kewilayahan/Ref.php index e9025233..168c4a06 100644 --- a/app/Controllers/Kewilayahan/Ref.php +++ b/app/Controllers/Kewilayahan/Ref.php @@ -133,4 +133,4 @@ class Ref extends Controller return array_change_key_case($arr, CASE_LOWER); } -} \ No newline at end of file +} diff --git a/app/Controllers/Kewilayahan/Sebaran/Pengampu.php b/app/Controllers/Kewilayahan/Sebaran/Pengampu.php index 6fa40300..4f78de5f 100644 --- a/app/Controllers/Kewilayahan/Sebaran/Pengampu.php +++ b/app/Controllers/Kewilayahan/Sebaran/Pengampu.php @@ -6,22 +6,22 @@ class Pengampu extends \App\Controllers\Kewilayahan\Kytp { protected function data($request, $jenis) { + ini_set('max_input_vars', 3000); $opsiWilZona = $request->getPost('opsiWilZona'); $adm4_pcode = $request->getPost('adm4_pcode') ?? []; $id_poly_zona = $request->getPost('id_poly_zona') ?? []; $db = \Config\Database::connect(); - $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK')->select("NM_KPP_ADM, count(1) JML", false) - ->groupBy("NM_KPP_ADM")->orderBy("JML", 'desc'); - $kolom = "JNS_WP_MFWP"; + $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK')->select("NM_KANTOR_PENGAMPU, count(1) JML", false) + ->groupBy("NM_KANTOR_PENGAMPU")->orderBy("JML", 'desc'); switch ($jenis) { case 'assign': break; case 'unassign': - $npwp = $npwp->where("NIP_AR_PENGAMPU", "NPWP TIDAK DITEMUKAN"); + $npwp = $npwp->where("NM_KANTOR_PENGAMPU", "NPWP TIDAK DITEMUKAN"); break; default: @@ -42,7 +42,7 @@ class Pengampu extends \App\Controllers\Kewilayahan\Kytp foreach ($data as $b) { - array_push($ret, ['name' => $b->NM_KPP_ADM, + array_push($ret, ['name' => $b->NM_KANTOR_PENGAMPU, // 'color' => , 'y' => floatval($b->JML), ] diff --git a/app/Views/kewilayahan/dist/kpdl.js b/app/Views/kewilayahan/dist/kpdl.js index f689e8cc..eb682982 100644 --- a/app/Views/kewilayahan/dist/kpdl.js +++ b/app/Views/kewilayahan/dist/kpdl.js @@ -62459,6 +62459,11 @@ function TabProgresifitas({ header: "Pengampu" }, /*#__PURE__*/react.createElement(componentProgresifitas_Pengampu, { dataSend: dataSend + })), /*#__PURE__*/react.createElement(TabPanel, { + id: "tab_5", + header: "SPT Tahunan" + }, /*#__PURE__*/react.createElement(componentProgresifitas_Pengampu, { + dataSend: dataSend })), /*#__PURE__*/react.createElement(TabPanel, { id: "tab_6", header: "KLU" @@ -62623,11 +62628,11 @@ const Root = () => { } }, [kecSelected]); (0,react.useEffect)(() => { - setKpp([]); + setKpp(null); setSeksi([]); setAr([]); setZp([]); - setKppSelected([]); + setKppSelected(null); setSeksiSelected([]); setArSelected([]); setZpSelected([]); @@ -62654,7 +62659,8 @@ const Root = () => { setArSelected([]); setZpSelected([]); if (kppSelected && !isObjEmpty(kppSelected)) { - const kpp = dist_default()(kppSelected).pluck("value").all(); + // const kpp = collect(kppSelected).pluck("value").all() + const kpp = [kppSelected.value]; jquery_default().ajax({ url: base_url + "kewilayahan/ref/zpseksi", method: "GET", @@ -62674,7 +62680,7 @@ const Root = () => { setArSelected([]); setZpSelected([]); if (seksiSelected && !isObjEmpty(seksiSelected)) { - const kpp = dist_default()(kppSelected).pluck("value").all(); + const kpp = [kppSelected.value]; const seksi = dist_default()(seksiSelected).pluck("value").all(); jquery_default().ajax({ url: base_url + "kewilayahan/ref/zpar", @@ -62694,7 +62700,7 @@ const Root = () => { setZp([]); setZpSelected([]); if (arSelected && !isObjEmpty(arSelected)) { - const kpp = dist_default()(kppSelected).pluck("value").all(); + const kpp = kppSelected.value; const seksi = dist_default()(seksiSelected).pluck("value").all(); const ar = dist_default()(arSelected).pluck("value").all(); jquery_default().ajax({ @@ -63020,8 +63026,9 @@ const Root = () => { onChange: e => { setKanwilSelected(e); }, - classNamePrefix: "select", - defaultValue: kanwilSelected, + classNamePrefix: "select" + // defaultValue={kanwilSelected} + , value: kanwilSelected, isClearable: false, options: kanwil @@ -63030,20 +63037,18 @@ const Root = () => { }, /*#__PURE__*/react.createElement(es_Label, { className: "form-label", for: "Pilih KPP" - }, "KPP"), /*#__PURE__*/react.createElement(je, { - className: "me-1 w-full", - hasSelectAll: true, - debounceDuration: 300, - options: kpp, - value: kppSelected, + }, "KPP"), /*#__PURE__*/react.createElement(StateManagedSelect$1, { + placeholder: "Pilih KPP", + className: "basic-single w-100", onChange: e => { setKppSelected(e); }, - labelledBy: "Pilih KPP", - overrideStrings: { - allItemsAreSelected: "Semua dipilih", - selectSomeItems: "Pilih KPP" - } + classNamePrefix: "select" + // defaultValue={kanwilSelected} + , + value: kppSelected, + isClearable: false, + options: kpp })), /*#__PURE__*/react.createElement(es_Col, { md: "2" }, /*#__PURE__*/react.createElement(es_Label, { diff --git a/app/Views/kewilayahan/kytp/TabProgresifitas.js b/app/Views/kewilayahan/kytp/TabProgresifitas.js index 164c9396..2e7cb0a4 100644 --- a/app/Views/kewilayahan/kytp/TabProgresifitas.js +++ b/app/Views/kewilayahan/kytp/TabProgresifitas.js @@ -37,6 +37,9 @@ export default function TabProgresifitas({ dataSend }) { + + + diff --git a/app/Views/kewilayahan/kytp/kpdl.js b/app/Views/kewilayahan/kytp/kpdl.js index 898e7caf..6cea7e21 100644 --- a/app/Views/kewilayahan/kytp/kpdl.js +++ b/app/Views/kewilayahan/kytp/kpdl.js @@ -131,11 +131,11 @@ const Root = () => { }, [kecSelected]) useEffect(() => { - setKpp([]) + setKpp(null) setSeksi([]) setAr([]) setZp([]) - setKppSelected([]) + setKppSelected(null) setSeksiSelected([]) setArSelected([]) setZpSelected([]) @@ -161,7 +161,8 @@ const Root = () => { setArSelected([]) setZpSelected([]) if (kppSelected && !isObjEmpty(kppSelected)) { - const kpp = collect(kppSelected).pluck("value").all() + // const kpp = collect(kppSelected).pluck("value").all() + const kpp = [kppSelected.value] jQuery.ajax({ url: base_url + "kewilayahan/ref/zpseksi", method: "GET", @@ -180,7 +181,7 @@ const Root = () => { setArSelected([]) setZpSelected([]) if (seksiSelected && !isObjEmpty(seksiSelected)) { - const kpp = collect(kppSelected).pluck("value").all() + const kpp = [kppSelected.value] const seksi = collect(seksiSelected).pluck("value").all() jQuery.ajax({ @@ -199,7 +200,7 @@ const Root = () => { setZp([]) setZpSelected([]) if (arSelected && !isObjEmpty(arSelected)) { - const kpp = collect(kppSelected).pluck("value").all() + const kpp = kppSelected.value const seksi = collect(seksiSelected).pluck("value").all() const ar = collect(arSelected).pluck("value").all() jQuery.ajax({ @@ -535,7 +536,7 @@ const Root = () => { setKanwilSelected(e) }} classNamePrefix="select" - defaultValue={kanwilSelected} + // defaultValue={kanwilSelected} value={kanwilSelected} isClearable={false} options={kanwil} @@ -545,7 +546,19 @@ const Root = () => { - { + setKppSelected(e) + }} + classNamePrefix="select" + // defaultValue={kanwilSelected} + value={kppSelected} + isClearable={false} + options={kpp} + /> + {/* { }} labelledBy="Pilih KPP" overrideStrings={{ allItemsAreSelected: "Semua dipilih", selectSomeItems: "Pilih KPP" }} - /> + /> */}