Skip to content

Commit

Permalink
Merge pull request #1058 from deepa-s-13/Dev-2.0
Browse files Browse the repository at this point in the history 
OBPAS CHANGES
  • Loading branch information
@sriranjan-s
sriranjan-s authored Apr 15, 2024
2 parents 39b320a + 38eef50 commit be7c21b
Show file tree
Hide file tree
Showing 11 changed files with 113 additions and 260 deletions.
6 changes: 3 additions & 3 deletions frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/OBPS.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ export const OBPSService = {
asSectionHeader: true,
isCommon: true,
values: [
{ title: "BPA_BOUNDARY_PLOT_AREA_LABEL", value: `${edcr?.planDetail?.planInformation?.plotArea}`, isNotTranslated: true, isUnit: "BPA_SQ_YARDS_LABEL" },
{ title: "BPA_BOUNDARY_PLOT_AREA_LABEL", value: `${edcr?.planDetail?.planInformation?.plotArea}`, isNotTranslated: true, isUnit: "BPA_SQ_MTRS_LABEL" },
{ title: "BPA_PLOT_NUMBER_LABEL", value: edcr?.planDetail?.planInformation?.plotNo || "NA", isNotTranslated: true },
{ title: "BPA_KHATHA_NUMBER_LABEL", value: edcr?.planDetail?.planInformation?.khataNo || "NA", isNotTranslated: true },
{ title: "BPA_HOLDING_NUMBER_LABEL", value: BPA?.additionalDetails?.holdingNo || "NA", isNotTranslated: true },
Expand Down Expand Up @@ -564,7 +564,7 @@ export const OBPSService = {
additionalDetails: {
values: [
{ title: BPA?.businessService !== "BPA_OC" ? "BPA_BUILDING_EXTRACT_HEADER" : "BPA_ACTUAL_BUILDING_EXTRACT_HEADER", value : " ", isHeader: true},
{ title: "BPA_TOTAL_BUILT_UP_AREA_HEADER", value: edcr?.planDetail?.blocks?.[0]?.building?.totalBuitUpArea, isUnit: "BPA_SQ_YARDS_LABEL"},
{ title: "BPA_TOTAL_BUILT_UP_AREA_HEADER", value: edcr?.planDetail?.blocks?.[0]?.building?.totalBuitUpArea, isUnit: "BPA_SQ_MTRS_LABEL"},
{ title: "BPA_SCRUTINY_DETAILS_NUMBER_OF_FLOORS_LABEL", value: edcr?.planDetail?.blocks?.[0]?.building?.totalFloors || "NA" },
{ title: "BPA_HEIGHT_FROM_GROUND_LEVEL", value: edcr?.planDetail?.blocks?.[0]?.building?.declaredBuildingHeigh , isUnit: "BPA_MTRS_LABEL" }
],
Expand All @@ -579,7 +579,7 @@ export const OBPSService = {
additionalDetails: {
values: [
{ title: "BPA_APP_DETAILS_DEMOLITION_DETAILS_LABEL", value : " ", isHeader: true},
{ title: "BPA_APPLICATION_DEMOLITION_AREA_LABEL", value: edcr?.planDetail?.planInformation?.demolitionArea, isUnit: "BPA_SQ_YARDS_LABEL" }
{ title: "BPA_APPLICATION_DEMOLITION_AREA_LABEL", value: edcr?.planDetail?.planInformation?.demolitionArea, isUnit: "BPA_SQ_MTRS_LABEL" }
],
scruntinyDetails: []
}
Expand Down
4 changes: 2 additions & 2 deletions frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/getBPAAcknowledgement.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const getMohallaLocale = (value = "", tenantId = "") => {
values: [
{
title: t("BPA_BOUNDARY_PLOT_AREA_LABEL"),
value: `${application?.data?.edcrDetails?.planDetail?.planInformation?.plotArea} sq yd` || "NA"
value: `${application?.data?.edcrDetails?.planDetail?.planInformation?.plotArea} sq mtrs` || "NA"
},
{
title: t("BPA_PLOT_NUMBER_LABEL"),
Expand All @@ -113,7 +113,7 @@ const getMohallaLocale = (value = "", tenantId = "") => {
},
{
title: t("BPA_APPLICATION_DEMOLITION_AREA_LABEL"),
value: t(`${application?.data?.edcrDetails?.planDetail?.planInformation?.demolitionArea} sq yd`) || "NA"
value: t(`${application?.data?.edcrDetails?.planDetail?.planInformation?.demolitionArea} sq mtrs`) || "NA"
}
]
},
Expand Down
41 changes: 26 additions & 15 deletions .../micro-ui/web/micro-ui-internals/packages/modules/obps/src/config/buildingPermitConfig.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,19 @@ export const newConfig = [
route: "docs-required",
component: "DocsRequired",
key: "data",
nextStep: "basic-details"
nextStep: "noc-number"
},
{
route: "noc-number",
component: "NOCNumber",
nextStep: "basic-details",
key: "nocnumber",
texts: {
"headerCaption": "BPA_NOC_NUMBER_DETAILS",
"header": "",
"submitBarLabel": "CS_COMMON_NEXT"
}
},
{
route: "basic-details",
component: "BasicDetails",
Expand All @@ -24,7 +35,7 @@ export const newConfig = [
header: "BPA_PLOT_DETAILS_TITLE",
cardText: "",
submitBarLabel: "CS_COMMON_NEXT",
skipText: "CORE_COMMON_SKIP_CONTINUE",
//skipText: "CORE_COMMON_SKIP_CONTINUE",
},
inputs: [
{
Expand Down Expand Up @@ -93,26 +104,26 @@ export const newConfig = [
{
route: "document-details",
component: "DocumentDetails",
nextStep: "noc-details",
nextStep: null,
key: "documents",
texts: {
headerCaption: "BPA_OWNER_AND_DOCUMENT_DETAILS_LABEL",
header: "BPA_DOCUMENT_DETAILS_LABEL",
submitBarLabel: "CS_COMMON_NEXT",
}
},
{
route: "noc-details",
component: "NOCDetails",
nextStep: null,
key: "nocDocuments",
texts: {
headerCaption: "BPA_NOC_DETAILS_SUMMARY",
header: "",
submitBarLabel: "CS_COMMON_NEXT",
skipText: "CORE_COMMON_SKIP_CONTINUE",
}
}
// {
// route: "noc-details",
// component: "NOCDetails",
// nextStep: null,
// key: "nocDocuments",
// texts: {
// headerCaption: "BPA_NOC_DETAILS_SUMMARY",
// header: "",
// submitBarLabel: "CS_COMMON_NEXT",
// skipText: "CORE_COMMON_SKIP_CONTINUE",
// }
// }
]
}
]
201 changes: 22 additions & 179 deletions ...end/micro-ui/web/micro-ui-internals/packages/modules/obps/src/pageComponents/NOCNumber.js
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
import React, { useState } from "react";
import React, { useState,useEffect } from "react";
import { FormStep} 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(null);
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]);

function onChange(data) {
setValueNoc(data.target.value);
}
Expand All @@ -14,193 +20,30 @@ const NOCNumber = ({ t, config, onSelect, userType, formData, setError: setFormE
console.log("inside_search")
}

function getusageCategoryAPI(arr){
let usageCat = ""
arr.map((ob,i) => {
usageCat = usageCat + (i !==0?",":"") + ob.code;
});
return usageCat;
}

function getUnitsForAPI(subOccupancyData){
const ob = subOccupancyData?.subOccupancy;
const blocksDetails = subOccupancyData?.data?.edcrDetails?.planDetail?.blocks || [];
let units=[];
if(ob) {
let result = Object.entries(ob);
result.map((unit,index)=>{
units.push({
blockIndex:index,
floorNo:unit[0].split("_")[1],
unitType:"Block",
occupancyType: blocksDetails?.[index]?.building?.occupancies?.[0]?.typeHelper?.type?.code || "A",
usageCategory:getusageCategoryAPI(unit[1]),
});
})
}
return units;
}

function getBlockIds(arr){
let blockId = {};
arr.map((ob,ind)=>{
blockId[`Block_${ob.floorNo}`]=ob.id;
});
return blockId;
}

const handleSubmit = () => {
let owner = formData.owners;
let ownerStep;
ownerStep = { ...owner};

if (!formData?.id) {
//setIsDisable(true);
//for owners conversion
let ownershipCategory=formData?.owners?.ownershipCategory;
let conversionOwners = [];
ownerStep?.owners?.map(owner => {
conversionOwners.push({
...owner,
active:true,
name: owner.name,
emailId:owner.emailId,
mobileNumber: owner.mobileNumber,
isPrimaryOwner: owner.isPrimaryOwner,
gender: owner.gender.code,
fatherOrHusbandName: "NAME"
})
});
let payload = {};
payload.edcrNumber = formData?.edcrNumber?.edcrNumber ? formData?.edcrNumber?.edcrNumber :formData?.data?.scrutinyNumber?.edcrNumber;
payload.riskType = formData?.data?.riskType;
payload.applicationType = formData?.data?.applicationType;
payload.serviceType = formData?.data?.serviceType;

const userInfo = Digit.UserService.getUser();
const accountId = userInfo?.info?.uuid;
payload.tenantId = formData?.address?.city?.code;
payload.workflow = { action: "INITIATE", assignes : [userInfo?.info?.uuid] };
payload.accountId = accountId;
payload.documents = null;

// Additonal details
payload.additionalDetails = {GISPlaceName:formData?.address?.placeName};
payload.additionalDetails.boundaryWallLength = formData?.data?.boundaryWallLength || "NA";
payload.additionalDetails.area = (formData?.data.edcrDetails.planDetail.planInformation.plotArea).toString()|| "NA";
payload.additionalDetails.height = (formData?.data.edcrDetails.planDetail.blocks[0].building.buildingHeight).toString() || "NA";
payload.additionalDetails.usage = formData?.data.occupancyType || "NA";
payload.additionalDetails.builtUpArea =(formData?.data.edcrDetails.planDetail.blocks[0].building.totalBuitUpArea).toString();
payload.additionalDetails.nocNumber=nocNumber;
if (formData?.data?.holdingNumber) payload.additionalDetails.holdingNo = formData?.data?.holdingNumber;
if (formData?.data?.registrationDetails) payload.additionalDetails.registrationDetails = formData?.data?.registrationDetails;
if (formData?.data?.applicationType) payload.additionalDetails.applicationType = formData?.data?.applicationType;
if (formData?.data?.serviceType) payload.additionalDetails.serviceType = formData?.data?.serviceType;
//For LandInfo
payload.landInfo = {};
//For Address
payload.landInfo.address = {};
if (formData?.address?.city?.code) payload.landInfo.address.city = formData?.address?.city?.code;
if (formData?.address?.locality?.code) payload.landInfo.address.locality = { code: formData?.address?.locality?.code };
if (formData?.address?.pincode) payload.landInfo.address.pincode = formData?.address?.pincode;
if (formData?.address?.landmark) payload.landInfo.address.landmark = formData?.address?.landmark;
if (formData?.address?.street) payload.landInfo.address.street = formData?.address?.street;
if (formData?.address?.geoLocation) payload.landInfo.address.geoLocation = formData?.address?.geoLocation;

payload.landInfo.owners = conversionOwners;
payload.landInfo.ownershipCategory = ownershipCategory.code;
payload.landInfo.tenantId = formData?.address?.city?.code;

//for units
const blockOccupancyDetails = formData;
payload.landInfo.unit = getUnitsForAPI(blockOccupancyDetails);

let nameOfAchitect = sessionStorage.getItem("BPA_ARCHITECT_NAME");
let parsedArchitectName = nameOfAchitect ? JSON.parse(nameOfAchitect) : "ARCHITECT";
payload.additionalDetails.typeOfArchitect = parsedArchitectName;
let isSelfCertificationRequired=sessionStorage.getItem("isSelfCertificationRequired");
if(isSelfCertificationRequired==="undefined"){
isSelfCertificationRequired="false";
}
payload.additionalDetails.isSelfCertificationRequired = isSelfCertificationRequired.toString();
// create BPA call
if(isSelfCertificationRequired===true && formData?.data.occupancyType==="Residential" && (parsedArchitectName=="ARCHITECT" || parsedArchitectName=="ENGINEER"|| parsedArchitectName=="DESIGNER" || parsedArchitectName=="SUPERVISOR")){
if(formData?.data.edcrDetails.planDetail.blocks[0].building.buildingHeight > 15){
alert("Height should not be more than 15 metres");
}
else if((parsedArchitectName=="ARCHITECT" || parsedArchitectName=="ENGINEER") && formData?.data.edcrDetails.planDetail.planInformation.plotArea>500){
alert("Architect/Engineer can apply for area less then 500 sq. yards. in self declaration")
}
else if((parsedArchitectName=="DESIGNER" || parsedArchitectName=="SUPERVISOR") && formData?.data.edcrDetails.planDetail.planInformation.plotArea>250){
alert("Designer/Supervisor can apply for area less then 500 sq. yards. in self declaration")
}
else{
Digit.OBPSService.create({ BPA: payload }, tenantId)
.then((result, err) => {
if (result?.BPA?.length > 0) {
result?.BPA?.[0]?.landInfo?.owners?.forEach(owner => {
owner.gender = { code: owner.gender, active: true, i18nKey: `COMMON_GENDER_${owner.gender}` }
});
result.BPA[0].owners = { ...owner, owners: result?.BPA?.[0]?.landInfo?.owners, ownershipCategory: ownershipCategory };
result.BPA[0].address = result?.BPA?.[0]?.landInfo?.address;
result.BPA[0].address.city = formData.address.city;
result.BPA[0].address.locality = formData.address.locality;
result.BPA[0].placeName = formData?.address?.placeName;
result.BPA[0].data = formData.data;
result.BPA[0].BlockIds = getBlockIds(result.BPA[0].landInfo.unit);
result.BPA[0].subOccupancy= formData?.subOccupancy;
result.BPA[0].uiFlow = formData?.uiFlow;
//setIsDisable(false);
onSelect("", result.BPA[0], "", true);
}
})
.catch((e) => {
// setIsDisable(false);
setShowToast({ key: "true", error: true, message: e?.response?.data?.Errors[0]?.message });
});
}

}
else{
Digit.OBPSService.create({ BPA: payload }, tenantId)
.then((result, err) => {
if (result?.BPA?.length > 0) {
result?.BPA?.[0]?.landInfo?.owners?.forEach(owner => {
owner.gender = { code: owner.gender, active: true, i18nKey: `COMMON_GENDER_${owner.gender}` }
});
result.BPA[0].owners = { ...owner, owners: result?.BPA?.[0]?.landInfo?.owners, ownershipCategory: ownershipCategory };
result.BPA[0].address = result?.BPA?.[0]?.landInfo?.address;
result.BPA[0].address.city = formData.address.city;
result.BPA[0].address.locality = formData.address.locality;
result.BPA[0].placeName = formData?.address?.placeName;
result.BPA[0].data = formData.data;
result.BPA[0].BlockIds = getBlockIds(result.BPA[0].landInfo.unit);
result.BPA[0].subOccupancy= formData?.subOccupancy;
result.BPA[0].uiFlow = formData?.uiFlow;
// setIsDisable(false);
onSelect("", result.BPA[0], "", true);
}
})
.catch((e) => {
//setIsDisable(false);
setShowToast({ key: "true", error: true, message: e?.response?.data?.Errors[0]?.message });
});
}
} else {
onSelect(config.key, ownerStep);
}
onSelect(config?.key, { nocNumber});
};

return (
<div>
<Timeline currentStep={3} />
<Timeline currentStep={0} />
<FormStep
t={t}
config={config}
onSelect={handleSubmit}
isDisabled={!nocNumber}
onChange={onChange}
isDisabled={ !nocNumber }

>

<input
class="card-input"
type="text"
value={nocNumber}
onChange={onChange}
style={{marginBottom:'10px'}}
defaultValues={formData?.nocnumber?.nocNumber || formData?.additionalDetails?.nocNumber}
/>
<button onClick={onClick} style={{alignSelf:'flex-start',backgroundColor:'marron'}}></button>
<span onClick={onClick} style={{alignSelf:'flex-start', marginBottom:'5px', backgroundColor:'maroon', border:'1px solid marron',color:'white',padding:'5px 10px',borderRadius:'3px',cursor:'pointer'}}>SEARCH NOC</span>
</FormStep>
</div>
Expand Down
Loading

0 comments on commit be7c21b

Please sign in to comment.