pemisahan pembayaran 0

app/Controllers/Kewilayahan/Sebaran/Pembayaran.php

@@ -133,11 +133,17 @@ class Pembayaran extends \App\Controllers\Kewilayahan\Kytp
             $npwp->groupEnd();
         }
 
-        $data = $db->newQuery()
+        $dataSub = $db->newQuery()
-            ->select("'" . $tahun . '-' . $bulan . "' AS THN_BLN,  NVL(WARNA_BYR, 'black') WARNA_BYR, COUNT(1) AS Y")
+            ->select("'" . $tahun . '-' . $bulan . "' AS THN_BLN,  NVL(WARNA_BYR, 'grey') WARNA_BYR, COUNT(1) AS Y")
             ->fromSubquery($npwp, 'A')
             ->join('KPDL_MV_PENERIMAAN_AGG B', new RawSql("A.NPWP=B.NPWP and B.THNBYR = '" . $tahun . "' and B.BULAN=" . $bulan), 'left')
-            ->groupBy("NVL(WARNA_BYR, 'black')")->orderBy("WARNA_BYR");
+            ->groupBy("NVL(WARNA_BYR, 'grey')");
+
+        $data = $db->newQuery()
+            ->select("A.THN_BLN, A.WARNA_BYR, A.Y, B.ID_WARNA, B.RGB, B.NAMA_WARNA")
+            ->fromSubquery($dataSub, "A")
+            ->join('KPDL_REF_WARNA_PEMBAYARAN B', 'A.WARNA_BYR=B.WARNA', 'inner')
+            ->orderBy('B.ID_WARNA');
         // print_r($data->getCompiledSelect());
         // exit;
         $data = $data->get()->getResult();
@@ -147,7 +153,9 @@ class Pembayaran extends \App\Controllers\Kewilayahan\Kytp
         foreach ($data as $b) {
             $name = '';
             switch ($b->WARNA_BYR) {
-                case 'black':$name = '<=0';
+                case 'black':$name = '<0';
+                    break;
+                case 'grey':$name = 'Rp0';
                     break;
                 case 'red':$name = '< 5 jt';
                     break;
@@ -159,7 +167,7 @@ class Pembayaran extends \App\Controllers\Kewilayahan\Kytp
                     break;
             }
 
-            array_push($ret, ['name' => $name,
+            array_push($ret, ['name' => $b->NAMA_WARNA,
                 'color'                  => $b->WARNA_BYR,
                 'key'                    => $Ald->encryptMe($b->WARNA_BYR, $username),
                 'y'                      => floatval($b->Y),
@@ -332,13 +340,8 @@ class Pembayaran extends \App\Controllers\Kewilayahan\Kytp
             ->join('KPDL_MV_PENERIMAAN_AGG C', "A.NPWP = C.NPWP AND C.THNBYR = '" . $tahun . "' and BULAN=" . $bulan, "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') {
+        if ($query == 'grey') {
-            $data->groupStart();
+            $data->Where("C.WARNA_BYR IS NULL");
-            $data->orGroupStart();
-            $data->Where("C.WARNA_BYR IS NULL")
-                ->orWhere("C.WARNA_BYR", 'black');
-            $data->groupEnd();
-            $data->groupEnd();
         } else {
             $data->where("C.WARNA_BYR", $query);
         }
@@ -385,7 +388,7 @@ class Pembayaran extends \App\Controllers\Kewilayahan\Kytp
         if ($type == 'raw') {
             $data = $data->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,COALESCE(C.JML,0) JML,CASE WHEN C.WARNA_BYR IS NULL THEN 'BLACK' ELSE C.WARNA_BYR END WARNA_BYR,
+            A.TGL_DAFTAR,COALESCE(C.JML,0) JML,CASE WHEN C.WARNA_BYR IS NULL THEN 'grey' ELSE C.WARNA_BYR END WARNA_BYR,
             E.KETERANGAN, D.NM_KANTOR");
             // print_r($data->getCompiledSelect());
             // exit;

app/Views/kewilayahan/kytp/store/PetaStore.js

@@ -17,10 +17,10 @@ export const petaSlice = createSlice({
         info: 'di bawah Rp0',
         warna: '#202020'
       },
-      BLACK: {
+      grey: {
-        wb: 'BLACK',
+        wb: 'grey',
         info: 'Rp0',
-        warna: '#685f62'
+        warna: '#4f4b4d'
       },
       red: {
         wb: 'red',

app/Views/kewilayahan/peta/Legenda.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Card, CardBody, Col, Row } from 'reactstrap'
+// import { Card, CardBody, Col, Row } from 'reactstrap'
 import { styled } from '@mui/material/styles'
 import Chip from '@mui/material/Chip'
 import Paper from '@mui/material/Paper'

app/Views/kewilayahan/peta/MenuBawah.js

@@ -1,16 +1,16 @@
 /* eslint-disable no-unused-vars */
-import React, { useRef } from 'react'
+import React from 'react'
 import { register } from 'swiper/element/bundle'
 register()
 import Swiper from 'swiper'
-import { Navigation, Pagination } from 'swiper/modules'
+// import { Navigation, Pagination } from 'swiper/modules'
 // import Swiper and modules styles
 import 'swiper/css'
 import 'swiper/css/navigation'
 import 'swiper/css/pagination'
 import { Button, Card, CardBody } from 'reactstrap'
 import { useEffect, useState } from 'react'
-import { Category, Filter, Filter2, FilterAlt, Layers, Money, PointOfSale, RateReview, UploadFile } from '@mui/icons-material'
+import { FilterAlt, Money, UploadFile } from '@mui/icons-material'
 // import 'primereact/resources/themes/lara-light-cyan/theme.css'
 // import PoiInRadiusCenter from "./PoiInRadiusCenter"
 // import PopUpWilayah from "./PopUpFilter/PoUpWilayah"
@@ -18,7 +18,7 @@ import { Category, Filter, Filter2, FilterAlt, Layers, Money, PointOfSale, RateR
 import { useDispatch, useSelector } from 'react-redux'
 import PopUpWilayah from './PoUpWilayah'
 import jquery from 'jquery'
-import { matoaLayers } from './layers/overlayLayers'
+// import { matoaLayers } from './layers/overlayLayers'
 import PopUPTematikPembayaran from './PopUPTematikPembayaran'
 import PopUpRatingGoogle from './PopUpRatingGoogle'
 // import PoiInRadiusCenter from "./PoiInRadiusCenter"
@@ -29,7 +29,7 @@ const MenuBawah = (props) => {
   const [isOpenPopUpRating, setIsOpenPopUpRating] = useState(false)
   // const storeMap = useSelector((state) => state.crmmap)
   const [dataOpsi, setDataOpsi] = useState({})
-  const [filterWilayah, setFilterWilayah] = useState('(1=1)')
+  // const [filterWilayah, setFilterWilayah] = useState('(1=1)')
   useEffect(() => {
     new Swiper('.swiper', {
       slidesPerView: 4,

app/Views/kewilayahan/peta/PoUpWilayah.js

@@ -256,10 +256,10 @@ const PopUpWilayah = (props) => {
       cql_filter: '(1=1)'
     })
 
-    matoaLayers.poiGoogleLayer.setParams({
+    // matoaLayers.poiGoogleLayer.setParams({
-      styles: 'poi_google',
+    //   styles: 'poi_google',
-      cql_filter: '(1=1)'
+    //   cql_filter: '(1=1)'
-    })
+    // })
 
     setIsOpenPopUpWilayah(false)
   }
@@ -293,10 +293,10 @@ const PopUpWilayah = (props) => {
             cql_filter: cq_filter_poi
           })
 
-          matoaLayers.poiGoogleLayer.setParams({
+          // matoaLayers.poiGoogleLayer.setParams({
-            style: 'poi_google',
+          //   style: 'poi_google',
-            cql_filter: cq_filter_poi
+          //   cql_filter: cq_filter_poi
-          })
+          // })
           // console.log('wait....')
           jquery.ajax({
             url: '/engineN/kewilayahan/peta/kelurahanpoly',
@@ -346,10 +346,10 @@ const PopUpWilayah = (props) => {
             cql_filter: cq_filter_poi
           })
 
-          matoaLayers.poiGoogleLayer.setParams({
+          // matoaLayers.poiGoogleLayer.setParams({
-            styles: 'poi_google',
+          //   styles: 'poi_google',
-            cql_filter: cq_filter_poi
+          //   cql_filter: cq_filter_poi
-          })
+          // })
           jquery.ajax({
             url: '/engineN/kewilayahan/peta/zonapoly',
             type: 'post',

app/Views/kewilayahan/peta/PopUPTematikPembayaran.js

@@ -62,10 +62,10 @@ const PopUPTematikPembayaran = (props) => {
       cql_filter: '(1=1)'
     })
 
-    matoaLayers.poiGoogleLayer.setParams({
+    // matoaLayers.poiGoogleLayer.setParams({
-      styles: 'poi_google',
+    //   styles: 'poi_google',
-      cql_filter: '(1=1)'
+    //   cql_filter: '(1=1)'
-    })
+    // })
 
     setIsOpenPopUpPembayaran(false)
   }

app/Views/kewilayahan/peta/PopUpRatingGoogle.js

@@ -70,20 +70,20 @@ const PopUpRatingGoogle = (props) => {
       cql_filter: '(1=1)'
     })
 
-    matoaLayers.poiGoogleLayer.setParams({
+    // matoaLayers.poiGoogleLayer.setParams({
-      styles: 'poi_google',
+    //   styles: 'poi_google',
-      cql_filter: '(1=1)'
+    //   cql_filter: '(1=1)'
-    })
+    // })
 
     setIsOpenPopUpPembayaran(false)
   }
   const buttonProsesOnClick = () => {
     const cq_filter_poi = "REVIEW >= '" + value + "'"
     const paramExisting = storePeta.cqlFilterWilayah
-    matoaLayers.poiGoogleLayer.setParams({
+    // matoaLayers.poiGoogleLayer.setParams({
-      styles: 'poi_google',
+    //   styles: 'poi_google',
-      cql_filter: paramExisting + ' AND ' + cq_filter_poi
+    //   cql_filter: paramExisting + ' AND ' + cq_filter_poi
-    })
+    // })
 
     setIsOpenPopUpRating(false)
   }

app/Views/kewilayahan/peta/generalWms/ComponentPopUpNpwp.js

@@ -1,10 +1,10 @@
 import React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import { Card, CardBody, CardText, Button, Label, UncontrolledTooltip, Tooltip, CardFooter } from 'reactstrap'
+import { CardBody, Button, CardFooter } from 'reactstrap'
 // import { Button as Button2 } from 'primereact/button'
 // import { Skeleton } from 'primereact/skeleton'
-import { Bookmark, Circle, CornerUpRight, Star } from 'react-feather'
+import { Circle, CornerUpRight } from 'react-feather'
-import { Divider } from 'primereact/divider'
+// import { Divider } from 'primereact/divider'
 // import Rating from 'react-rating'
 // import { numberFormat } from '@utils'
 // import { Shortcut } from '@mui/icons-material'
@@ -37,7 +37,7 @@ export default function ComponentPopUpNpwp(props) {
   // }
   const ElementReact = () => {
     const petaStore = store.getState().peta
-    console.log(petaStore)
+    // console.log(petaStore)
     return (
       <>
         <input type="hidden" id="uuid" value={props.UUID} />

app/Views/kewilayahan/peta/layers/overlayLayers.js

@@ -1,17 +1,6 @@
-import React, { useEffect, useRef } from 'react'
+import React from 'react'
-import ReactDOMServer from 'react-dom/server'
+// import ReactDOMServer from 'react-dom/server'
-import { createTileLayerComponent, updateGridLayer } from '@react-leaflet/core'
+import L from 'leaflet'
-import L, { tileLayer } from 'leaflet'
-import isObject from 'lodash/isObject'
-import isFunction from 'lodash/isFunction'
-import isString from 'lodash/isString'
-import isEmpty from 'lodash/isEmpty'
-import clone from 'lodash/clone'
-import cloneDeep from 'lodash/cloneDeep'
-import extend from 'lodash/extend'
-import merge from 'lodash/merge'
-import has from 'lodash/has'
-import find from 'lodash/find'
 import 'leaflet.vectorgrid'
 import '../generalWms/L.VectorGrid.VectorPoi'
 import '../generalWms/L.TileLayer.GeneralWMS'
@@ -117,7 +106,7 @@ npwpInvalidlayer.on('click', (e) => {
 })
 
 export const matoaLayers = {
-  npwpInvalidlayer,
+  // npwpInvalidlayer,
   // poiGoogleLayer,
   poiMatoaNpwpLayer,
   poiMatoaNpwpNullLayer

app/Views/kewilayahan/peta/peta.js

@@ -1,8 +1,7 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react'
-import ReactDOM, { render } from 'react-dom'
+import ReactDOM from 'react-dom'
-import ReactDOMServer from 'react-dom/server'
+import { LayerGroup, MapContainer } from 'react-leaflet'
-import { LayerGroup, LayersControl, MapContainer, TileLayer, useMap } from 'react-leaflet'
+import L from 'leaflet'
-import L, { CRS, Control, Evented, Events, LatLngExpression, Layer, Map } from 'leaflet'
 import { baseLayer, layersmaps } from './layers/baseLayers'
 import { Skeleton } from 'primereact/skeleton'
 import 'leaflet/dist/Leaflet.css'
@@ -18,7 +17,7 @@ import jquery from 'jquery'
 import { Provider, useDispatch, useSelector } from 'react-redux'
 import { store } from '../kytp/store/store'
 import { matoaLayers, overlaysTree } from './layers/overlayLayers'
-import { getStatusSPT, setSelectedOpsi } from '../kytp/store/PetaStore'
+import { getStatusSPT } from '../kytp/store/PetaStore'
 import ControlCustom from 'react-leaflet-custom-control'
 import MenuBawah from './MenuBawah'
 import Legenda from './Legenda'

package.json

@@ -74,6 +74,7 @@
   "scripts": {
     "start": "npx webpack --config webpack-dev.config.js --watch",
     "serve": "npx webpack serve --config webpack-dev.config.js",
+    "dev": "npx webpack serve --config webpack-dev.config.js",
     "start2": "npx webpack --config webpack-dev.config2.js --watch",
     "build": "npx webpack --config webpack.config.js"
   }