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

added the obps permit order architect fix
upyog · Sep 23, 2024 · fef3436 · fef3436
2 parents ee4e3ae + 03500b5
commit fef3436
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile
@@ -12,7 +12,7 @@ RUN yarn add @upyog/[email protected]
 RUN yarn add @upyog/[email protected]
 RUN yarn add @upyog/[email protected]
 RUN yarn add @upyog/[email protected]
-RUN yarn add @upyog/[email protected].20
+RUN yarn add @upyog/[email protected].21
 RUN yarn add @upyog/[email protected]
 RUN yarn add @upyog/[email protected]
 RUN yarn add @upyog/[email protected]

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json b/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json
@@ -16,7 +16,7 @@
     "@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.20",
+    "@upyog/digit-ui-module-obps":"1.7.0-beta.21",
     "@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",

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -16,7 +16,7 @@
     "@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.20",
+    "@upyog/digit-ui-module-obps": "1.7.0-beta.21",
     "@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",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/obps/useBPASearch.js b/frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/obps/useBPASearch.js
@@ -18,6 +18,7 @@ const combineResponse = (applications, workflowData) => {
   const workflowInstances = mapWfBybusinessId(workflowData);
   return applications.map(application => ({
     ...application,
+    workflowData: workflowData?.[0],
     assignee: workflowInstances[application?.applicationNo]?.assignes?.[0]?.name,
     sla: application?.status.match(/^(APPROVED)$/) ? "CS_NA" : convertMillisecondsToDays(workflowInstances[application?.applicationNo].businesssServiceSla),
     state: workflowInstances[application?.applicationNo]?.state?.state,

diff --git a/...-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js b/...-ui/web/micro-ui-internals/packages/modules/common/src/payments/citizen/response/index.js
@@ -308,10 +308,11 @@ export const convertEpochToDate = (dateEpoch) => {
     }
   };
   // let workflowDetails = Digit.Hooks.useWorkflowDetails({
-  //   tenantId: data?.[0]?.tenantId,
-  //   id: data?.[0]?.applicationNo,
+  //   tenantId: "pg.citya",
+  //   id: "PG-BP-2024-09-23-001337",
   //   moduleCode: "OBPS",
   // });
+  // console.log("workflowDetails",workflowDetails)
   const getPermitOccupancyOrderSearch = async(order, mode="download") => {
     let queryObj = { applicationNo: bpaData?.[0]?.applicationNo };
     let bpaResponse = await Digit.OBPSService.BPASearch(bpaData?.[0]?.tenantId, queryObj);
@@ -325,9 +326,8 @@ export const convertEpochToDate = (dateEpoch) => {
     const state = Digit.ULBService.getStateId();
 
     let count=0;
-    // console.log("workflowDetails",workflowDetails)
-    // debugger
-    // for(let i=0;i<workflowDetails?.data?.processInstances?.length;i++){
+    reqData.additionalDetails.submissionDate=bpaData?.[0]?.workflowData?.auditDetails?.createdTime;
+    // for(let i=0;i<bpaData?.[0]?.data?.processInstances?.length;i++){
     //   if((workflowDetails?.data?.processInstances[i]?.action==="POST_PAYMENT_APPLY" ||workflowDetails?.data?.processInstances[i]?.action==="PAY" ) && (workflowDetails?.data?.processInstances?.[i]?.state?.applicationStatus==="APPROVAL_INPROGRESS")   && count==0 ){
     //       reqData.additionalDetails.submissionDate=workflowDetails?.data?.processInstances[i]?.auditDetails?.createdTime;
     //       count=1;

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-obps",
-  "version": "1.7.0-beta.20",
+  "version": "1.7.0-beta.21",
   "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
@@ -29,7 +29,7 @@
     "@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.20",
+    "@upyog/digit-ui-module-obps": "1.7.0-beta.21",
     "@upyog/digit-ui-module-noc": "1.7.0-beta.3",
     "@upyog/digit-ui-module-pgr": "1.7.0-beta.6",
     "@upyog/digit-ui-module-pt": "1.7.0-beta.4",