Merge branch 'master' into tqm-latest

egovernments · Sep 27, 2024 · 8772587 · 8772587
2 parents 1b37e38 + c838f49
commit 8772587
Show file tree

Hide file tree

Showing 23 changed files with 157 additions and 71 deletions.
diff --git a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/contract/ComparisonRequest.java b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/contract/ComparisonRequest.java
@@ -64,8 +64,18 @@ public class ComparisonRequest {
     private String ocdcrNumber;
 
     private String tenantId;
+
+    private String propertyId;
 
-    public RequestInfo getRequestInfo() {
+    public String getPropertyId() {
+		return propertyId;
+	}
+
+	public void setPropertyId(String propertyId) {
+		this.propertyId = propertyId;
+	}
+
+	public RequestInfo getRequestInfo() {
         return requestInfo;
     }
 

diff --git a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/entity/EdcrApplicationDetail.java b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/entity/EdcrApplicationDetail.java
@@ -118,8 +118,18 @@ public class EdcrApplicationDetail extends AbstractAuditable {
 
     @SafeHtml
     private String tenantId;
+
+	public String propertyId;
 
-    @Override
+    public String getPropertyId() {
+		return propertyId;
+	}
+
+	public void setPropertyId(String propertyId) {
+		this.propertyId = propertyId;
+	}
+
+	@Override
     public Long getId() {
         return id;
     }

diff --git a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/entity/OcComparisonDetail.java b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/entity/OcComparisonDetail.java
@@ -83,6 +83,8 @@ public class OcComparisonDetail extends AbstractAuditable {
     private String status;
 
     private String tenantId;
+
+    private String propertyId;
 
     @Transient
     private InputStream output;
@@ -92,6 +94,7 @@ public class OcComparisonDetail extends AbstractAuditable {
 
     @Transient
     private EdcrApplicationDetail permitDcr;
+
 
     @Override
     public Long getId() {
@@ -170,5 +173,13 @@ public EdcrApplicationDetail getPermitDcr() {
     public void setPermitDcr(EdcrApplicationDetail permitDcr) {
         this.permitDcr = permitDcr;
     }
+    public String getPropertyId() {
+        return propertyId;
+    }
+
+	public void setPropertyId(String propertyId) {
+		this.propertyId = propertyId;
+
+	}
 
 }
diff --git a/...service/egov/egov-edcr/src/main/java/org/egov/edcr/service/OcComparisonReportService.java b/...service/egov/egov-edcr/src/main/java/org/egov/edcr/service/OcComparisonReportService.java
@@ -140,7 +140,8 @@ public InputStream generateOcComparisonReport(EdcrApplicationDetail ocDcr,
         valuesMap.put("applicationDate", applicationDate);
         valuesMap.put("applicantName", ocDcr.getApplication().getApplicantName());
         valuesMap.put("reportGeneratedDate", DateUtils.toDefaultDateTimeFormat(new Date()));
-
+        valuesMap.put("propertyId", comparisonDetail.getPropertyId());
+
         String imageURL = ReportUtil.getImageURL("/egi/resources/global/images/digit-logo-black.png");
         valuesMap.put("egovLogo", imageURL);
         valuesMap.put("cityLogo", cityService.getCityLogoURLByCurrentTenant());
@@ -292,6 +293,7 @@ public InputStream generatePreOcComparisonReport(EdcrApplicationDetail ocDcr,
         valuesMap.put("applicationDate", applicationDate);
         valuesMap.put("applicantName", ocDcr.getApplication().getApplicantName());
         valuesMap.put("reportGeneratedDate", DateUtils.toDefaultDateTimeFormat(new Date()));
+        valuesMap.put("propertyId", comparisonDetail.getPropertyId());
         String imageURL = ReportUtil.getImageURL("/egi/resources/global/images/digit-logo-black.png");
         valuesMap.put("egovLogo", imageURL);
         valuesMap.put("cityLogo", cityService.getCityLogoURLByCurrentTenant());

diff --git a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/service/OcComparisonService.java b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/service/OcComparisonService.java
@@ -64,6 +64,7 @@ public ComparisonDetail process(ComparisonRequest comparisonRequest) {
         String ocdcrNo = comparisonRequest.getOcdcrNumber();
         String dcrNo = comparisonRequest.getEdcrNumber();
         String tenantId = comparisonRequest.getTenantId();
+        String propertyId = comparisonRequest.getPropertyId();
         ComparisonDetail comparisonDetail = new ComparisonDetail();
 
         OcComparisonDetail ocComparisonDetail = ocComparisonDetailService.findByOcDcrNoAndDcrNumberAndTenant(ocdcrNo, dcrNo,
@@ -99,6 +100,7 @@ public ComparisonDetail process(ComparisonRequest comparisonRequest) {
             ocComparisonDetailE.setOcdcrNumber(ocdcrNo);
             ocComparisonDetailE.setDcrNumber(dcrNo);
             ocComparisonDetailE.setTenantId(tenantId);
+            ocComparisonDetailE.setPropertyId(propertyId);
 
             InputStream ocreportStream = generateOcComparisonReport(applicationDate, amd, ocDcr, permitDcr, ocComparisonDetailE);
 

diff --git a/frontend/micro-ui/web/docker/Dockerfile b/frontend/micro-ui/web/docker/Dockerfile
@@ -3,19 +3,19 @@ FROM upyogio/alpine-node-builder-14:yarn AS build
 RUN apk update && apk upgrade
 RUN apk add --no-cache git>2.30.0
 RUN yarn add @upyog/digit-ui-libraries
+RUN yarn add @upyog/digit-ui-module-fsm
 RUN yarn add @upyog/digit-ui-module-pt
-RUN yarn add @egovernments/digit-ui-module-fsm
 RUN yarn add @upyog/digit-ui-module-tl
+RUN yarn add @upyog/digit-ui-module-obps
+RUN yarn add @upyog/digit-ui-module-ws
 RUN yarn add @upyog/digit-ui-module-dss
 RUN yarn add @upyog/digit-ui-module-mcollect
 RUN yarn add @upyog/digit-ui-module-pgr
 RUN yarn add @upyog/digit-ui-module-noc
 RUN yarn add @upyog/digit-ui-module-engagement
 RUN yarn add @upyog/digit-ui-module-hrms
 RUN yarn add @upyog/digit-ui-module-core
-RUN yarn add @upyog/digit-ui-module-obps
 RUN yarn add @upyog/digit-ui-module-common
-RUN yarn add @upyog/digit-ui-module-ws
 RUN yarn add @upyog/digit-ui-module-commonpt
 RUN yarn add @upyog/digit-ui-module-bills
 

diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json
@@ -10,24 +10,24 @@
   },
   "devDependencies": {
     "@upyog/digit-ui-module-bills": "1.8.0",
-    "@upyog/digit-ui-module-common": "1.8.0",
+    "@upyog/digit-ui-module-common": "1.8.1",
     "@upyog/digit-ui-module-engagement": "1.8.0",
     "@egovernments/digit-ui-module-fsm": "1.8.4-beta1",
     "@upyog/digit-ui-module-mcollect": "1.8.0",
     "@upyog/digit-ui-module-noc": "1.8.0",
-    "@upyog/digit-ui-module-obps": "1.8.3",
+    "@upyog/digit-ui-module-obps": "1.8.4",
     "@upyog/digit-ui-module-pgr": "1.8.0",
-    "@upyog/digit-ui-module-pt": "1.8.4",
+    "@upyog/digit-ui-module-pt": "1.8.9",
     "@upyog/digit-ui-module-receipts": "1.8.0",
     "@upyog/digit-ui-module-tl": "1.8.3",
-    "@upyog/digit-ui-module-ws": "1.8.4",
+    "@upyog/digit-ui-module-ws": "1.8.9",
     "@upyog/digit-ui-module-commonpt": "1.8.0",
-    "http-proxy-middleware": "^1.0.5",
+    "http-proxy-middleware": "1.0.5",
     "react": "17.0.2",
     "react-dom": "17.0.2",
     "react-i18next": "11.16.2",
     "react-router-dom": "5.3.0",
-    "react-scripts": "^4.0.1"
+    "react-scripts": "4.0.1"
   },
   "browserslist": [
     ">0.2%",

diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json
@@ -53,7 +53,7 @@
     "buildD:core": "cd packages/modules/core && yarn build",
     "buildD:pgr": "cd packages/modules/pgr && yarn build",
     "buildD:fsm": "cd packages/modules/fsm && yarn build",
-    "build:dss": "cd packages/modules/dss && yarn build",
+    "buildD:dss": "cd packages/modules/dss && yarn build",
     "buildD:mcollect": "cd packages/modules/mCollect && yarn build",
     "buildD:receipts": "cd packages/modules/receipts && yarn build",
     "buildD:tl": "cd packages/modules/tl && yarn build",

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/example/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/css/example/package.json
@@ -10,7 +10,7 @@
     "@egovernments/digit-ui.css": "link:.."
   },
   "devDependencies": {
-    "http-server": "^0.12.3"
+    "http-server": "0.12.3"
   },
   "eslintConfig": {
     "extends": "react-app"

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog-niua/upyog-css",
-  "version": "1.8.1",
+  "version": "1.8.11",
   "license": "MIT",
   "main": "dist/index.css",
   "author": "Jagankumar <[email protected]>",
@@ -45,7 +45,7 @@
     "postcss-prefixer": "2.1.3",
     "postcss-preset-env": "6.7.1",
     "postcss-scss": "3.0.5",
-    "sass": "^1.26.11"
+    "sass": "1.26.11"
   },
   "files": [
     "dist/index.min.css",
@@ -62,4 +62,4 @@
     "digit-ui",
     "css"
   ]
-}
+}
diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-common",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "license": "MIT",
   "description": "Digit Common Payment Module",
   "main": "dist/index.js",

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
@@ -165,7 +165,7 @@ export const convertEpochToDate = (dateEpoch) => {
       let assessmentYear="",assessmentYearForReceipt="";
       let count=0;
       let toDate,fromDate;
-	  if(payments.Payments[0].paymentDetails[0].businessService=="PT"){
+	  if(payments?.Payments?.[0]?.paymentDetails?.[0].businessService=="PT" || payments?.Payments?.[0].paymentDetails[0].businessService=="PT.MUTATION"){
 
       payments.Payments[0].paymentDetails[0].bill.billDetails.map(element => {
 

diff --git a/...d/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorBoundaries.js b/...d/micro-ui/web/micro-ui-internals/packages/modules/core/src/components/ErrorBoundaries.js
@@ -2,6 +2,7 @@ import React from "react";
 import ErrorComponent from "./ErrorComponent";
 
 const Redircter = () => {
+  console.log("Redircter")
   const path = Digit.UserService.getType() === "employee" ? "/digit-ui/employee/user/error" : "/digit-ui/citizen/error";
   if (
     window.location.href.includes("employee/user/error") ||
@@ -22,12 +23,14 @@ class ErrorBoundary extends React.Component {
   }
 
   static getDerivedStateFromError(error) {
+    console.log("getDerivedStateFromError",error)
     // Update state so the next render will show the fallback UI.
     return { error: error?.message, hasError: true, errorStack: error?.stack };
   }
 
   componentDidCatch(error, errorInfo) {
     // Catch errors in any components below and re-render with error message
+    console.log("componentDidCatch",error)
     this.setState({ error: error?.message, hasError: true, errorStack: error?.stack });
     // You can also log error messages to an error reporting service here
   }

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/dss/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@upyog/digit-ui-module-dss",
-  "version": "1.8.1",
+  "version": "1.8.9",
   "license": "MIT",
   "description": "Digit Dashboard Module",
   "main": "dist/index.js",
@@ -33,6 +33,6 @@
     "react-simple-maps": "2.0.0",
     "react-time-picker": "4.2.1",
     "react-tooltip": "4.1.2",
-    "recharts": "^2.0.9"
+    "recharts": "2.0.9"
   }
 }