entahlah

app/Controllers/Kewilayahan/Kytp.php

@@ -71,8 +71,9 @@ class Kytp extends Controller
 
         // $tahun             = $Ald->decryptMe($this->request->getPost('tahun'), $username) ?? date('Y');
         // $bulan             = $Ald->decryptMe($this->request->getPost('bulan'), $username) ?? date('m');
-        $tahun             = 2024;
+        $tahun = $Ald->decryptMe($this->request->getPost('tahun'), $username);
-        $bulan             = 12;
+        $bulan = ($tahun == date('Y') ? date('m') : 12);
+
         $sebaranPembayaran = new Pembayaran;
 
         $dataReturn['dataC']    = $sebaranPembayaran->dataC($this->request, $tahun, $bulan);
@@ -94,10 +95,8 @@ class Kytp extends Controller
     {
         $Ald      = new AldLibrary;
         $username = session('nip');
-        // $tahun    = $Ald->decryptMe($this->request->getPost('tahun'), $username) ?? date('Y');
+        $tahun    = $Ald->decryptMe($this->request->getPost('tahun'), $username) ?? date('Y');
-        // $bulan    = $Ald->decryptMe($this->request->getPost('bulan'), $username) ?? date('m');
+        $bulan    = $tahun == date('Y') ? date('m') : 12;
-        $tahun = 2024;
-        $bulan = 12;
 
         $sebaran = new PayComp;
 
@@ -113,10 +112,8 @@ class Kytp extends Controller
         $Ald      = new AldLibrary;
         $username = session('nip');
 
-        // $tahun = $Ald->decryptMe($this->request->getPost('tahun'), $username) ?? date('Y');
+        $tahun = $Ald->decryptMe($this->request->getPost('tahun'), $username) ?? date('Y') - 1;
-        // $bulan = $Ald->decryptMe($this->request->getPost('bulan'), $username) ?? date('m');
+        $bulan = $tahun == date('Y') ? date('m') : 12;
-        $tahun = 2024;
-        $bulan = 12;
 
         $sebaran            = new Sof;
         $dataReturn['data'] = $sebaran->dataC($this->request, $tahun, $bulan);
@@ -199,7 +196,7 @@ class Kytp extends Controller
             $dataReturn['categories'] = $sebaran->generateSeries($bulan, $tahun);
         }
 
-        $arr_data_akum_dikenali = array();
+        $arr_data_akum_dikenali = [];
         $nilai_akum             = 0;
         foreach ($dataReturn['kpdl'] as $data) {
             $nilai_akum += $data;

app/Controllers/Kewilayahan/Ref.php

@@ -485,6 +485,18 @@ class Ref extends Controller
         return $this->respond($data, 200);
     }
 
+    public function tahunKegiatan()
+    {
+        $Ald = new AldLibrary();
+
+        $data = [
+            ['value' => $Ald->encryptMe(date('Y') - 1, session('nip')), 'label' => date('Y') - 1],
+            ['value' => $Ald->encryptMe(date('Y'), session('nip')), 'label' => date('Y')],
+
+        ];
+        return $this->respond($data, 200);
+    }
+
     public function warnaBayar()
     {
         $db   = \Config\Database::connect();

app/Controllers/Kewilayahan/Sebaran/Identifikasi.php

@@ -12,9 +12,9 @@ class Identifikasi extends \App\Controllers\Kewilayahan\Kytp
 
         $opsiWilZona = $Ald->decryptMe($request->getPost('opsiWilZona'), $username);
 
-        $tahun = 2024;
+        $tahun = $Ald->decryptMe($request->getPost('tahun'), $username);
-        // $tahun = $Ald->decryptMe(($this->request->getPost('tahun') ?? ''), $username) ?? '2024';
+
-        //$bulan    = $Ald->decryptMe($this->request->getPost('bulan'), $username) ?? date('m');
+        $bulan = ($tahun == date('Y') ? date('m') : 12);
 
         $adm4_pcode = [];
         foreach ($request->getPost('adm4_pcode') ?? [] as $key => $value) {

app/Controllers/Kewilayahan/Sebaran/SPTTAhunan.php

@@ -31,10 +31,17 @@ class SPTTAhunan extends \App\Controllers\Kewilayahan\Kytp
             $nip_ar_pengampu[] = $Ald->decryptMe($value, $username);
         }
         $db = \Config\Database::connect();
+        if ($tahun == date('Y') - 1) {
+            $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select('A.NPWP, STATUS_SPT_TAHUNAN_TERAKHIR_SEBELUMNYA AS STATUS_SPT_TAHUNAN_TERAKHIR, B.KETERANGAN')->distinct()
+                ->join('KPDL_REF_STATUS_SPT B', "A.STATUS_SPT_TAHUNAN_TERAKHIR_SEBELUMNYA = B.ID_STATUS_SPT", "left")
+                ->where('A.NPWP IS NOT NULL')
+                ->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun);
+        } else {
             $npwp = $db->table('KPDL_MV_LOKASI_SUBJEK A')->select('A.NPWP, STATUS_SPT_TAHUNAN_TERAKHIR, B.KETERANGAN')->distinct()
                 ->join('KPDL_REF_STATUS_SPT B', "A.STATUS_SPT_TAHUNAN_TERAKHIR = B.ID_STATUS_SPT", "left")
                 ->where('A.NPWP IS NOT NULL')
                 ->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun);
+        }
 
         if ($opsiWilZona == 'wilayah') {
             $npwp->whereIn('ADM4_PCODE', $adm4_pcode);
@@ -203,10 +210,19 @@ class SPTTAhunan extends \App\Controllers\Kewilayahan\Kytp
         $sorting      = json_decode($this->request->getGet('sorting')); //    [{"id":"ALAMAT","desc":false}]
         $tahun        = 2024;
         $db           = \Config\Database::connect();
+
+        if ($tahun == date('Y') - 1) {
+
+            $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_SEBELUMNYA AS STATUS_SPT_TAHUNAN_TERAKHIR,
+            A.TGL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL')->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun);
+
+        } else {
             $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.TGL_DAFTAR, JUMLAH_PEMBAYARAN_THN_TERAKHIR')->where('A.NPWP IS NOT NULL')->where('EXTRACT (YEAR FROM A.creation_date) <=', $tahun);
 
+        }
         if ($opsiWilZona == 'wilayah') {
             $data->whereIn('ADM4_PCODE', $adm4_pcode);
         }
@@ -298,7 +314,6 @@ class SPTTAhunan extends \App\Controllers\Kewilayahan\Kytp
         $npwp = $data;
 
         $data = $db->newQuery()->fromSubquery($npwp, "A")
-        // ->join('MFWP B', "A.NPWP = B.NPWP", "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");
 

app/Views/kewilayahan/kytp/componentDepan/NipPengampu.js

@@ -8,7 +8,17 @@ import jquery from 'jquery'
 import collect from 'collect.js'
 import { setSelectedOpsi } from '../store/KpdlStore'
 import { useDispatch, useSelector } from 'react-redux'
-const NipPengampu = ({ dataSend, setDataSend, activeTab, toast, setHiddenGraphMatoa, dataOpsi }) => {
+const NipPengampu = ({
+  dataSend,
+  setDataSend,
+  activeTab,
+  toast,
+  setHiddenGraphMatoa,
+  dataOpsi,
+  tahunKegiatan,
+  tahunKegiatanSelected,
+  setTahunKegiatanSelected
+}) => {
   const dispatch = useDispatch()
   const storeKpdl = useSelector((state) => state.kpdl)
 
@@ -174,7 +184,23 @@ const NipPengampu = ({ dataSend, setDataSend, activeTab, toast, setHiddenGraphMa
         </Col>
       </Row>
       <Row className="mt-2">
-        <Col sm="12">
+        <Col md="3">
+          <Label className="form-label" for="Pilih Zona">
+            Tahun Kegiatan
+          </Label>
+          <Select
+            placeholder="Pilih Tahun"
+            className="basic-single w-100"
+            onChange={(e) => {
+              setTahunKegiatanSelected(e)
+            }}
+            classNamePrefix="select"
+            value={tahunKegiatanSelected}
+            isClearable={false}
+            options={tahunKegiatan}
+          />
+        </Col>
+        <Col sm="3" className="pt-4">
           <ButtonP onClick={() => buttonProsesOnClick()} label="Proses" severity="" rounded className="w-10rem text-white text-base" />
         </Col>
       </Row>

app/Views/kewilayahan/kytp/componentDepan/NipPerekam.js

@@ -9,7 +9,17 @@ import collect from 'collect.js'
 import { useDispatch, useSelector } from 'react-redux'
 import { setSelectedOpsi } from '../store/KpdlStore'
 
-const NipPerekam = ({ dataSend, setDataSend, activeTab, toast, setHiddenGraphMatoa, dataOpsi }) => {
+const NipPerekam = ({
+  dataSend,
+  setDataSend,
+  activeTab,
+  toast,
+  setHiddenGraphMatoa,
+  dataOpsi,
+  tahunKegiatan,
+  tahunKegiatanSelected,
+  setTahunKegiatanSelected
+}) => {
   const dispatch = useDispatch()
   const storeKpdl = useSelector((state) => state.kpdl)
 
@@ -178,7 +188,23 @@ const NipPerekam = ({ dataSend, setDataSend, activeTab, toast, setHiddenGraphMat
         </Col>
       </Row>
       <Row className="mt-2">
-        <Col sm="12">
+        <Col md="3">
+          <Label className="form-label" for="Pilih Zona">
+            Tahun Kegiatan
+          </Label>
+          <Select
+            placeholder="Pilih Tahun"
+            className="basic-single w-100"
+            onChange={(e) => {
+              setTahunKegiatanSelected(e)
+            }}
+            classNamePrefix="select"
+            value={tahunKegiatanSelected}
+            isClearable={false}
+            options={tahunKegiatan}
+          />
+        </Col>
+        <Col sm="3" className="pt-4">
           <ButtonP onClick={() => buttonProsesOnClick()} label="Proses" severity="" rounded className="w-10rem text-white text-base" />
         </Col>
       </Row>

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

@@ -316,7 +316,11 @@ const Identifikasi = ({ dataSend }) => {
     <>
       <Row>
         <Col>
-          <HighchartsReact ref={refChart} highcharts={Highcharts} options={optionsChart(dataGraph, 'Identifikasi Lokasi Matoa')} />
+          <HighchartsReact
+            ref={refChart}
+            highcharts={Highcharts}
+            options={optionsChart(dataGraph, 'Identifikasi Lokasi Matoa s.d. Tahun ' + dataSend.tahunKegiatan)}
+          />
         </Col>
       </Row>
 

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

@@ -47,9 +47,9 @@ const Pembayaran = ({ dataSend }) => {
       dataType: 'json',
       type: 'POST',
       data: {
-        ...dataSend,
+        ...dataSend
-        tahun: currentYear,
+        // tahun: currentYear,
-        bulan: currentMonth
+        // bulan: currentMonth
       },
       success: (data) => {
         dispatch(setProgresifitasPembayaran(data.dataC))

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

@@ -288,7 +288,11 @@ const SPTTahunan = ({ dataSend }) => {
     <>
       <Row>
         <Col>
-          <HighchartsReact ref={refChart} highcharts={Highcharts} options={optionsChart(data, 'SPT Tahunan')} />
+          <HighchartsReact
+            ref={refChart}
+            highcharts={Highcharts}
+            options={optionsChart(data, 'SPT Tahunan Tahun Pajak ' + (Number(dataSend.tahunKegiatan) - 1).toString())}
+          />
         </Col>
       </Row>
       <Row className="f-14">

app/Views/kewilayahan/kytp/kpdl.js

@@ -53,13 +53,16 @@ const Root = () => {
   const [ar, setAr] = useState([])
   const [zp, setZp] = useState([])
 
+  const [tahunKegiatan, setTahunKegiatan] = useState([])
+  const [tahunKegiatanSelected, setTahunKegiatanSelected] = useState([])
+
   const [kanwilSelected, setKanwilSelected] = useState({})
   const [kppSelected, setKppSelected] = useState({})
   const [seksiSelected, setSeksiSelected] = useState([])
   const [arSelected, setArSelected] = useState([])
   const [zpSelected, setZpSelected] = useState([])
 
-  const [dataSend, setDataSend] = useState({ opsiWilZona: null, adm4_pcode: [], id_poly_zona: [], nip_ar_perekam: [], nip_ar_pengampu: [] })
+  const [dataSend, setDataSend] = useState({})
   const [dataGraphMatoa, setDataGraphMatoa] = useState({ poi_agg: [], kpdl_agg: [] })
   // let session = null
   const [session, setSession] = useState({})
@@ -98,6 +101,25 @@ const Root = () => {
       }
     })
 
+    jquery.ajax({
+      url: base_url + 'kewilayahan/ref/tahunKegiatan',
+      method: 'GET',
+      dataType: 'json',
+      success: (data) => {
+        setTahunKegiatan(data)
+        setTahunKegiatanSelected(data[0])
+        setDataSend({
+          opsiWilZona: null,
+          adm4_pcode: [],
+          id_poly_zona: [],
+          nip_ar_perekam: [],
+          nip_ar_pengampu: [],
+          tahun: data[0].value,
+          tahunKegiatan: new Date().getFullYear() - 1
+        })
+      }
+    })
+
     jquery.getJSON(base_url + 'kewilayahan/ref/opsi').then((response) => {
       setDataOpsi(response)
       dispatch(setSelectedOpsi(response.default))
@@ -258,7 +280,13 @@ const Root = () => {
       case 'wilayah':
         if (adm4_pcode.length) {
           dispatch(setSelectedOpsi(dataOpsi.wilayah))
-          setDataSend({ opsiWilZona: dataOpsi.wilayah.key, adm4_pcode, id_poly_zona: [] })
+          setDataSend({
+            opsiWilZona: dataOpsi.wilayah.key,
+            adm4_pcode,
+            id_poly_zona: [],
+            tahun: tahunKegiatanSelected.value,
+            tahunKegiatan: tahunKegiatanSelected.label
+          })
           setHiddenGraphMatoa(false)
         } else {
           toast.current.show({ severity: 'info', summary: 'Info', detail: 'Kelurahan harus dipilih' })
@@ -267,7 +295,13 @@ const Root = () => {
       case 'zona':
         if (id_poly_zona.length) {
           dispatch(setSelectedOpsi(dataOpsi.zona))
-          setDataSend({ opsiWilZona: dataOpsi.zona.key, adm4_pcode: [], id_poly_zona })
+          setDataSend({
+            opsiWilZona: dataOpsi.zona.key,
+            adm4_pcode: [],
+            id_poly_zona,
+            tahun: tahunKegiatanSelected.value,
+            tahunKegiatan: tahunKegiatanSelected.label
+          })
           setHiddenGraphMatoa(false)
         } else {
           toast.current.show({ severity: 'info', summary: 'Info', detail: 'Zona harus dipilih' })
@@ -579,7 +613,23 @@ const Root = () => {
                     </Col>
                   </Row>
                   <Row className="mt-2">
-                    <Col sm="12">
+                    <Col md="3">
+                      <Label className="form-label" for="Pilih Zona">
+                        Tahun Kegiatan
+                      </Label>
+                      <Select
+                        placeholder="Pilih Tahun"
+                        className="basic-single w-100"
+                        onChange={(e) => {
+                          setTahunKegiatanSelected(e)
+                        }}
+                        classNamePrefix="select"
+                        value={tahunKegiatanSelected}
+                        isClearable={false}
+                        options={tahunKegiatan}
+                      />
+                    </Col>
+                    <Col sm="3" className="pt-4">
                       <ButtonP onClick={() => buttonProsesOnClick()} label="Proses" severity="" rounded className="w-10rem text-white text-base" />
                     </Col>
                   </Row>
@@ -673,6 +723,23 @@ const Root = () => {
                         overrideStrings={{ allItemsAreSelected: 'Semua dipilih', selectSomeItems: 'Pilih Zona' }}
                       />
                     </Col>
+                    <Col md="3">
+                      <Label className="form-label" for="Pilih Zona">
+                        Tahun Kegiatan
+                      </Label>
+                      <Select
+                        placeholder="Pilih Tahun"
+                        className="basic-single w-100"
+                        onChange={(e) => {
+                          setTahunKegiatanSelected(e)
+                        }}
+                        classNamePrefix="select"
+                        // defaultValue={kanwilSelected}
+                        value={tahunKegiatanSelected}
+                        isClearable={false}
+                        options={tahunKegiatan}
+                      />
+                    </Col>
                     <Col md="3" className="pt-4">
                       <ButtonP onClick={() => buttonProsesOnClick()} label="Proses" severity="" rounded className="w-10rem text-white text-base" />
                     </Col>
@@ -686,6 +753,9 @@ const Root = () => {
                     toast={toast}
                     setHiddenGraphMatoa={setHiddenGraphMatoa}
                     dataOpsi={dataOpsi}
+                    tahunKegiatan={tahunKegiatan}
+                    tahunKegiatanSelected={tahunKegiatanSelected}
+                    setTahunKegiatanSelected={setTahunKegiatanSelected}
                   />
                 </TabPane>
                 <TabPane tabId="pengampu">
@@ -696,6 +766,9 @@ const Root = () => {
                     toast={toast}
                     setHiddenGraphMatoa={setHiddenGraphMatoa}
                     dataOpsi={dataOpsi}
+                    tahunKegiatan={tahunKegiatan}
+                    tahunKegiatanSelected={tahunKegiatanSelected}
+                    setTahunKegiatanSelected={setTahunKegiatanSelected}
                   />
                 </TabPane>
               </TabContent>