From cd175e36938975f89663e6f24427391f46cacefe Mon Sep 17 00:00:00 2001 From: Shivankshuklaa Date: Tue, 5 Mar 2024 15:17:22 +0530 Subject: [PATCH 1/2] Resolved issue of documents data, change button, pet drop down --- .../ptr/src/components/SearchApplication.js | 92 ++++++++++++++----- .../ptr/src/components/SearchFields.js | 1 + .../src/pageComponents/PTRCitizenDetails.js | 7 +- .../ptr/src/pageComponents/PTRCitizenPet.js | 9 +- .../ptr/src/pageComponents/PTROwnerDetails.js | 9 +- .../ptr/src/pageComponents/PTRPetdetails.js | 14 +-- .../pageComponents/PTRSelectProofIdentity.js | 8 +- .../ptr/src/pageComponents/PTRServiceDoc.js | 2 + .../ptr/src/pages/citizen/Create/CheckPage.js | 51 +++++----- .../ptr/src/pages/citizen/Create/index.js | 7 +- 10 files changed, 135 insertions(+), 65 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/components/SearchApplication.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/components/SearchApplication.js index cbe3a31d5c7..ac15add738f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/components/SearchApplication.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/components/SearchApplication.js @@ -4,6 +4,7 @@ import { Link } from "react-router-dom"; const PTRSearchApplication = ({tenantId, isLoading, t, onSubmit, data, count, setShowToast }) => { + const isMobile = window.Digit.Utils.browser.isMobile(); const { register, control, handleSubmit, setValue, getValues, reset, formState } = useForm({ defaultValues: { @@ -34,9 +35,41 @@ i18nKey: "WF_PTR_INWORKFLOW" }, ] + + const stateId = Digit.ULBService.getStateId(); + + + const { data: Menu } = Digit.Hooks.ptr.usePTRPetMDMS(stateId, "PetService", "PetType"); + // const { data: Breed_Type } = Digit.Hooks.ptr.useBreedTypeMDMS(stateId, "PetService", "BreedType"); // hooks for breed type + + let menu = []; + + + // let breed_type = []; + + + Menu && + Menu.map((petone) => { + menu.push({ i18nKey: `PTR_PET_${petone.code}`, code: `${petone.code}`, value: `${petone.name}` }); + }); + + // Breed_Type && + // Breed_Type.map((breedss) => { + // if (breedss.PetType == menu?.code) { + // breed_type.push({ + // i18nKey: `PTR_BREED_TYPE_${breedss.code}`, + // code: `${breedss.code}`, + // value: `${breedss.name}` + // }); + // } + + // }); + + const GetCell = (value) => {value}; + const columns = useMemo( () => ([ { @@ -124,8 +157,41 @@ - + {/* */} + ( + + )} + /> + {/* + + ( + + )} + /> + */} {formState?.errors?.["mobileNumber"]?.message} - - - - - - - - ( - - )} - /> - + diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTRCitizenPet.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTRCitizenPet.js index 484ffdbf0b6..0dd3ca602e2 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTRCitizenPet.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTRCitizenPet.js @@ -289,9 +289,12 @@ const PTRCitizenPet />
- {Math.floor(petAge / 12)} {Math.floor(petAge / 12) === 1 ? 'PTR_YEAR' : 'PTR_YEARS'}  - {petAge % 12} {petAge % 12 === 1 ? 'PTR_MONTH' : 'PTR_MONTHS'} -
+ {Math.floor(petAge / 12)}   + {Math.floor(petAge / 12) === 1 ? "YEAR" : "YEARS"} +    + {petAge % 12}   + {petAge % 12 === 1 ? "MONTH" : "MONTHS"} +

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTROwnerDetails.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTROwnerDetails.js index 7d86ad98976..311642fb3a7 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTROwnerDetails.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTROwnerDetails.js @@ -266,7 +266,14 @@ control={control} name={"emailId"} defaultValue={owner?.emailId} - rules={{ validate: (e) => ((e && /^[^\s@]+@[^\s@]+$/.test(e)) || !e ? true : t("ERR_DEFAULT_INPUT_FIELD_MSG")) }} + rules={{ + validate: (value) => { + const normalized = value.trim().toLowerCase(); + const emailRegex = /^(([^<>()\[\]\.,;:\s@\"]+(\.[^<>()\[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i; + + return emailRegex.test(normalized) || 'TL_EMAIL_ID_ERROR_MESSAGE'; + } + }} render={(props) => ( {
- {Math.floor(watch('petAge') / 12)} - {Math.floor(watch('petAge') / 12) === 1 ? 'PTR_YEAR' : 'PTR_YEARS'} -   - {watch('petAge') % 12} - {watch('petAge') % 12 === 1 ? 'PTR_MONTH' : 'PTR_MONTHS'} -
+ + {Math.floor(watch('petAge') / 12)}  + {Math.floor(watch('petAge') / 12) === 1 ? "YEAR" : "YEARS"} +    + {watch('petAge') % 12}  + {watch('petAge') % 12 === 1 ? "MONTH" : "MONTHS"} + +

{localFormState.touched.petAge ? errors?.petAge?.message : ""} diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTRSelectProofIdentity.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTRSelectProofIdentity.js index 27b630ff130..32088803f9e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTRSelectProofIdentity.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTRSelectProofIdentity.js @@ -84,18 +84,19 @@ function PTRSelectDocument({ }) { const filteredDocument = documents?.filter((item) => item?.documentType?.includes(doc?.code))[0]; + console.log("filetetetetet",filteredDocument); const tenantId = Digit.ULBService.getCurrentTenantId(); const [selectedDocument, setSelectedDocument] = useState( filteredDocument - ? { ...filteredDocument, active: filteredDocument?.status === "ACTIVE", code: filteredDocument?.documentType } + ? { ...filteredDocument, active: doc?.active === true, code: filteredDocument?.documentType } : doc?.dropdownData?.length === 1 ? doc?.dropdownData[0] : {} ); const [file, setFile] = useState(null); - const [uploadedFile, setUploadedFile] = useState(() => filteredDocument?.fileStoreId || null); + const [uploadedFile, setUploadedFile] = useState(() => filteredDocument?.filestoreId || null); const handlePTRSelectDocument = (value) => setSelectedDocument(value); @@ -215,6 +216,3 @@ function PTRSelectDocument({ } export default PTRSelectProofIdentity; - - - diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTRServiceDoc.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTRServiceDoc.js index fda4faedc78..259a77b8497 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTRServiceDoc.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pageComponents/PTRServiceDoc.js @@ -31,6 +31,8 @@ const PTRServiceDoc = ({ t, config, onSelect, userType, formData }) => { {t("PTR_DOC_REQ_SCREEN_SUB_TEXT")} {t("PTR_DOC_REQ_SCREEN_LABEL")} {t("PTR_DOC_REQ_SCREEN_LABEL_TEXT")} + {t('PTR_PDF_AND_JPG_BOTH_FORMAT_ACCEPTED_IN_DOCUMENT_UPLOAD')} +
{isLoading && } {Array.isArray(docs) diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/citizen/Create/CheckPage.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/citizen/Create/CheckPage.js index b75a3028973..40c5c06f53e 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/citizen/Create/CheckPage.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/citizen/Create/CheckPage.js @@ -40,21 +40,14 @@ const CheckPage = ({ onSubmit, value = {} }) => { const { address, pets, - index=0, // set the initial value for tesing , need to check why when click on change it will not coming in address page and document page + index, isEditPET, isUpdatePET, ownerss, } = value; - - - - - - - const typeOfApplication = !isEditPET && !isUpdatePET ? `new-application` : `edit-application`; @@ -79,25 +72,29 @@ const CheckPage = ({ onSubmit, value = {} }) => { } + actionButton={} + /> } + actionButton={} + /> } + actionButton={} + /> } + actionButton={} + /> @@ -109,37 +106,43 @@ const CheckPage = ({ onSubmit, value = {} }) => { } + actionButton={} + /> } + actionButton={} + /> } + actionButton={} + /> } + actionButton={} + /> } + actionButton={} + /> } + actionButton={} + /> @@ -150,35 +153,35 @@ const CheckPage = ({ onSubmit, value = {} }) => { } + actionButton={} + /> } + actionButton={} + /> } + actionButton={} + /> } actionButton={} /> } actionButton={} /> } actionButton={} /> diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/citizen/Create/index.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/citizen/Create/index.js index 9001c7b5fe6..149cf533447 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/citizen/Create/index.js +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/src/pages/citizen/Create/index.js @@ -19,6 +19,9 @@ const PTRCreate = ({ parentRoute }) => { const [params, setParams, clearParams] = Digit.Hooks.useSessionStorage("PTR_CREATE_PET", {}); let { data: commonFields, isLoading } = Digit.Hooks.pt.useMDMS(stateId, "PropertyTax", "CommonFieldsConfig"); // PROPERTY CONFIG HOOK , just for commkonfeild config const goNext = (skipStep, index, isAddMultiple, key) => { + + + let currentPath = pathname.split("/").pop(), lastchar = currentPath.charAt(currentPath.length - 1), isMultiple = false, @@ -39,7 +42,9 @@ const PTRCreate = ({ parentRoute }) => { if (!isNaN(lastchar)) { isMultiple = true; } - let { nextStep = {} } = config.find((routeObj) => routeObj.route === currentPath); + // let { nextStep = {} } = config.find((routeObj) => routeObj.route === currentPath); + let { nextStep = {} } = config.find((routeObj) => routeObj.route === (currentPath || '0')); + let redirectWithHistory = history.push; From 948f3a81d12ab16fc76c8a3c91b60df236c864d6 Mon Sep 17 00:00:00 2001 From: Shivank0501 Date: Tue, 5 Mar 2024 17:00:51 +0530 Subject: [PATCH 2/2] version change from 1.0.6 to 1.0.7 in package.json file --- .../micro-ui/web/micro-ui-internals/example/devpackage.json | 2 +- .../micro-ui/web/micro-ui-internals/example/package.json | 2 +- frontend/micro-ui/web/micro-ui-internals/package.json | 6 ++++-- .../micro-ui-internals/packages/modules/ptr/package.json | 3 ++- frontend/micro-ui/web/package.json | 6 ++++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json b/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json index fb9e8d6907a..8c8a0c3313b 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/devpackage.json @@ -22,7 +22,7 @@ "@upyog/digit-ui-module-receipts":"1.7.0-beta.3", "@upyog/digit-ui-module-tl":"1.7.0-beta.7", "@upyog/digit-ui-module-ws":"^1.7.0-beta.10", - "@upyog-niua/upyog-ui-module-ptr":"1.0.6", + "@upyog-niua/upyog-ui-module-ptr":"1.0.7", "@upyog/digit-ui-module-commonpt":"1.7.0-beta.4", "http-proxy-middleware": "^1.0.5", "react": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/example/package.json b/frontend/micro-ui/web/micro-ui-internals/example/package.json index be60e40920c..b981cc1815f 100644 --- a/frontend/micro-ui/web/micro-ui-internals/example/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/example/package.json @@ -24,7 +24,7 @@ "@upyog/digit-ui-module-ws": "^1.7.0-beta.10", "@upyog/digit-ui-module-bills": "^1.7.0-beta.3", "@upyog/digit-ui-module-commonpt": "1.7.0-beta.4", - "@upyog-niua/upyog-ui-module-ptr":"1.0.6", + "@upyog-niua/upyog-ui-module-ptr":"1.0.7", "http-proxy-middleware": "^1.0.5", "react": "17.0.2", "react-dom": "17.0.2", diff --git a/frontend/micro-ui/web/micro-ui-internals/package.json b/frontend/micro-ui/web/micro-ui-internals/package.json index 7ff228fdbd0..e9d0a042250 100644 --- a/frontend/micro-ui/web/micro-ui-internals/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/package.json @@ -12,7 +12,9 @@ "packages/modules/commonPt", "packages/modules/dss", "packages/modules/pt", - "packages/modules/obps" + "packages/modules/obps", + "packages/modules/ptr" + ], @@ -63,7 +65,7 @@ "buildD:mcollect": "cd packages/modules/mCollect && yarn build", "buildD:receipts": "cd packages/modules/receipts && yarn build", "buildD:tl": "cd packages/modules/tl && yarn build", - "buildD:ptr": "cd packages/modules/ptr && yarn build", + "build:ptr": "cd packages/modules/ptr && yarn build", "buildD:hrms": "cd packages/modules/hrms && yarn build", "build:obps": "cd packages/modules/obps && yarn build", "buildD:engagement": "cd packages/modules/engagement && yarn build", diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/package.json b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/package.json index eb7acbe7cae..f1d9f1188d4 100644 --- a/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/package.json +++ b/frontend/micro-ui/web/micro-ui-internals/packages/modules/ptr/package.json @@ -1,6 +1,7 @@ { "name": "@upyog-niua/upyog-ui-module-ptr", - "version": "1.0.6", + "author": "Shivank Shukla & Abhijeet Verma", + "version": "1.0.7", "license": "MIT", "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 index e73e40554e0..3f0bd79bf70 100644 --- a/frontend/micro-ui/web/package.json +++ b/frontend/micro-ui/web/package.json @@ -11,7 +11,9 @@ "micro-ui-internals/packages/modules/commonPt", "micro-ui-internals/packages/modules/dss", "micro-ui-internals/packages/modules/pt", - "micro-ui-internals/packages/modules/obps" + "micro-ui-internals/packages/modules/obps", + "micro-ui-internals/packages/modules/ptr" + ], @@ -38,7 +40,7 @@ "@upyog/digit-ui-module-tl": "1.7.0-beta.7", "@upyog/digit-ui-module-ws": "1.7.0-beta.10", "@upyog/digit-ui-react-components": "1.7.0-beta.4", - "@upyog-niua/upyog-ui-module-ptr": "1.0.6", + "@upyog-niua/upyog-ui-module-ptr": "1.0.7", "babel-loader": "8.1.0", "react": "17.0.2", "react-dom": "17.0.2",