diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/InspectionReport.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/InspectionReport.js index 07b2cb92ee1..9b06e2ab0da 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/InspectionReport.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/InspectionReport.js @@ -263,12 +263,12 @@ const InspectionReportForm = (_props) => { {questionList && questionList.map((ob, ind) => (
- {`${t(ob.question)}*`} + {`${t(ob.question)}`}
( {doc?.documentType != "OLDLICENCENO" ? - `${t(`${doc?.documentType.replaceAll(".", "_")}`)}*` : + `${t(`${doc?.documentType.replaceAll(".", "_")}`)}` : `${t(`${doc?.documentType.replaceAll(".", "_")}`)}`}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js index 3147fa6a7d0..39743138c9f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/CheckPage.js @@ -379,7 +379,7 @@ setWaterCharges(Malbafees/2) isMandatory={false} optionKey="i18nKey" name="email" - defaultValue={value?.additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES || ""} + defaultValue={value?.additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES } value={development} onChange={(e) => {setDevelopment(e.target.value),sessionStorage.setItem("development",e.target.value)}} //disable={userInfo?.info?.emailId && !isOpenLinkFlow ? true : false} @@ -393,7 +393,7 @@ setWaterCharges(Malbafees/2) isMandatory={false} optionKey="i18nKey" name="email" - defaultValue={value?.additionalDetails?.selfCertificationCharges?.BPA_OTHER_CHARGES || ""} + defaultValue={value?.additionalDetails?.selfCertificationCharges?.BPA_OTHER_CHARGES } value={otherCharges} onChange={(e) => {setOtherCharges(e.target.value),sessionStorage.setItem("otherCharges",e.target.value)}} //disable={userInfo?.info?.emailId && !isOpenLinkFlow ? true : false} @@ -407,7 +407,7 @@ setWaterCharges(Malbafees/2) isMandatory={false} optionKey="i18nKey" name="email" - defaultValue={value?.additionalDetails?.selfCertificationCharges?.BPA_LESS_ADJUSMENT_PLOT || ""} + defaultValue={value?.additionalDetails?.selfCertificationCharges?.BPA_LESS_ADJUSMENT_PLOT } value={lessAdjusment} onChange={(e) => {setLessAdjusment(e.target.value),sessionStorage.setItem("lessAdjusment",e.target.value)}} //disable={userInfo?.info?.emailId && !isOpenLinkFlow ? true : false} @@ -419,7 +419,7 @@ setWaterCharges(Malbafees/2)
{/* {t("BPA_COMMON_TOTAL_AMT")} ₹ {paymentDetails?.Bill?.[0]?.billDetails[0]?.amount || "0"} */} - + ); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/index.js index 572b3962431..9cdad5cbd86 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/employee/index.js @@ -73,8 +73,10 @@ const EmployeeApp = ({ path }) => { + } /> + } /> } /> diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ApplicationDetailsContent.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ApplicationDetailsContent.js index ca2ea9ee731..45847043c02 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ApplicationDetailsContent.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ApplicationDetailsContent.js @@ -49,7 +49,7 @@ function ApplicationDetailsContent({ isInfoLabel = false }) { const { t } = useTranslation(); - + let isEditApplication=window.location.href.includes("editApplication") && window.location.href.includes("bpa") ; const ownersSequences= applicationDetails?.applicationData?.owners console.log("appl", applicationDetails) @@ -350,7 +350,7 @@ console.log("appl", applicationDetails)
{detail?.belowComponent && } {detail?.additionalDetails?.inspectionReport && ( - + )} {applicationDetails?.applicationData?.additionalDetails?.fieldinspection_pending?.length > 0 && detail?.additionalDetails?.fiReport && ( @@ -370,7 +370,7 @@ console.log("appl", applicationDetails) {detail?.additionalDetails?.owners && } {detail?.additionalDetails?.units && } {detail?.additionalDetails?.accessories && } - {detail?.additionalDetails?.permissions && workflowDetails?.data?.nextActions?.length > 0 && ( + {!isEditApplication && detail?.additionalDetails?.permissions && workflowDetails?.data?.nextActions?.length > 0 && ( )} {detail?.additionalDetails?.obpsDocuments && ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ScruntinyDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ScruntinyDetails.js index 08f38c361d1..e57e572994f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ScruntinyDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/components/ScruntinyDetails.js @@ -1,8 +1,21 @@ -import { StatusTable, Row, PDFSvg, CardLabel, CardSubHeader } from "@upyog/digit-ui-react-components"; -import React, { Fragment } from "react"; +import { StatusTable, Row, PDFSvg, CardLabel, CardSubHeader,TextInput } from "@upyog/digit-ui-react-components"; +import React, { Fragment,useEffect,useState } from "react"; import { useTranslation } from "react-i18next"; -const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[] }) => { +const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails }) => { + const isEditApplication = window.location.href.includes("editApplication") && window.location.href.includes("bpa") ; + const [development, setDevelopment] = useState() + const [otherCharges, setOtherCharges] = useState() + const [lessAdjusment, setLessAdjusment] = useState() + useEffect(()=>{ + setDevelopment(additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES); + sessionStorage.setItem("development",additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES); + setOtherCharges(additionalDetails?.selfCertificationCharges?.BPA_OTHER_CHARGES); + sessionStorage.setItem("otherCharges",additionalDetails?.selfCertificationCharges?.BPA_OTHER_CHARGES); + setLessAdjusment(additionalDetails?.selfCertificationCharges?.BPA_LESS_ADJUSMENT_PLOT); + sessionStorage.setItem("lessAdjusment",additionalDetails?.selfCertificationCharges?.BPA_LESS_ADJUSMENT_PLOT); + },[additionalDetails]) + const { t } = useTranslation(); let count = 0; const getTextValues = (data) => { @@ -26,6 +39,58 @@ const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[] }) => { return {value?.title} })}
+ {window.location.href.includes("employee") && scrutinyDetails?.values[0]?.title=="BPA_APPL_FEES_DETAILS" && +
+ {t("BPA_P2_SUMMARY_FEE_EST")} + + + + + {t("BPA_P2_SUMMARY_FEE_EST_MANUAL")} + {/* + + */} + {t("BPA_COMMON_DEVELOPMENT_AMT")} + {setDevelopment(e.target.value),sessionStorage.setItem("development",e.target.value)}} + /> + {t("BPA_COMMON_OTHER_AMT")} + {setOtherCharges(e.target.value),sessionStorage.setItem("otherCharges",e.target.value)}} + //disable={userInfo?.info?.emailId && !isOpenLinkFlow ? true : false} + //disable={editScreen} + //{...{ required: true, pattern: "[A-Za-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$", type: "email", title: t("CORE_COMMON_APPLICANT_MOBILE_NUMBER_INVALID") }} + /> + {t("BPA_COMMON_LESS_AMT")} + {setLessAdjusment(e.target.value),sessionStorage.setItem("lessAdjusment",e.target.value)}} + /> +
+ }
{scrutinyDetails?.scruntinyDetails?.map((report, index) => { return ( diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/index.js index d107ef308a2..88faae3a7d3 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/index.js @@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { useQueryClient } from "react-query"; -import { Loader } from "@upyog/digit-ui-react-components"; +import { Loader,SubmitBar } from "@upyog/digit-ui-react-components"; import ActionModal from "./Modal"; @@ -13,6 +13,7 @@ import ApplicationDetailsActionBar from "./components/ApplicationDetailsActionBa import ApplicationDetailsWarningPopup from "./components/ApplicationDetailsWarningPopup"; const ApplicationDetails = (props) => { + let isEditApplication=window.location.href.includes("editApplication") && window.location.href.includes("bpa") ; const tenantId = Digit.ULBService.getCurrentTenantId(); const state = Digit.ULBService.getStateId(); const { t } = useTranslation(); @@ -58,6 +59,9 @@ const ApplicationDetails = (props) => { function onActionSelect(action) { if (action) { + if(action?.action=="EDIT"){ + window.location.assign(window.location.href.split("bpa")[0]+"editApplication/bpa"+window.location.href.split("bpa")[1]); + } if(action?.isToast){ setShowToast({ key: "error", error: { message: action?.toastMessage } }); setTimeout(closeToast, 5000); @@ -76,7 +80,7 @@ const ApplicationDetails = (props) => { else { window.location.assign(`${window.location.origin}/digit-ui/employee/payment/collect/${action?.redirectionUrll?.pathname}`); } - } else if (!action?.redirectionUrl) { + } else if (!action?.redirectionUrl && action?.action!="EDIT") { setShowModal(true); } else { history.push({ @@ -189,6 +193,28 @@ const ApplicationDetails = (props) => { if (isLoading || isEnableLoader) { return ; } + const onSubmit =async(data)=> { + const bpaApplicationDetails = await Digit.OBPSService.BPASearch(tenantId, {applicationNo: applicationData?.applicationNo}); + const bpaDetails={ + BPA:bpaApplicationDetails.BPA[0] + } + //bpaDetails.BPA.riskType="HIGH" + bpaDetails.BPA.workflow={ + "action": "EDIT", + "assignes": [], + "comments": null, + "varificationDocuments": null + } + bpaDetails.BPA.additionalDetails.selfCertificationCharges.BPA_DEVELOPMENT_CHARGES=sessionStorage.getItem("development"); + bpaDetails.BPA.additionalDetails.selfCertificationCharges.BPA_OTHER_CHARGES=sessionStorage.getItem("otherCharges"); + bpaDetails.BPA.additionalDetails.selfCertificationCharges.BPA_LESS_ADJUSMENT_PLOT=sessionStorage.getItem("lessAdjusment"); + if (!bpaDetails.BPA.additionalDetails.selfCertificationCharges.BPA_DEVELOPMENT_CHARGES || !bpaDetails.BPA.additionalDetails.selfCertificationCharges.BPA_OTHER_CHARGES || !bpaDetails.BPA.additionalDetails.selfCertificationCharges.BPA_LESS_ADJUSMENT_PLOT ){ + alert("Please fill P2 Manual Fees");} + else{ + const response = await Digit.OBPSService.update(bpaDetails, tenantId); + window.location.assign(window.location.href.split("/editApplication")[0]+window.location.href.split("editApplication")[1]); + } + }; return ( @@ -235,7 +261,8 @@ const ApplicationDetails = (props) => { /> ) : null} - { ActionBarStyle={ActionBarStyle} MenuStyle={MenuStyle} /> + ):(
+ +
)} ) : (