Skip to content

Commit ec3f112

Browse files
rahul01987rahul01987
authored
Merge pull request #1039 from abhijniua/Dev-2.0
Adding Lat long feature from image with new additional fields as well
2 parents d8055c4 + 24002ed commit ec3f112

File tree

13 files changed

+1114
-68
lines changed

13 files changed

+1114
-68
lines changed

‎frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,9 @@ import useServiceTypeFromApplicationType from "./obps/useServiceTypeFromApplicat
179179
import useBusinessServiceBasedOnServiceType from "./obps/useBusinessServiceBasedOnServiceType";
180180
import useBusinessServiceData from "./obps/useBusinessServiceData";
181181
import useBPATaxDocuments from "./obps/useBPATaxDocuments";
182+
import useDistricts from "./obps/useDistricts";
183+
import useULBList from "./obps/useULBList";
184+
182185

183186
import useEventInbox from "./events/useEventInbox";
184187
import useEventDetails from "./events/useEventDetails";
@@ -447,6 +450,8 @@ const obps = {
447450
useBusinessServiceBasedOnServiceType,
448451
useBusinessServiceData,
449452
useBPATaxDocuments,
453+
useDistricts,
454+
useULBList
450455
};
451456

452457
const events = {

‎frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/obps/useDistricts.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { useQuery } from "react-query";
2+
import { MdmsService } from "../../services/elements/MDMS";
3+
4+
const useDistricts = (tenantId, moduleCode, type, config = {}) => {
5+
const usedistricttype = () => {
6+
return useQuery("BPA_DISTRICTS", () => MdmsService.BPADistrict(tenantId, moduleCode ,type), config);
7+
};
8+
9+
10+
switch (type) {
11+
case "Districts":
12+
return usedistricttype();
13+
default:
14+
return null;
15+
}
16+
};
17+
18+
19+
20+
export default useDistricts;

‎frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/hooks/obps/useULBList.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { useQuery } from "react-query";
2+
import { MdmsService } from "../../services/elements/MDMS";
3+
4+
const useULBList = (tenantId, moduleCode, type, config = {}) => {
5+
const useULBType = () => {
6+
return useQuery("BPA_ULB_TYPE", () => MdmsService.BPAUlb(tenantId, moduleCode ,type), config);
7+
};
8+
9+
10+
switch (type) {
11+
case "Ulb":
12+
return useULBType();
13+
default:
14+
return null;
15+
}
16+
};
17+
18+
19+
20+
export default useULBList;

‎frontend/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/MDMS.js

Lines changed: 100 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,38 @@ const getApplicationChannelCriteria = (tenantId, moduleCode) => ({
287287
],
288288
},
289289
});
290+
const getdistricttype = (tenantId, moduleCode, type) => ({
291+
type,
292+
details: {
293+
tenantId,
294+
moduleDetails: [
295+
{
296+
moduleName: moduleCode,
297+
masterDetails: [
298+
{
299+
name: "Districts",
300+
},
301+
],
302+
},
303+
],
304+
},
305+
});
306+
const getulbtype = (tenantId, moduleCode, type) => ({
307+
type,
308+
details: {
309+
tenantId,
310+
moduleDetails: [
311+
{
312+
moduleName: moduleCode,
313+
masterDetails: [
314+
{
315+
name: "Ulb",
316+
},
317+
],
318+
},
319+
],
320+
},
321+
});
290322

291323
const getPropertyTypeCriteria = (tenantId, moduleCode, type) => ({
292324
type,
@@ -375,6 +407,45 @@ const PTRBreedType = (MdmsRes) => {
375407
};
376408
///////////
377409

410+
const getdistrict = (MdmsRes) => {
411+
return MdmsRes["BPA"].Districts.filter((Districts) => Districts.active).map((districtDetails) => {
412+
return {
413+
...districtDetails,
414+
i18nKey: `BPA_DISTRICT_${districtDetails.code}`,
415+
};
416+
});
417+
//return MdmsRes;
418+
};
419+
420+
const getulb = (MdmsRes) => {
421+
return MdmsRes["BPA"].Ulb.filter((Ulb) => Ulb.active).map((ulbDetails) => {
422+
return {
423+
...ulbDetails,
424+
i18nKey: `BPA_DISTRICT_${ulbDetails.code}`,
425+
};
426+
});
427+
//return MdmsRes;
428+
};
429+
/////////////
430+
431+
const BPADistrict = (MdmsRes) => {
432+
MdmsRes["BPA"].Districts.filter((Districts) => Districts.active).map((districts) => {
433+
return {
434+
...districts,
435+
i18nKey: `BPA_DISTRICTS_${districts.code}`,
436+
};
437+
});
438+
};
439+
const BPAUlb = (MdmsRes) => {
440+
MdmsRes["BPA"].Ulb.filter((Ulb) => Ulb.active).map((ulblist) => {
441+
return {
442+
...ulblist,
443+
i18nKey: `BPA_ULB_${ulblist.code}`,
444+
};
445+
});
446+
};
447+
/////////////
448+
378449
const getCommonFieldsCriteria = (tenantId, moduleCode, type) => ({
379450
type,
380451
details: {
@@ -1122,7 +1193,7 @@ const GetPropertyType = (MdmsRes) =>
11221193
i18nKey: `PROPERTYTYPE_MASTERS_${item.code}`,
11231194
code: item.code,
11241195
}));
1125-
1196+
11261197
const GetPropertySubtype = (MdmsRes) =>
11271198
MdmsRes["FSM"].PropertyType.filter((property) => property.active && property.propertyType).map((item) => ({
11281199
...item,
@@ -1534,6 +1605,20 @@ const transformResponse = (type, MdmsRes, moduleCode, tenantId) => {
15341605

15351606
case "PTRBreedType":
15361607
return PTRBreedType(MdmsRes);
1608+
1609+
case "Districts":
1610+
return getdistrict(MdmsRes);
1611+
1612+
case "Ulb":
1613+
return getulb(MdmsRes);
1614+
1615+
case "BPADistrict":
1616+
return BPADistrict(MdmsRes);
1617+
case "BPAUlb":
1618+
return BPAUlb(MdmsRes);
1619+
1620+
1621+
15371622

15381623

15391624

@@ -1679,13 +1764,27 @@ export const MdmsService = {
16791764
return MdmsService.getDataByCriteria(tenantId, getPetDocumentsRequiredScreenCategory(tenantId, moduleCode), moduleCode);
16801765
},
16811766

1767+
getdistrict: (tenantId, moduleCode, type) => {
1768+
return MdmsService.getDataByCriteria(tenantId, getdistricttype(tenantId, moduleCode, type), moduleCode);
1769+
},
1770+
getulb: (tenantId, moduleCode, type) => {
1771+
return MdmsService.getDataByCriteria(tenantId, getulbtype(tenantId, moduleCode, type), moduleCode);
1772+
},
1773+
1774+
16821775
getPetType: (tenantId, moduleCode, type) => {
16831776
return MdmsService.getDataByCriteria(tenantId, getPetTypeList(tenantId, moduleCode, type), moduleCode);
16841777
},
16851778

16861779
getBreedType: (tenantId, moduleCode, type) => {
16871780
return MdmsService.getDataByCriteria(tenantId, getBreedTypeList(tenantId, moduleCode, type), moduleCode);
16881781
},
1782+
BPADistrict: (tenantId, moduleCode, type) => {
1783+
return MdmsService.getDataByCriteria(tenantId, getdistricttype(tenantId, moduleCode, type), moduleCode);
1784+
},
1785+
BPAUlb: (tenantId, moduleCode, type) => {
1786+
return MdmsService.getDataByCriteria(tenantId, getulbtype(tenantId, moduleCode, type), moduleCode);
1787+
},
16891788
PTRGenderType: (tenantId, moduleCode, type) => {
16901789
return MdmsService.getDataByCriteria(tenantId, getGenderTypeList(tenantId, moduleCode, type), moduleCode);
16911790
},

‎frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"dependencies": {
2121
"@upyog/digit-ui-react-components": "1.7.0-beta.4",
2222
"microbundle-crl": "^0.13.11",
23+
"exif-js": "^2.3.0",
2324
"react": "17.0.2",
2425
"react-dom": "17.0.2",
2526
"react-hook-form": "6.15.8",

‎frontend/micro-ui/web/micro-ui-internals/packages/modules/obps/src/Module.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ import BasicDetails from "./pageComponents/BasicDetails";
1212
import DocsRequired from "./pageComponents/DocsRequired";
1313
import PlotDetails from "./pageComponents/PlotDetails";
1414
import ScrutinyDetails from "./pageComponents/ScrutinyDetails";
15+
import BPANewBuildingdetails from "./pageComponents/BPANewBuildingdetails"
1516
import OwnerDetails from "./pageComponents/OwnerDetails";
1617
import DocumentDetails from "./pageComponents/DocumentDetails";
1718
import NOCDetails from "./pageComponents/NOCDetails";
1819
import NOCNumber from "./pageComponents/NOCNumber";
1920
import LocationDetails from "./pageComponents/LocationDetails";
2021
import StakeholderDocsRequired from "./pageComponents/StakeholderDocsRequired";
2122
import GIS from "./pageComponents/GIS";
23+
2224
import OCEDCRDocsRequired from "./pageComponents/OCEDCRDocsRequired";
2325
import OCeDCRScrutiny from "./pageComponents/OCeDCRScrutiny";
2426
import OCUploadPlanDiagram from "./pageComponents/OCUploadPlanDiagram";
@@ -57,6 +59,12 @@ import BPAAcknowledgement from "./pages/citizen/NewBuildingPermit/OBPSAcknowledg
5759
import OCBPAAcknowledgement from "./pages/citizen/OCBuildingPermit/OBPSAcknowledgement";
5860
import OCSendBackAcknowledgement from "./pages/citizen/OCSendBackToCitizen/Acknowledgement";
5961
import StakeholderAcknowledgement from "./pages/citizen/StakeholderRegistration/StakeholderAcknowledgement";
62+
63+
64+
65+
66+
67+
6068

6169

6270
const OBPSModule = ({ stateCode, userType, tenants }) => {
@@ -113,6 +121,7 @@ const componentsToRegister = {
113121
DocsRequired,
114122
PlotDetails,
115123
ScrutinyDetails,
124+
BPANewBuildingdetails,
116125
OwnerDetails,
117126
DocumentDetails,
118127
NOCDetails,
@@ -155,7 +164,10 @@ const componentsToRegister = {
155164
ObpsOCSendBackToCitizen : OCSendBackToCitizen,
156165
ObpsEdcrInbox : EdcrInbox,
157166
ObpsEmpApplicationDetail : EmpApplicationDetail,
158-
ObpsEmployeeBpaApplicationDetail : EmployeeBpaApplicationDetail
167+
ObpsEmployeeBpaApplicationDetail : EmployeeBpaApplicationDetail,
168+
169+
170+
159171
}
160172

161173
export const initOBPSComponents = () => {

0 commit comments

Comments
 (0)