Merge pull request #991 from sriranjan-s/Dev-2.0

published tl,fsm,ws,ptr,pgr on NPM
upyog · Mar 13, 2024 · a86584c · a86584c
2 parents 29a244b + 3ccfbec
commit a86584c
Show file tree

Hide file tree

Showing 14 changed files with 65 additions and 52 deletions.
diff --git a/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json b/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json
@@ -13,16 +13,16 @@
     "@upyog/digit-ui-libraries":"1.7.0-beta.5",
     "@upyog/digit-ui-module-common":"1.7.0-beta.5",
     "@upyog/digit-ui-module-engagement":"1.7.0-beta.4",
-    "@upyog/digit-ui-module-fsm":"1.7.0-beta.17",
+    "@upyog/digit-ui-module-fsm":"1.7.0-beta.18",
     "@upyog/digit-ui-module-mcollect":"1.7.0-beta.4",
     "@upyog/digit-ui-module-noc":"1.7.0-beta.3",
     "@upyog/digit-ui-module-obps":"1.7.0-beta.7",
-    "@upyog/digit-ui-module-pgr":"1.7.0-beta.5",
+    "@upyog/digit-ui-module-pgr":"1.7.0-beta.6",
     "@upyog/digit-ui-module-pt":"1.7.0-beta.4",
     "@upyog/digit-ui-module-receipts":"1.7.0-beta.3",
-    "@upyog/digit-ui-module-tl":"1.7.0-beta.7",
-    "@upyog/digit-ui-module-ws":"^1.7.0-beta.10",
-    "@upyog-niua/upyog-ui-module-ptr":"1.0.7",
+    "@upyog/digit-ui-module-tl":"1.7.0-beta.8",
+    "@upyog/digit-ui-module-ws":"1.7.0-beta.12",
+    "@upyog-niua/upyog-ui-module-ptr":"1.0.8",
     "@upyog/digit-ui-module-commonpt":"1.7.0-beta.4",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -13,18 +13,18 @@
     "@upyog/digit-ui-libraries": "1.7.0-beta.5",
     "@upyog/digit-ui-module-common": "1.7.0-beta.5",
     "@upyog/digit-ui-module-engagement": "1.7.0-beta.4",
-    "@upyog/digit-ui-module-fsm": "1.7.0-beta.17",
+    "@upyog/digit-ui-module-fsm": "1.7.0-beta.18",
     "@upyog/digit-ui-module-mcollect": "1.7.0-beta.4",
     "@upyog/digit-ui-module-noc": "1.7.0-beta.3",
     "@upyog/digit-ui-module-obps": "1.7.0-beta.7",
-    "@upyog/digit-ui-module-pgr": "1.7.0-beta.5",
+    "@upyog/digit-ui-module-pgr": "1.7.0-beta.6",
     "@upyog/digit-ui-module-pt": "1.7.0-beta.4",
     "@upyog/digit-ui-module-receipts": "1.7.0-beta.3",
-    "@upyog/digit-ui-module-tl": "1.7.0-beta.7",
-    "@upyog/digit-ui-module-ws": "^1.7.0-beta.10",
+    "@upyog/digit-ui-module-tl": "1.7.0-beta.8",
+    "@upyog/digit-ui-module-ws": "1.7.0-beta.12",
     "@upyog/digit-ui-module-bills": "^1.7.0-beta.3",
     "@upyog/digit-ui-module-commonpt": "1.7.0-beta.4",
-    "@upyog-niua/upyog-ui-module-ptr":"1.0.7",
+    "@upyog-niua/upyog-ui-module-ptr":"1.0.8",
     "http-proxy-middleware": "^1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json
@@ -12,15 +12,7 @@
     "packages/modules/commonPt",
     "packages/modules/dss",
     "packages/modules/pt",
-    "packages/modules/obps",
-    "packages/modules/ptr",
-    "packages/modules/pgr",
-    "packages/modules/tl",
-    "packages/modules/fsm",
-    "packages/modules/ws"
-
-
-
+    "packages/modules/obps"
   ],
   "author": "Abhinav Kushwaha <[email protected]>",
   "license": "MIT",
@@ -69,7 +61,7 @@
     "buildD:mcollect": "cd packages/modules/mCollect && yarn build",
     "buildD:receipts": "cd packages/modules/receipts && yarn build",
     "buildD:tl": "cd packages/modules/tl && yarn build",
-    "build:ptr": "cd packages/modules/ptr && yarn build",
+    "buildD:ptr": "cd packages/modules/ptr && yarn build",
     "buildD:hrms": "cd packages/modules/hrms && yarn build",
     "build:obps": "cd packages/modules/obps && yarn build",
     "buildD:engagement": "cd packages/modules/engagement && yarn build",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/fsm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-fsm",
-  "version": "1.7.0-beta.17",
+  "version": "1.7.0-beta.18",
   "license": "MIT",
   "main": "dist/index.js",
   "description": "Digit FSM Module",

diff --git a/...eb/micro-ui-internals/packages/modules/obps/src/pages/citizen/EDCR/EDCRAcknowledgement.js b/...eb/micro-ui-internals/packages/modules/obps/src/pages/citizen/EDCR/EDCRAcknowledgement.js
@@ -42,6 +42,8 @@ const EDCRAcknowledgement = (props) => {
   const isMobile = window.Digit.Utils.browser.isMobile();
   const { data:homePageUrlLinks , isLoading: homePageUrlLinksLoading } = Digit.Hooks.obps.useMDMS(state, "BPA", ["homePageUrlLinks"]);
   const { isMdmsLoading, data: mdmsData } = Digit.Hooks.obps.useMDMS(state, "BPA", ["RiskTypeComputation"]);
+  //const { isMdmsLoading, data: mdmsData } = Digit.Hooks.obps.useMDMS(state, "BPA", ["GaushalaFees","MalbaCharges","LabourCess"]);
+
 
   useEffect(() => {
     if (!homePageUrlLinksLoading && homePageUrlLinks?.BPA?.homePageUrlLinks?.length > 0) {

diff --git a/...end/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/EDCR/index.js b/...end/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/EDCR/index.js
@@ -65,6 +65,8 @@ const CreateEDCR = ({ parentRoute }) => {
       .then((result, err) => {
         setIsSubmitBtnDisable(false);
         if (result?.data?.edcrDetail) {
+          console.log("result?.data",result?.data)
+          sessionStorage.setItem("plotArea",result?.data?.edcrDetail[0].planDetail?.plot?.area  || 0)
           setParams(result?.data?.edcrDetail);
           history.replace(
             `/digit-ui/citizen/obps/edcrscrutiny/apply/acknowledgement`, ///${result?.data?.edcrDetail?.[0]?.edcrNumber}

diff --git a/...micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js b/...micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js
@@ -2,7 +2,7 @@ import {
     Card, CardHeader, CardSubHeader, CardText,TextInput,CardLabel,
     CitizenInfoLabel, Header, LinkButton, Row, StatusTable, SubmitBar, Table, CardSectionHeader, EditIcon, PDFSvg, Loader
   } from "@upyog/digit-ui-react-components";
-  import React,{ useMemo, useState }  from "react";
+  import React,{ useEffect, useMemo, useState }  from "react";
   import { useTranslation } from "react-i18next";
   import { useHistory, useRouteMatch } from "react-router-dom";
   import Timeline from "../../../components/Timeline";
@@ -13,11 +13,17 @@ import {
     const [development, setDevelopment] = useState()
     const [otherCharges, setOtherCharges] = useState()
     const [lessAdjusment, setLessAdjusment] = useState()
+    const [labourCess , setLabourCess] =useState()
+    const [gaushalaFees , setGaushalaFees] =useState()
+    const [malbafees , setMalbafees] =useState()
+    const [waterCharges , setWaterCharges] =useState()
     const { t } = useTranslation();
     const history = useHistory();
     const match = useRouteMatch();
     let user = Digit.UserService.getUser();
+    const state = Digit.ULBService.getStateId();
     const tenantId = user?.info?.permanentCity || value?.tenantId ||Digit.ULBService.getCurrentTenantId() ;
+    const { isMdmsLoading, data: mdmsData } = Digit.Hooks.obps.useMDMS(state, "BPA", ["GaushalaFees","MalbaCharges","LabourCess"]);
     let BusinessService;
     if(value.businessService === "BPA_LOW")
     BusinessService="BPA.LOW_RISK_PERMIT_FEE";
@@ -26,7 +32,20 @@ import {
 
     const { data, address, owners, nocDocuments, documents, additionalDetails, subOccupancy,PrevStateDocuments,PrevStateNocDocuments,applicationNo } = value;
     const isEditApplication = window.location.href.includes("editApplication");
-
+    useEffect(()=>{
+console.log("mdmsData",mdmsData)
+const LabourCess = sessionStorage.getItem("plotArea") > 909 ?mdmsData?.BPA?.LabourCess[1].rate * sessionStorage.getItem("plotArea") : sessionStorage.getItem("plotArea")*0
+ const GaushalaFees =  mdmsData?.BPA?.GaushalaFees[0].rate  
+ const Malbafees = (sessionStorage.getItem("plotArea") <=500 ?mdmsData?.BPA?.MalbaCharges[0].rate :sessionStorage.getItem("plotArea") >500 && sessionStorage.getItem("plotArea") <=1000 ?mdmsData?.MalbaCharges?.BPA[1].rate :mdmsData?.MalbaCharges?.BPA[2].rate || 500)
+sessionStorage.setItem("Malbafees",Malbafees)
+sessionStorage.setItem("WaterCharges",Malbafees/2)
+sessionStorage.setItem("GaushalaFees",GaushalaFees)
+sessionStorage.setItem("LabourCess",LabourCess)
+setGaushalaFees(GaushalaFees)
+setLabourCess(LabourCess)
+setMalbafees(Malbafees)
+setWaterCharges(Malbafees/2)
+},[mdmsData])
       // for application documents
       let improvedDoc = [];
       PrevStateDocuments?.map(preDoc => { improvedDoc.push({...preDoc, module: "OBPS"}) });
@@ -334,13 +353,13 @@ import {
       ))} */}
        {/* <Row className="border-none" label={t(`BPA_COMMON_TOTAL_AMT`)} text={`₹ ${paymentDetails?.Bill?.[0]?.billDetails[0]?.amount || "0"}`} /> */}
        <CardSubHeader>{t("BPA_P1_SUMMARY_FEE_EST")}</CardSubHeader> 
-       <Row className="border-none" label={t(`BPA_COMMON_P1_AMT`)} text={`₹ ${data?.boundaryWallLength*2.5 + 400 * 2.5}`} />
+       <Row className="border-none" label={t(`BPA_COMMON_P1_AMT`)} text={`₹ ${data?.boundaryWallLength*2.5 + sessionStorage.getItem("plotArea") * 2.5}`} />
        <CardSubHeader>{t("BPA_P2_SUMMARY_FEE_EST")}</CardSubHeader> 
 
-       <Row className="border-none" label={t(`BPA_COMMON_MALBA_AMT`)} text={`₹ ${"100"}`} />
-       <Row className="border-none" label={t(`BPA_COMMON_LABOUR_AMT`)} text={`₹ ${"0"}`} />
-       <Row className="border-none" label={t(`BPA_COMMON_WATER_AMT`)} text={`₹ ${"50"}`} />
-       <Row className="border-none" label={t(`BPA_COMMON_GAUSHALA_AMT`)} text={`₹ ${"50"}`} />
+       <Row className="border-none" label={t(`BPA_COMMON_MALBA_AMT`)} text={`₹ ${malbafees}`} />
+       <Row className="border-none" label={t(`BPA_COMMON_LABOUR_AMT`)} text={`₹ ${labourCess}`} />
+       <Row className="border-none" label={t(`BPA_COMMON_WATER_AMT`)} text={`₹ ${waterCharges}`} />
+       <Row className="border-none" label={t(`BPA_COMMON_GAUSHALA_AMT`)} text={`₹ ${gaushalaFees}`} />
        <CardSubHeader>{t("BPA_P2_SUMMARY_FEE_EST_MANUAL")}</CardSubHeader>
        <CardLabel>{t("BPA_COMMON_DEVELOPMENT_AMT")}</CardLabel>
             <TextInput

diff --git a/...nternals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/OBPSAcknowledgement.js b/...nternals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/OBPSAcknowledgement.js
@@ -86,6 +86,13 @@ const OBPSAcknowledgement = ({ data, onSuccess }) => {
       mutation1.mutate(formdata, {
         onSuccess,
       });
+      sessionStorage.clear("Malbafees")
+      sessionStorage.clear("WaterCharges")
+      sessionStorage.clear("GaushalaFees")
+      sessionStorage.clear("LabourCess")
+      sessionStorage.clear("otherCharges")
+      sessionStorage.clear("lessAdjusment")
+      sessionStorage.clear("development")
 
     } catch (err) {
     }

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/utils/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/utils/index.js
@@ -408,14 +408,15 @@ export const convertToBPAObject = (data, isOCBPA = false, isSendBackTOCitizen =
       additionalDetails: {
         ...data?.additionalDetails,
         selfCertificationCharges:[
-          {"BPA_MALBA_CHARGES" : 100},
-          {"BPA_LABOUR_CESS": 0},
-          {"BPA_WATER_CHARGES":50},
-          {"BPA_GAUSHALA_CHARGES_CESS":50},
+          {"BPA_MALBA_CHARGES" : sessionStorage.getItem("Malbafees")},
+          {"BPA_LABOUR_CESS": sessionStorage.getItem("LabourCess")},
+          {"BPA_WATER_CHARGES":sessionStorage.getItem("WaterCharges")},
+          {"BPA_GAUSHALA_CHARGES_CESS":sessionStorage.getItem("GaushalaFees")},
           {"BPA_LESS_ADJUSMENT_PLOT":sessionStorage.getItem("development")},
           {"BPA_DEVELOPMENT_CHARGES":sessionStorage.getItem("lessAdjusment")},
           {"BPA_OTHER_CHARGES":sessionStorage.getItem("otherCharges")}
           ],
+          P1charges:data?.data?.boundaryWallLength*2.5 + sessionStorage.getItem("plotArea") * 2.5,
         GISPlaceName : data?.address?.placeName,
         holdingNo: data?.data?.holdingNumber ? data?.data?.holdingNumber : data?.additionalDetails?.holdingNo,
         boundaryWallLength:data?.data?.boundaryWallLength ? data?.data?.boundaryWallLength : data?.additionalDetails?.boundaryWallLength , 

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/pgr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-pgr",
-  "version": "1.7.0-beta.5",
+  "version": "1.7.0-beta.6",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/package.json
@@ -1,7 +1,6 @@
 {
   "name": "@upyog-niua/upyog-ui-module-ptr",
-  "author": "Shivank Shukla & Abhijeet Verma",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/tl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-tl",
-  "version": "1.7.0-beta.7",
+  "version": "1.7.0-beta.8",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-ws",
-  "version": "1.7.0-beta.10",
+  "version": "1.7.0-beta.12",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.modern.js",

diff --git a/frontend/micro-ui/web/package.json b/frontend/micro-ui/web/package.json
@@ -11,16 +11,7 @@
     "micro-ui-internals/packages/modules/commonPt",
     "micro-ui-internals/packages/modules/dss",
     "micro-ui-internals/packages/modules/pt",
-    "micro-ui-internals/packages/modules/obps",
-    "micro-ui-internals/packages/modules/ptr",
-    "micro-ui-internals/packages/modules/tl",
-    "micro-ui-internals/packages/modules/pgr",
-    "micro-ui-internals/packages/modules/fsm",
-    "micro-ui-internals/packages/modules/ws"
-
-
-
-
+    "micro-ui-internals/packages/modules/obps"
   ],
   "engines": {
     "node": ">=14"
@@ -33,19 +24,19 @@
     "@upyog/digit-ui-module-core": "1.7.0-beta.3",
     "@upyog/digit-ui-module-engagement": "1.7.0-beta.4",
     "@upyog/digit-ui-module-dss": "1.7.0-beta.4",
-    "@upyog/digit-ui-module-fsm": "1.7.0-beta.17",
+    "@upyog/digit-ui-module-fsm": "1.7.0-beta.18",
     "@upyog/digit-ui-module-hrms": "1.7.0-beta.3",
     "@upyog/digit-ui-module-mcollect": "1.7.0-beta.4",
     "@upyog/digit-ui-module-commonpt":"1.7.0-beta.4",
     "@upyog/digit-ui-module-obps": "1.7.0-beta.7",
     "@upyog/digit-ui-module-noc": "1.7.0-beta.3",
-    "@upyog/digit-ui-module-pgr": "1.7.0-beta.5",
+    "@upyog/digit-ui-module-pgr": "1.7.0-beta.6",
     "@upyog/digit-ui-module-pt": "1.7.0-beta.4",
     "@upyog/digit-ui-module-receipts": "1.7.0-beta.3",
-    "@upyog/digit-ui-module-tl": "1.7.0-beta.7",
-    "@upyog/digit-ui-module-ws": "1.7.0-beta.10",
+    "@upyog/digit-ui-module-tl": "1.7.0-beta.8",
+    "@upyog/digit-ui-module-ws": "1.7.0-beta.12",
     "@upyog/digit-ui-react-components": "1.7.0-beta.4",
-    "@upyog-niua/upyog-ui-module-ptr": "1.0.7",
+    "@upyog-niua/upyog-ui-module-ptr": "1.0.8",
     "babel-loader": "8.1.0",
     "react": "17.0.2",
     "react-dom": "17.0.2",