From fe969cea32d1ba0abccb1966e5d343db113ec4eb Mon Sep 17 00:00:00 2001 From: Deepa Date: Tue, 23 Apr 2024 12:47:32 +0000 Subject: [PATCH 1/3] Updated noc details page replaced search button with search icon --- .../obps/src/pageComponents/NOCNumber.js | 42 +++++++++---------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/NOCNumber.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/NOCNumber.js index ce7849b0f6f..72df4cf2db5 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/NOCNumber.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/NOCNumber.js @@ -1,22 +1,17 @@ import React, { useState,useEffect } from "react"; -import { FormStep} from "@upyog/digit-ui-react-components"; +import { FormStep,SearchIcon,TextInput } from "@upyog/digit-ui-react-components"; import Timeline from "../components/Timeline"; const NOCNumber = ({ t, config, onSelect, userType, formData, setError: setFormError, clearErrors: clearFormErrors, formState }) => { const [nocNumber,setValueNoc]=useState(formData?.additionalDetails?.nocNumber || formData?.nocnumber?.nocNumber ||""); const tenantId = Digit.ULBService.getCurrentTenantId(); - - useEffect(()=>{ - if(formData?.additionalDetails?.nocNumber || formData?.nocnumber?.nocNumber){ - setValueNoc(formData?.additionalDetails?.nocNumber || formData?.nocnumber?.nocNumber); - } - },[formData]); + let Webview = !Digit.Utils.browser.isMobile(); function onChange(data) { - setValueNoc(data.target.value); + setValueNoc(data.target.value); } - function onClick(){ + function onClick(e){ console.log("inside_search") } @@ -32,19 +27,22 @@ const NOCNumber = ({ t, config, onSelect, userType, formData, setError: setFormE config={config} onSelect={handleSubmit} isDisabled={ !nocNumber } - - > - - - - SEARCH NOC + > +
+ onChange( e)} + defaultValue={formData?.nocnumber?.nocNumber || formData?.additionalDetails?.nocNumber} + /> +
onClick( e)}>
+
From 5d3cd6b15eebe67437af6332c9809adcf7cfb1e8 Mon Sep 17 00:00:00 2001 From: Deepa Date: Tue, 23 Apr 2024 12:56:18 +0000 Subject: [PATCH 2/3] Updated style of location label in location details page --- .../packages/modules/obps/src/pageComponents/LocationDetails.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/LocationDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/LocationDetails.js index a87119cd2d4..a4fd70d608a 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/LocationDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/LocationDetails.js @@ -237,7 +237,7 @@ const LocationDetails = ({ t, config, onSelect, userType, formData, ownerIndex =
+ style={!isMobile ? {position: "relative", left: "515px", bottom: "25px", marginTop: "-20px"} : { float: "right", position: "relative", bottom: "25px", marginTop: "-20px", marginRight: "5px" }} width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> From 85d1f257c2c4bf8335a5d84f44705d097d3930e8 Mon Sep 17 00:00:00 2001 From: Deepa Date: Tue, 23 Apr 2024 17:02:43 +0000 Subject: [PATCH 3/3] Added validation on P2 values --- .../citizen/NewBuildingPermit/CheckPage.js | 45 +++++++++++++++---- .../components/ScruntinyDetails.js | 39 +++++++++++++--- 2 files changed, 69 insertions(+), 15 deletions(-) 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 39743138c9f..35bb2378a60 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 @@ -187,6 +187,33 @@ setWaterCharges(Malbafees/2) return } + function setOtherChargesVal(value) { + if(/^[0-9]*$/.test(value)){ + setOtherCharges(value); + sessionStorage.setItem("otherCharges",e.target.value) + } + else{ + //alert("Please enter numbers") + } + } + function setDevelopmentVal(value) { + if(/^[0-9]*$/.test(value)){ + setDevelopment(value); + sessionStorage.setItem("development",e.target.value) + } + else{ + //alert("Please enter numbers") + } + } + function setLessAdjusmentVal(value) { + if(/^[0-9]*$/.test(value)){ + setLessAdjusment(value); + sessionStorage.setItem("lessAdjusment",e.target.value) + } + else{ + //alert("Please enter numbers") + } + } return ( @@ -378,13 +405,13 @@ setWaterCharges(Malbafees/2) type={"text"} isMandatory={false} optionKey="i18nKey" - name="email" + name="development" defaultValue={value?.additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES } value={development} - onChange={(e) => {setDevelopment(e.target.value),sessionStorage.setItem("development",e.target.value)}} + onChange={(e) => {setDevelopmentVal(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") }} + {...{ required: true, pattern: "^[0-9]*$" }} /> {t("BPA_COMMON_OTHER_AMT")} {setOtherCharges(e.target.value),sessionStorage.setItem("otherCharges",e.target.value)}} + onChange={(e) => {setOtherChargesVal(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") }} + {...{ required: true, pattern: /^[0-9]*$/ }} /> {t("BPA_COMMON_LESS_AMT")} {setLessAdjusment(e.target.value),sessionStorage.setItem("lessAdjusment",e.target.value)}} + onChange={(e) => {setLessAdjusmentVal(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") }} + {...{ required: true, pattern: "^[0-9]*$" }} /> 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 e57e572994f..dad66041a0d 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 @@ -24,6 +24,33 @@ const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails } else if (data?.value) return data?.value; else t("NA"); } + function setOtherChargesVal(value) { + if(/^[0-9]*$/.test(value)){ + setOtherCharges(value); + sessionStorage.setItem("otherCharges",e.target.value) + } + else{ + //alert("Please enter numbers") + } +} + function setDevelopmentVal(value) { + if(/^[0-9]*$/.test(value)){ + setDevelopment(value); + sessionStorage.setItem("development",e.target.value) + } + else{ + //alert("Please enter numbers") + } + } + function setLessAdjusmentVal(value) { + if(/^[0-9]*$/.test(value)){ + setLessAdjusment(value); + sessionStorage.setItem("lessAdjusment",e.target.value) + } + else{ + //alert("Please enter numbers") + } + } return ( {!scrutinyDetails?.isChecklist &&
@@ -60,7 +87,8 @@ const ScruntinyDetails = ({ scrutinyDetails, paymentsList=[],additionalDetails } defaultValue={additionalDetails?.selfCertificationCharges?.BPA_DEVELOPMENT_CHARGES || ""} value={development} disabled={!isEditApplication} - onChange={(e) => {setDevelopment(e.target.value),sessionStorage.setItem("development",e.target.value)}} + onChange={(e) => {setDevelopmentVal(e.target.value)}} + {...{ required: true, pattern: "^[0-9]*$", type: "text" }} /> {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") }} + onChange={(e) => {setOtherChargesVal(e.target.value)}} + {...{ required: true, pattern: "^[0-9]*$", type: "text" }} /> {t("BPA_COMMON_LESS_AMT")} {setLessAdjusment(e.target.value),sessionStorage.setItem("lessAdjusment",e.target.value)}} + onChange={(e) => {setLessAdjusmentVal(e.target.value)}} + {...{ required: true, pattern: "^[0-9]*$", type: "text" }} />
}