From 3cb5cf0fc778abcf0f796cb48ac6d2c882cd5ef2 Mon Sep 17 00:00:00 2001 From: manviraheja1 Date: Wed, 28 Aug 2024 12:08:50 +0530 Subject: [PATCH 1/7] code for risktype --- .../java/org/egov/bpa/repository/rowmapper/BPARowMapper.java | 5 ++++- .../src/main/java/org/egov/bpa/service/BPAService.java | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/municipal-services/bpa-services/src/main/java/org/egov/bpa/repository/rowmapper/BPARowMapper.java b/municipal-services/bpa-services/src/main/java/org/egov/bpa/repository/rowmapper/BPARowMapper.java index 6c53471446c..5c884f59a39 100755 --- a/municipal-services/bpa-services/src/main/java/org/egov/bpa/repository/rowmapper/BPARowMapper.java +++ b/municipal-services/bpa-services/src/main/java/org/egov/bpa/repository/rowmapper/BPARowMapper.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; +import com.google.gson.JsonObject; @Component @Slf4j @@ -54,11 +55,12 @@ public List extractData(ResultSet rs) throws SQLException, DataAccessExcept Object additionalDetails = new Gson().fromJson(rs.getString("additionalDetails").equals("{}") || rs.getString("additionalDetails").equals("null") ? null : rs.getString("additionalDetails"), Object.class); - + AuditDetails auditdetails = AuditDetails.builder().createdBy(rs.getString("bpa_createdBy")) .createdTime(rs.getLong("bpa_createdTime")).lastModifiedBy(rs.getString("bpa_lastModifiedBy")) .lastModifiedTime(lastModifiedTime).build(); + String riskType = new Gson().fromJson(rs.getString("additionalDetails").equals("{}") || rs.getString("additionalDetails").equals("null") ? "{}" : rs.getString("additionalDetails"), JsonObject.class).get("riskType").getAsString(); currentbpa = BPA.builder() .auditDetails(auditdetails) @@ -74,6 +76,7 @@ public List extractData(ResultSet rs) throws SQLException, DataAccessExcept .id(id) .additionalDetails(additionalDetails) .businessService(rs.getString("businessService")) + .riskType(riskType) .build(); buildingMap.put(id, currentbpa); diff --git a/municipal-services/bpa-services/src/main/java/org/egov/bpa/service/BPAService.java b/municipal-services/bpa-services/src/main/java/org/egov/bpa/service/BPAService.java index 566fcae9ba0..34b9b2e9e6c 100755 --- a/municipal-services/bpa-services/src/main/java/org/egov/bpa/service/BPAService.java +++ b/municipal-services/bpa-services/src/main/java/org/egov/bpa/service/BPAService.java @@ -172,6 +172,7 @@ else if (!ocBpas.get(0).getStatus().equalsIgnoreCase(BPAConstants.STATUS_APPROVE criteria.setEdcrNumber(ocBpas.get(0).getEdcrNumber()); ocService.validateAdditionalData(bpaRequest, criteria); bpaRequest.getBPA().setLandInfo(ocBpas.get(0).getLandInfo()); + } } @@ -524,6 +525,7 @@ else if (!bpas.get(0).getStatus().equalsIgnoreCase(BPAConstants.STATUS_APPROVED) } additionalDetails.put("landId", bpas.get(0).getLandId()); + additionalDetails.put("riskType", bpas.get(0).getRiskType()); criteria.setEdcrNumber(bpas.get(0).getEdcrNumber()); ocService.validateAdditionalData(bpaRequest, criteria); bpaRequest.getBPA().setLandInfo(bpas.get(0).getLandInfo()); From 9e9b907248891e095445462d405c4990f35cffc6 Mon Sep 17 00:00:00 2001 From: manviraheja1 Date: Wed, 28 Aug 2024 15:01:01 +0530 Subject: [PATCH 2/7] code for risktype --- .../bpa/repository/rowmapper/BPARowMapper.java | 15 ++++++++++++++- .../java/org/egov/bpa/validator/BPAValidator.java | 5 +++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/municipal-services/bpa-services/src/main/java/org/egov/bpa/repository/rowmapper/BPARowMapper.java b/municipal-services/bpa-services/src/main/java/org/egov/bpa/repository/rowmapper/BPARowMapper.java index 5c884f59a39..74525c3accf 100755 --- a/municipal-services/bpa-services/src/main/java/org/egov/bpa/repository/rowmapper/BPARowMapper.java +++ b/municipal-services/bpa-services/src/main/java/org/egov/bpa/repository/rowmapper/BPARowMapper.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; @Component @@ -60,7 +61,19 @@ public List extractData(ResultSet rs) throws SQLException, DataAccessExcept .createdTime(rs.getLong("bpa_createdTime")).lastModifiedBy(rs.getString("bpa_lastModifiedBy")) .lastModifiedTime(lastModifiedTime).build(); - String riskType = new Gson().fromJson(rs.getString("additionalDetails").equals("{}") || rs.getString("additionalDetails").equals("null") ? "{}" : rs.getString("additionalDetails"), JsonObject.class).get("riskType").getAsString(); + JsonObject jsonObject = new Gson().fromJson( + rs.getString("additionalDetails").equals("{}") || rs.getString("additionalDetails").equals("null") ? "{}" : rs.getString("additionalDetails"), + JsonObject.class + ); + + String riskType = null; + if (jsonObject.has("riskType")) { + JsonElement riskTypeElement = jsonObject.get("riskType"); + if (riskTypeElement != null && !riskTypeElement.isJsonNull()) { + riskType = riskTypeElement.getAsString(); + } + } + //String riskType = new Gson().fromJson(rs.getString("additionalDetails").equals("{}") || rs.getString("additionalDetails").equals("null") ? "{}" : rs.getString("additionalDetails"), JsonObject.class).get("riskType").getAsString(); currentbpa = BPA.builder() .auditDetails(auditdetails) diff --git a/municipal-services/bpa-services/src/main/java/org/egov/bpa/validator/BPAValidator.java b/municipal-services/bpa-services/src/main/java/org/egov/bpa/validator/BPAValidator.java index e9144302861..e513b59addb 100755 --- a/municipal-services/bpa-services/src/main/java/org/egov/bpa/validator/BPAValidator.java +++ b/municipal-services/bpa-services/src/main/java/org/egov/bpa/validator/BPAValidator.java @@ -283,6 +283,7 @@ private void setFieldsFromSearch(BPARequest bpaRequest, List searchResult, bpaRequest.getBPA().getAuditDetails() .setCreatedTime(idToBPAFromSearch.get(bpaRequest.getBPA().getId()).getAuditDetails().getCreatedTime()); bpaRequest.getBPA().setStatus(idToBPAFromSearch.get(bpaRequest.getBPA().getId()).getStatus()); + } @@ -645,5 +646,9 @@ public void validateApplication(BPARequest bpaRequest) throw new CustomException(null,"Designer/Supervisor can apply for area less then 500 sq. yards. in self declaration"); } + if (obj.get("riskType")!= null ) + { + obj.put("riskType", bpaRequest.getBPA().getRiskType()); + } } } From 362a759475a146728f81ca764719b744e3498ff0 Mon Sep 17 00:00:00 2001 From: manviraheja1 Date: Wed, 28 Aug 2024 16:44:30 +0530 Subject: [PATCH 3/7] fixed risktype --- .../java/org/egov/bpa/service/EnrichmentService.java | 9 ++++++++- .../src/main/java/org/egov/bpa/util/BPAConstants.java | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/municipal-services/bpa-services/src/main/java/org/egov/bpa/service/EnrichmentService.java b/municipal-services/bpa-services/src/main/java/org/egov/bpa/service/EnrichmentService.java index 58b1ab93183..6179f0afa2d 100755 --- a/municipal-services/bpa-services/src/main/java/org/egov/bpa/service/EnrichmentService.java +++ b/municipal-services/bpa-services/src/main/java/org/egov/bpa/service/EnrichmentService.java @@ -93,6 +93,9 @@ public void enrichBPACreateRequest(BPARequest bpaRequest, Object mdmsData, Map additionalDetails = bpaRequest.getBPA().getAdditionalDetails() != null + ? (Map) bpaRequest.getBPA().getAdditionalDetails() + : new HashMap(); bpaRequest.getBPA().setAccountId(bpaRequest.getBPA().getAuditDetails().getCreatedBy()); String applicationType = values.get(BPAConstants.APPLICATIONTYPE); @@ -116,7 +119,11 @@ public void enrichBPACreateRequest(BPARequest bpaRequest, Object mdmsData, Map { if (document.getId() == null) { diff --git a/municipal-services/bpa-services/src/main/java/org/egov/bpa/util/BPAConstants.java b/municipal-services/bpa-services/src/main/java/org/egov/bpa/util/BPAConstants.java index 89191d1d56a..4d4f508691f 100755 --- a/municipal-services/bpa-services/src/main/java/org/egov/bpa/util/BPAConstants.java +++ b/municipal-services/bpa-services/src/main/java/org/egov/bpa/util/BPAConstants.java @@ -12,6 +12,8 @@ public class BPAConstants { public static final String BPA_BusinessService = "BPA"; public static final String BPA_MODULE_CODE = "BPA"; + + public static final String RISKTYPE = "riskType"; public static final String BPA_LOW_MODULE_CODE = "BPA_LOW"; From 64829f7c2618fc6c62a60a94c9f58e3f3aa47faa Mon Sep 17 00:00:00 2001 From: manviraheja1 Date: Thu, 29 Aug 2024 09:41:12 +0530 Subject: [PATCH 4/7] enabled logs for tl owner name search --- .../src/main/java/org/egov/tl/repository/TLRepository.java | 1 + 1 file changed, 1 insertion(+) diff --git a/municipal-services/tl-services/src/main/java/org/egov/tl/repository/TLRepository.java b/municipal-services/tl-services/src/main/java/org/egov/tl/repository/TLRepository.java index 9f1d6623038..9233b98491b 100644 --- a/municipal-services/tl-services/src/main/java/org/egov/tl/repository/TLRepository.java +++ b/municipal-services/tl-services/src/main/java/org/egov/tl/repository/TLRepository.java @@ -59,6 +59,7 @@ public List getLicenses(TradeLicenseSearchCriteria criteria) { List preparedStmtList = new ArrayList<>(); String query = queryBuilder.getTLSearchQuery(criteria, preparedStmtList,false); log.info("Query is" +query); + log.info("Prepared Statement List is" +preparedStmtList); List licenses = jdbcTemplate.query(query, preparedStmtList.toArray(), rowMapper); sortChildObjectsById(licenses); return licenses; From b6cafe4c3712440e0bba88058f34135c7ac9264b Mon Sep 17 00:00:00 2001 From: manviraheja1 <119833905+manviraheja1@users.noreply.github.com> Date: Thu, 29 Aug 2024 10:10:43 +0530 Subject: [PATCH 5/7] Updated filestore URL --- .../src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dx-services/requester-services-dx/src/main/resources/application.properties b/dx-services/requester-services-dx/src/main/resources/application.properties index bbfc66502ee..34a3d5a3740 100644 --- a/dx-services/requester-services-dx/src/main/resources/application.properties +++ b/dx-services/requester-services-dx/src/main/resources/application.properties @@ -41,7 +41,7 @@ eSign.redirecturl= https://upyog-test.niua.org/requester-services-dx/eSign/redir eSign.pdf=D:\\env\\eSign\\Acknowledgement.pdf esign.tempfolder=/tmp/esign-tmp esign.outputfolder=/tmp/esign-output -esign.UIURL=https://upyog-test.niua.org/digit-ui/tl/common +esign.UIURL=https://upyog-test.niua.org/digit-ui/employee/tl/common #eSign.s3bucket=https:\\upyog-test-assets.s3-ap-south-1.amazonaws.com/pg.citya/pdfgen/August/16 #File Store Id #egov.filestore.host=http://egov-filestore:8080/ From bd1535de49a22c0a70359d92df1c6173dcfa30f1 Mon Sep 17 00:00:00 2001 From: nehaniua Date: Thu, 29 Aug 2024 16:21:28 +0530 Subject: [PATCH 6/7] floor height null condition --- .../src/main/java/org/egov/edcr/feature/GeneralStair.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/GeneralStair.java b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/GeneralStair.java index 05c694fa370..b96a9f838f5 100644 --- a/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/GeneralStair.java +++ b/edcr/service/egov/egov-edcr/src/main/java/org/egov/edcr/feature/GeneralStair.java @@ -216,8 +216,9 @@ public Plan process(Plan plan) { System.out.println("landnig" + totalLandings); System.out.println("flights" + totalFlights); - + if(flrHt != null) { BigDecimal riserHeight = flrHt.divide(totalSteps, 2, RoundingMode.HALF_UP); + System.out.println("riserHt====" + riserHeight); @@ -230,7 +231,8 @@ public Plan process(Plan plan) { } else { setReportOutputDetailsFloorStairWise(plan, RULE, "", "", "" + 0.19, "" + riserHeight, Result.Not_Accepted.getResultVal(), scrutinyDetail4); - } + }} + From 40f00dc17d5e179b2e31c220dfc4dc5ef8baa81a Mon Sep 17 00:00:00 2001 From: Shivankshuklaa Date: Fri, 30 Aug 2024 12:19:44 +0530 Subject: [PATCH 7/7] Architect and Citizen Undertaking OTP Verified Time issue Resolved as well as latitude and Longitude Null Issue Resolved --- .../src/pageComponents/DocumentDetails.js | 74 +++++-------------- .../BpaApplicationDetail/CitizenConsent.js | 25 +++++-- .../NewBuildingPermit/Architectconcent.js | 17 ++++- .../citizen/NewBuildingPermit/CheckPage.js | 4 + 4 files changed, 56 insertions(+), 64 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/DocumentDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/DocumentDetails.js index 504424236a9..3f4dbe4bd90 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/DocumentDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/DocumentDetails.js @@ -205,47 +205,6 @@ const SelectDocument = React.memo(function MyComponent({ e && setfileArray([...fileArray,e.file]); } - // function getData(e) { - // let key = selectedDocument.code; - // let data,newArr; - // if (e?.length > 0) { - // data = Object.fromEntries(e); - // newArr = Object.values(data); - // newArr = formData?.documents?.documents?.filter((ob) => ob.documentType === selectedDocument.code); - // setnewArray(newArr); - // // const filteredDocumentsByFileStoreId = documents?.filter((item) => item?.fileStoreId !== uploadedFile.fileStoreId) || [] - // let newfiles = []; - // e?.map((doc, index) => { - // newfiles.push({ - // documentType: selectedDocument?.code, - // additionalDetails:{category:selectedDocument?.code/*.split(".").slice(0,2).join('_')*/}, - // fileStoreId: doc?.[1]?.fileStoreId?.fileStoreId, - // documentUid: doc?.[1].fileStoreId?.fileStoreId, - // fileName: doc?.[0] || "", - // id:documents? documents.find(x => x.documentType === selectedDocument?.code)?.id:undefined, - // }) - // }) - // const __documents = [ - // ...documents.filter(e => e.documentType !== key ), - // ...newfiles, - // ] - // setDocuments(__documents) - // }else if(e?.length==0){ - // const __documents = [ - // ...documents.filter(e => e.documentType !== key ), - // ] - // setDocuments(__documents); - // } - - // newArr?.map((ob) => { - // if(!ob?.file){ - // ob.file = {} - // } - // ob.file.documentType = key; - // selectfile(ob,key); - // }) - // } - function getData(e) { let key = selectedDocument.code; let data, newArr; @@ -258,8 +217,14 @@ const SelectDocument = React.memo(function MyComponent({ setLatitude(location.latitude); setLongitude(location.longitude); {if (doc?.code === "SITEPHOTOGRAPH.ONE"){ + if(location.latitude !==null && location.longitude !==null){ sessionStorage.setItem("Latitude",location.latitude) sessionStorage.setItem("Longitude",location.longitude) + } + else{ + sessionStorage.removeItem("Latitude"); + sessionStorage.removeItem("Longitude"); + } }} @@ -423,20 +388,19 @@ const SelectDocument = React.memo(function MyComponent({ {doc?.uploadedDocuments?.length && } {doc?.code === "SITEPHOTOGRAPH.ONE" && ( - (sessionStorage.getItem("Latitude") ? true : false ) ? ( -
-

Latitude: {sessionStorage.getItem("Latitude")}

-

Longitude: {sessionStorage.getItem("Longitude")}

- {setIsNextButtonDisabled(false)} {/* Enable the "Next" button */} -
- ): - ( -
-

Please upload a Photo with Location details.

- {setIsNextButtonDisabled(true)} {/* Disable the "Next" button */} -
- ) - )} + sessionStorage.getItem("Latitude") && sessionStorage.getItem("Longitude") ? ( +
+

Latitude: {sessionStorage.getItem("Latitude")}

+

Longitude: {sessionStorage.getItem("Longitude")}

+ {setIsNextButtonDisabled(false)} {/* Enable the "Next" button */} +
+ ) : ( +
+

Please upload a Photo with Location details.

+ {setIsNextButtonDisabled(true)} {/* Disable the "Next" button */} +
+ ) + )} ); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/CitizenConsent.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/CitizenConsent.js index bebbf71a271..e1e61c7569e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/CitizenConsent.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/BpaApplicationDetail/CitizenConsent.js @@ -1,12 +1,10 @@ - import React, { useState } from 'react'; + import React, { useState, useEffect } from 'react'; import Modal from 'react-modal'; - import jsPDF from 'jspdf'; import { SubmitBar } from '@upyog/digit-ui-react-components'; import { useTranslation } from "react-i18next"; import { useParams } from "react-router-dom"; - import Axios from "axios"; - import Urls from '../../../../../../libraries/src/services/atoms/urls'; + @@ -44,9 +42,24 @@ const architectid = data?.applicationData?.additionalDetails?.architectid const architecttype = data?.applicationData?.additionalDetails?.typeOfArchitect const TimeStamp = otpVerifiedTimestamp; - const ulbselection = data?. applicationData?.additionalDetails?.Ulblisttype === "Municipal Corporation" ? "Commissioner" : "Executive Officer" + const updatedAdditionalDetails = { + ...data?.applicationData?.additionalDetails, + TimeStamp: otpVerifiedTimestamp, + }; + + // Update the entire data object with the new additionalDetails + const updatedData = { + ...data, + applicationData: { + ...data?.applicationData, + additionalDetails: updatedAdditionalDetails, + }, + }; + + + const selfdeclarationform = ` @@ -120,7 +133,7 @@ try { setIsUploading(true); // Set isUploading to true before starting the upload - let result = await Digit.PaymentService.generatePdf(Digit.ULBService.getStateId(), { Bpa: [data] }, "ownerconsent"); + let result = await Digit.PaymentService.generatePdf(Digit.ULBService.getStateId(), { Bpa: [updatedData] }, "ownerconsent"); if (result?.filestoreIds[0]?.length > 0) { alert("File Uploaded Successfully"); diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/Architectconcent.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/Architectconcent.js index 5d1925b96e7..65f5abac83a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/Architectconcent.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pages/citizen/NewBuildingPermit/Architectconcent.js @@ -15,7 +15,7 @@ 2. jsPDF for downloading the PDF */ - import React, { useState } from 'react'; + import React, { useState, useEffect } from 'react'; import Modal from 'react-modal'; import { useLocation } from "react-router-dom"; import { SubmitBar } from '@upyog/digit-ui-react-components'; @@ -32,7 +32,7 @@ const user = Digit.UserService.getUser(); const architecname = user?.info?.name; const architectmobileNumber = user?.info.mobileNumber - const [params] = Digit.Hooks.useSessionStorage("BUILDING_PERMIT", state?.edcrNumber ? { data: { scrutinyNumber: { edcrNumber: state?.edcrNumber } } } : {}); + const [params, setParams] = Digit.Hooks.useSessionStorage("BUILDING_PERMIT", state?.edcrNumber ? { data: { scrutinyNumber: { edcrNumber: state?.edcrNumber } } } : {}); const [isUploading, setIsUploading] = useState(false); // it will check whether the file upload is in process or not const [isFileUploaded, setIsFileUploaded] = useState(false); const architectid = params?.additionalDetails?.architectid; @@ -49,7 +49,18 @@ const TimeStamp = otpVerifiedTimestamp; - + useEffect(() => { + if (params?.additionalDetails && !params.additionalDetails.TimeStamp) { + setParams(prevParams => ({ + ...prevParams, + additionalDetails: { + ...prevParams.additionalDetails, + TimeStamp: otpVerifiedTimestamp + } + })); + } + }, [params, otpVerifiedTimestamp, setParams]); + const selfdeclarationform = ` 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 2256265193f..2b8bf352f12 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 @@ -570,9 +570,13 @@ function selectfile(e) { + {owners?.schemes?.code === "SCHEME" && ( + + + )}