Merge pull request #1080 from deepa-s-13/Dev-2.0

OBPAS CHANGES
upyog · May 2, 2024 · 5856044 · 5856044
2 parents 65990df + 927424a
commit 5856044
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 15 deletions.
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/OBPS.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/OBPS.js
@@ -350,7 +350,7 @@ export const OBPSService = {
         { title: "BPA_STATUS_LABEL", value: `${fetchBillRes?.Bill?.[0]?.totalAmount == 0 ? "Paid" : "Unpaid"}` }
       )
     }
-    totalAmount > 0 && collectionBillArray.push({ title: "BPA_TOT_AMT_PAID", value: `₹${totalAmount}` });
+    //totalAmount > 0 && collectionBillArray.push({ title: "BPA_TOT_AMT_PAID", value: `₹${totalAmount}` });
 
     const billDetails = {
       title: "BPA_FEE_DETAILS_LABEL",

diff --git a/.../micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/index.js b/.../micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/index.js
@@ -511,7 +511,12 @@ const BpaApplicationDetail = () => {
 
                 {/* to get Fee values */}
                 {detail?.additionalDetails?.inspectionReport && detail?.isFeeDetails && <ScruntinyDetails scrutinyDetails={detail?.additionalDetails} paymentsList={[]}/>}
-
+                 {/*blocking reason*/}
+                {detail?.additionalDetails?.inspectionReport && detail?.isFeeDetails && (workflowDetails?.data?.actionState?.nextActions[0]?.state=="POST_PAYMENT_CITIZEN_APPROVAL_PENDING"|| workflowDetails?.data?.actionState?.state=="POST_PAYMENT_CITIZEN_APPROVAL_PENDING") &&
+                <div style={ { marginTop: "19px", background: "#FAFAFA", border: "1px solid #D6D5D4", borderRadius: "4px", padding: "8px", lineHeight: "19px", maxWidth: "950px", minWidth: "280px"} }>
+                  <Row className="border-none" label={t(`BLOCKING_REASON`)} labelStyle={{fontSize: "15px"}} text={data?.applicationData.additionalDetails.blockingReason || "NA"}> </Row>
+                </div>
+                }
               </StatusTable>
               </div>
             </Card> : null }

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
@@ -187,6 +187,16 @@ setWaterCharges(Malbafees/2)
       return <Loader />
     }
 
+    function onSubmitCheck(){
+      if(development && otherCharges && lessAdjusment){
+      if(parseInt(lessAdjusment)>(parseInt(development)+parseInt(otherCharges)+parseInt(malbafees)+parseInt(labourCess)+parseInt(waterCharges)+parseInt(gaushalaFees))){
+        alert("Enterd Less Adjustment amount is invalid");
+      }
+      else{
+        onSubmit();
+      }
+    }}
+
     function setOtherChargesVal(value) {
       if(/^[0-9]*$/.test(value)){
         setOtherCharges(value);
@@ -446,7 +456,7 @@ setWaterCharges(Malbafees/2)
       <hr style={{color:"#cccccc",backgroundColor:"#cccccc",height:"2px",marginTop:"20px",marginBottom:"20px"}}/>
       {/* <CardHeader>{t("BPA_COMMON_TOTAL_AMT")}</CardHeader> 
       <CardHeader>₹ {paymentDetails?.Bill?.[0]?.billDetails[0]?.amount || "0"}</CardHeader>  */}
-      <SubmitBar label={t("BPA_SEND_TO_CITIZEN_LABEL")} onSubmit={onSubmit} disabled={ (!development||!otherCharges||!lessAdjusment)} id/>
+      <SubmitBar label={t("BPA_SEND_TO_CITIZEN_LABEL")} onSubmit={onSubmitCheck} disabled={ (!development||!otherCharges||!lessAdjusment)} id/>
       </Card>
     </React.Fragment>
     );

diff --git a/.../micro-ui-internals/packages/modules/templates/ApplicationDetails/Modal/BPAActionModal.js b/.../micro-ui-internals/packages/modules/templates/ApplicationDetails/Modal/BPAActionModal.js
@@ -23,7 +23,7 @@ const CloseBtn = (props) => {
   );
 };
 
-const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, actionData, applicationDetails, applicationData, businessService, moduleCode,workflowDetails }) => {
+const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction, actionData, applicationDetails, applicationData, businessService, moduleCode,workflowDetails,blockReason }) => {
   const mutation1 = Digit.Hooks.obps.useObpsAPI(
       applicationData?.landInfo?.address?.city ? applicationData?.landInfo?.address?.city : tenantId,
       false
@@ -41,7 +41,9 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
   const [config, setConfig] = useState({});
   const [defaultValues, setDefaultValues] = useState({});
   const [approvers, setApprovers] = useState([]);
+  const [blockReasonFiltered, setFilteredBlockReason] = useState([]);
   const [selectedApprover, setSelectedApprover] = useState({});
+  const [selectedBlockReason, setBlockReason] = useState({});
   const [file, setFile] = useState(null);
   const [uploadedFile, setUploadedFile] = useState(null);
   const [error, setError] = useState(null);
@@ -174,7 +176,7 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
     applicationData = {
       ...applicationData,
       documents: getDocuments(applicationData),
-      additionalDetails: {...applicationData?.additionalDetails, fieldinspection_pending:getfeildInspection(applicationData), pendingapproval: getPendingApprovals() },
+      additionalDetails: {...applicationData?.additionalDetails, fieldinspection_pending:getfeildInspection(applicationData), pendingapproval: getPendingApprovals(),blockingReason:selectedBlockReason?.name  },
        workflow:{
         action: action?.action,
         comment: data?.comments?.length > 0 ? data?.comments : null,
@@ -204,6 +206,17 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
         ]
         : null,
     };
+    if (!sessionStorage.getItem("development") || !sessionStorage.getItem("otherCharges") || !sessionStorage.getItem("lessAdjusment") ){
+      closeModal()
+      alert("Please fill P2 Manual Fees");}
+    else if(parseInt(sessionStorage.getItem("lessAdjusment"))>(parseInt(sessionStorage.getItem("development"))+parseInt(sessionStorage.getItem("otherCharges"))+parseInt(applicationData?.additionalDetails?.selfCertificationCharges?.BPA_MALBA_CHARGES)+parseInt(applicationData?.additionalDetails?.selfCertificationCharges?.BPA_LABOUR_CESS)+parseInt(applicationData?.additionalDetails?.selfCertificationCharges?.BPA_WATER_CHARGES)+parseInt(applicationData?.additionalDetails?.selfCertificationCharges?.BPA_GAUSHALA_CHARGES_CESS))){
+      closeModal()
+      alert("Enterd Less Adjustment amount is invalid");
+    }
+    else{
+    applicationData.additionalDetails.selfCertificationCharges.BPA_DEVELOPMENT_CHARGES=sessionStorage.getItem("development");
+    applicationData.additionalDetails.selfCertificationCharges.BPA_OTHER_CHARGES=sessionStorage.getItem("otherCharges");
+    applicationData.additionalDetails.selfCertificationCharges.BPA_LESS_ADJUSMENT_PLOT=sessionStorage.getItem("lessAdjusment");
 
     const nocDetails = applicationDetails?.nocData?.map(noc => {
       const uploadedDocuments = Digit.SessionStorage.get(noc?.nocType) || [];
@@ -266,16 +279,17 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
   {
     submitAction({
       BPA:applicationData
-    }, nocData?.length > 0 ? nocData : false, {isStakeholder: false, bpa: true})
-
+    }, nocData?.length > 0 ? nocData : false, {isStakeholder: false, bpa: true})    
   }
+    }    
   }
   const closeModalNew = ()=>{
     closeModal()
     alert("Please fill Inspection Date and Time")
   }
 
   useEffect(() => {
+    setFilteredBlockReason(blockReason?.map((blockReason) => ({ code: blockReason?.code, name: blockReason?.value })));
     if (action) {
       setConfig(
         configBPAApproverApplication({
@@ -284,12 +298,15 @@ const ActionModal = ({ t, action, tenantId, state, id, closeModal, submitAction,
           approvers,
           selectedApprover,
           setSelectedApprover,
+          selectedBlockReason,
+          setBlockReason,
           selectFile,
           uploadedFile,
           setUploadedFile,
           businessService,
           assigneeLabel: "WF_ASSIGNEE_NAME_LABEL",
-          error
+          error,
+          blockReasonFiltered
         })
       );
     }

diff --git a/...als/packages/modules/templates/ApplicationDetails/components/ApplicationDetailsContent.js b/...als/packages/modules/templates/ApplicationDetails/components/ApplicationDetailsContent.js
@@ -350,7 +350,7 @@ console.log("appl", applicationDetails)
           </div>
           {detail?.belowComponent && <detail.belowComponent />}
           {detail?.additionalDetails?.inspectionReport && (
-            <ScruntinyDetails scrutinyDetails={detail?.additionalDetails} paymentsList={paymentsList} additionalDetails={applicationDetails?.applicationData?.additionalDetails} />
+            <ScruntinyDetails scrutinyDetails={detail?.additionalDetails} paymentsList={paymentsList} additionalDetails={applicationDetails?.applicationData?.additionalDetails} applicationData={applicationDetails?.applicationData} />
           )}
           {applicationDetails?.applicationData?.additionalDetails?.fieldinspection_pending?.length > 0 && detail?.additionalDetails?.fiReport && (
             <InspectionReport fiReport={applicationDetails?.applicationData?.additionalDetails?.fieldinspection_pending} />

diff --git a/...ui-internals/packages/modules/templates/ApplicationDetails/components/ScruntinyDetails.js b/...ui-internals/packages/modules/templates/ApplicationDetails/components/ScruntinyDetails.js
@@ -2,11 +2,22 @@ import { StatusTable, Row, PDFSvg, CardLabel, CardSubHeader,TextInput  } from "@
 import React, { Fragment,useEffect,useState } from "react";
 import { useTranslation } from "react-i18next";
 
-const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails }) => {
-  const isEditApplication =  window.location.href.includes("editApplication") && window.location.href.includes("bpa") ;
+const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails,applicationData }) => {
+  const isEditApplication =  (window.location.href.includes("editApplication") || applicationData?.status=="FIELDINSPECTION_INPROGRESS") && window.location.href.includes("bpa") ;
   const [development, setDevelopment] = useState()
   const [otherCharges, setOtherCharges] = useState()
   const [lessAdjusment, setLessAdjusment] = useState()
+  const styles = {
+    buttonStyle: { display: "flex", justifyContent: "flex-start", color: "#a82227" },
+    headerStyle: {
+      marginTop: "10px",
+      fontSize: "16px",
+      fontWeight: "700",
+      lineHeight: "24px",
+      color: " rgba(11, 12, 12, var(--text-opacity))",
+    },
+  };
+  const [showSanctionFee, setShowSanctionFee] = useState(false);
   useEffect(()=>{    
       setDevelopment(additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES);
       sessionStorage.setItem("development",additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES);
@@ -68,15 +79,38 @@ const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails }
           </div>
           {window.location.href.includes("employee") && scrutinyDetails?.values[0]?.title=="BPA_APPL_FEES_DETAILS" && 
           <div>
+          {!showSanctionFee && (
+         <div style={styles.buttonStyle}>
+          <button
+            type="button"
+            onClick={() => {
+              setShowSanctionFee(true);
+            }}
+          >
+            {t("SHOW_P2_FEES_DETAILS")}
+          </button>
+        </div>
+      )}
+      {showSanctionFee && (
+        <div style={styles.buttonStyle}>
+          <button
+            type="button"
+            onClick={() => {
+              setShowSanctionFee(false);
+            }}
+          >
+            {t("HIDE_P2_FEES_DETAILS")}
+          </button>
+        </div>
+      )}
+      {showSanctionFee &&
+      <div>
           <CardSubHeader>{t("BPA_P2_SUMMARY_FEE_EST")}</CardSubHeader>        
             <Row className="border-none" label={t(`BPA_COMMON_MALBA_AMT`)} text={`₹ ${additionalDetails?.selfCertificationCharges?.BPA_MALBA_CHARGES}`} />
             <Row className="border-none" label={t(`BPA_COMMON_LABOUR_AMT`)} text={`₹ ${additionalDetails?.selfCertificationCharges?.BPA_LABOUR_CESS}`} />
             <Row className="border-none" label={t(`BPA_COMMON_WATER_AMT`)} text={`₹ ${additionalDetails?.selfCertificationCharges?.BPA_WATER_CHARGES}`} />
             <Row className="border-none" label={t(`BPA_COMMON_GAUSHALA_AMT`)} text={`₹ ${additionalDetails?.selfCertificationCharges?.BPA_GAUSHALA_CHARGES_CESS}`} />
             <CardSubHeader>{t("BPA_P2_SUMMARY_FEE_EST_MANUAL")}</CardSubHeader>
-            {/* <Row className="border-none" label={t(`BPA_COMMON_DEVELOPMENT_AMT`)} text={`₹ ${additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES}`} />
-            <Row className="border-none" label={t(`BPA_COMMON_OTHER_AMT`)} text={`₹ ${additionalDetails?.selfCertificationCharges?.BPA_OTHER_CHARGES}`} />
-            <Row className="border-none" label={t(`BPA_COMMON_LESS_AMT`)} text={`₹ ${additionalDetails?.selfCertificationCharges?.BPA_LESS_ADJUSMENT_PLOT}`} /> */}
             <CardLabel>{t("BPA_COMMON_DEVELOPMENT_AMT")}</CardLabel>
             <TextInput
               t={t}
@@ -116,6 +150,7 @@ const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails }
               onChange={(e) => {setLessAdjusmentVal(e.target.value)}}
               {...{ required: true, pattern: "^[0-9]*$", type: "text" }}
             />
+            </div>}
           </div>
           }          
           <div>

diff --git a/...-internals/packages/modules/templates/ApplicationDetails/config/BPAApproverApplication.js b/...-internals/packages/modules/templates/ApplicationDetails/config/BPAApproverApplication.js
@@ -7,12 +7,15 @@ export const configBPAApproverApplication = ({
   approvers,
   selectedApprover,
   setSelectedApprover,
+  selectedBlockReason,
+  setBlockReason,
   selectFile,
   uploadedFile,
   setUploadedFile,
   assigneeLabel,
   businessService,
-  error
+  error,
+  blockReasonFiltered
 }) => {
   let isRejectOrRevocate = false;
   if(action?.action == "REVOCATE" || action?.action == "REJECT" || action.action == "SKIP_PAYMENT" || action?.action == "SEND_BACK_TO_CITIZEN" || action?.action == "APPROVE") {
@@ -24,6 +27,74 @@ export const configBPAApproverApplication = ({
     isCommentRequired = true;
   }
 
+  if(action?.action=="BLOCK" && action?.state?.state=="PENDINGAPPROVAL"){
+    return {
+      label: {
+        heading: `WF_${action?.action}_APPLICATION`,
+        submit: `WF_${businessService}_${action?.action}`,
+        cancel: "BPA_CITIZEN_CANCEL_BUTTON",
+      },
+      form: [
+        {
+          body: [
+            {
+              label: action.isTerminateState || isRejectOrRevocate ? null : t(assigneeLabel || `WF_ROLE_${action.assigneeRoles?.[0]}`),
+              type: "dropdown",
+              populators: action.isTerminateState || isRejectOrRevocate ? null : (
+                <Dropdown
+                  option={approvers}
+                  autoComplete="off"
+                  optionKey="name"
+                  id="fieldInspector"
+                  select={setSelectedApprover}
+                  selected={selectedApprover}
+                />
+              ),
+            },
+            {
+              label: action?.action=="BLOCK" &&  action?.state?.state=="PENDINGAPPROVAL" ? t(`BLOCK_REASON`):null  ,
+              type: "dropdown",
+              populators: !action?.action=="BLOCK" || !action?.state?.state=="PENDINGAPPROVAL" ? null : (
+                <Dropdown
+                  option={blockReasonFiltered}
+                  autoComplete="off"
+                  optionKey="name"
+                  id="fieldInspector"
+                  select={setBlockReason}
+                  selected={selectedBlockReason}
+                  isMandatory={true}
+                />
+              ),
+            },
+            {
+              label: t("WF_COMMON_COMMENTS"),
+              type: "textarea",
+              isMandatory: true,
+              populators: {
+                name: "comments",
+              },
+            },
+            {
+              label: `${t("WF_APPROVAL_UPLOAD_HEAD")}`,
+              populators: (
+                <UploadFile
+                  id={"workflow-doc"}
+                  onUpload={selectFile}
+                  onDelete={() => {
+                    setUploadedFile(null);
+                  }}
+                  message={uploadedFile ? `1 ${t(`ES_PT_ACTION_FILEUPLOADED`)}` : t(`CS_ACTION_NO_FILEUPLOADED`)}
+                  accept= "image/*, .pdf, .png, .jpeg, .jpg"
+                  iserror={error}
+                />
+              ),
+            },
+          ],
+        },
+      ],
+    };
+  }
+
   return {
     label: {
       heading: `WF_${action?.action}_APPLICATION`,

diff --git a/...nd/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/index.js b/...nd/micro-ui/web/micro-ui-internals/packages/modules/templates/ApplicationDetails/index.js
@@ -16,6 +16,7 @@ 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 { isLoadingg, data: blockReason } = Digit.Hooks.obps.useMDMS(state, "BPA", ["BlockReason"]);
   const { t } = useTranslation();
   const history = useHistory();
   let { id: applicationNumber } = useParams();
@@ -215,6 +216,9 @@ const ApplicationDetails = (props) => {
     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 if(parseInt(sessionStorage.getItem("lessAdjusment"))>(parseInt(sessionStorage.getItem("development"))+parseInt(sessionStorage.getItem("otherCharges"))+parseInt(bpaDetails?.BPA?.additionalDetails?.selfCertificationCharges?.BPA_MALBA_CHARGES)+parseInt(bpaDetails?.BPA?.additionalDetails?.selfCertificationCharges?.BPA_LABOUR_CESS)+parseInt(bpaDetails?.BPA?.additionalDetails?.selfCertificationCharges?.BPA_WATER_CHARGES)+parseInt(bpaDetails?.BPA?.additionalDetails?.selfCertificationCharges?.BPA_GAUSHALA_CHARGES_CESS))){
+      alert("Enterd Less Adjustment amount is invalid");
+    }
     else{
         const response = await Digit.OBPSService.update(bpaDetails, tenantId); 
         window.location.assign(window.location.href.split("/editApplication")[0]+window.location.href.split("editApplication")[1]);
@@ -254,6 +258,7 @@ const ApplicationDetails = (props) => {
               businessService={businessService}
               workflowDetails={workflowDetails}
               moduleCode={moduleCode}
+              blockReason={blockReason?.BPA?.BlockReason}
             />
           ) : null}
           {isWarningPop ? (