@djb25/digit-ui-module-wt 1.0.51 → 1.0.52

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -342,6 +342,7 @@ const WTCreate = () => {
342
342
  }
343
343
  });
344
344
  }
345
+ if (data !== null && data !== void 0 && data.silent) return;
345
346
  goNext(skipStep, index, isAddMultiple, key);
346
347
  }
347
348
  const onSuccess = () => {
@@ -506,8 +507,8 @@ const waterTankerPayload = data => {
506
507
  address: {
507
508
  addressType: data === null || data === void 0 ? void 0 : (_data$address2 = data.address) === null || _data$address2 === void 0 ? void 0 : (_data$address2$addres = _data$address2.addressType) === null || _data$address2$addres === void 0 ? void 0 : _data$address2$addres.code,
508
509
  pincode: data === null || data === void 0 ? void 0 : (_data$address3 = data.address) === null || _data$address3 === void 0 ? void 0 : _data$address3.pincode,
509
- city: data === null || data === void 0 ? void 0 : (_data$address4 = data.address) === null || _data$address4 === void 0 ? void 0 : (_data$address4$city = _data$address4.city) === null || _data$address4$city === void 0 ? void 0 : (_data$address4$city$c = _data$address4$city.city) === null || _data$address4$city$c === void 0 ? void 0 : _data$address4$city$c.name,
510
- cityCode: data === null || data === void 0 ? void 0 : (_data$address5 = data.address) === null || _data$address5 === void 0 ? void 0 : (_data$address5$city = _data$address5.city) === null || _data$address5$city === void 0 ? void 0 : (_data$address5$city$c = _data$address5$city.city) === null || _data$address5$city$c === void 0 ? void 0 : _data$address5$city$c.code,
510
+ city: (data === null || data === void 0 ? void 0 : (_data$address4 = data.address) === null || _data$address4 === void 0 ? void 0 : (_data$address4$city = _data$address4.city) === null || _data$address4$city === void 0 ? void 0 : (_data$address4$city$c = _data$address4$city.city) === null || _data$address4$city$c === void 0 ? void 0 : _data$address4$city$c.name) || "DJB",
511
+ cityCode: (data === null || data === void 0 ? void 0 : (_data$address5 = data.address) === null || _data$address5 === void 0 ? void 0 : (_data$address5$city = _data$address5.city) === null || _data$address5$city === void 0 ? void 0 : (_data$address5$city$c = _data$address5$city.city) === null || _data$address5$city$c === void 0 ? void 0 : _data$address5$city$c.code) || "DJB",
511
512
  addressLine1: data === null || data === void 0 ? void 0 : (_data$address6 = data.address) === null || _data$address6 === void 0 ? void 0 : _data$address6.addressLine1,
512
513
  addressLine2: data === null || data === void 0 ? void 0 : (_data$address7 = data.address) === null || _data$address7 === void 0 ? void 0 : _data$address7.addressLine2,
513
514
  locality: data === null || data === void 0 ? void 0 : (_data$address8 = data.address) === null || _data$address8 === void 0 ? void 0 : (_data$address8$locali = _data$address8.locality) === null || _data$address8$locali === void 0 ? void 0 : _data$address8$locali.i18nKey,
@@ -551,8 +552,8 @@ const mobileToiletPayload = data => {
551
552
  address: {
552
553
  addressType: data === null || data === void 0 ? void 0 : (_data$address14 = data.address) === null || _data$address14 === void 0 ? void 0 : (_data$address14$addre = _data$address14.addressType) === null || _data$address14$addre === void 0 ? void 0 : _data$address14$addre.code,
553
554
  pincode: data === null || data === void 0 ? void 0 : (_data$address15 = data.address) === null || _data$address15 === void 0 ? void 0 : _data$address15.pincode,
554
- city: data === null || data === void 0 ? void 0 : (_data$address16 = data.address) === null || _data$address16 === void 0 ? void 0 : (_data$address16$city = _data$address16.city) === null || _data$address16$city === void 0 ? void 0 : (_data$address16$city$ = _data$address16$city.city) === null || _data$address16$city$ === void 0 ? void 0 : _data$address16$city$.name,
555
- cityCode: data === null || data === void 0 ? void 0 : (_data$address17 = data.address) === null || _data$address17 === void 0 ? void 0 : (_data$address17$city = _data$address17.city) === null || _data$address17$city === void 0 ? void 0 : (_data$address17$city$ = _data$address17$city.city) === null || _data$address17$city$ === void 0 ? void 0 : _data$address17$city$.code,
555
+ city: (data === null || data === void 0 ? void 0 : (_data$address16 = data.address) === null || _data$address16 === void 0 ? void 0 : (_data$address16$city = _data$address16.city) === null || _data$address16$city === void 0 ? void 0 : (_data$address16$city$ = _data$address16$city.city) === null || _data$address16$city$ === void 0 ? void 0 : _data$address16$city$.name) || "DJB",
556
+ cityCode: (data === null || data === void 0 ? void 0 : (_data$address17 = data.address) === null || _data$address17 === void 0 ? void 0 : (_data$address17$city = _data$address17.city) === null || _data$address17$city === void 0 ? void 0 : (_data$address17$city$ = _data$address17$city.city) === null || _data$address17$city$ === void 0 ? void 0 : _data$address17$city$.code) || "DJB",
556
557
  addressLine1: data === null || data === void 0 ? void 0 : (_data$address18 = data.address) === null || _data$address18 === void 0 ? void 0 : _data$address18.addressLine1,
557
558
  addressLine2: data === null || data === void 0 ? void 0 : (_data$address19 = data.address) === null || _data$address19 === void 0 ? void 0 : _data$address19.addressLine2,
558
559
  locality: data === null || data === void 0 ? void 0 : (_data$address20 = data.address) === null || _data$address20 === void 0 ? void 0 : (_data$address20$local = _data$address20.locality) === null || _data$address20$local === void 0 ? void 0 : _data$address20$local.i18nKey,
@@ -593,8 +594,8 @@ const treePruningPayload = data => {
593
594
  address: {
594
595
  addressType: data === null || data === void 0 ? void 0 : (_data$address25 = data.address) === null || _data$address25 === void 0 ? void 0 : (_data$address25$addre = _data$address25.addressType) === null || _data$address25$addre === void 0 ? void 0 : _data$address25$addre.code,
595
596
  pincode: data === null || data === void 0 ? void 0 : (_data$address26 = data.address) === null || _data$address26 === void 0 ? void 0 : _data$address26.pincode,
596
- city: data === null || data === void 0 ? void 0 : (_data$address27 = data.address) === null || _data$address27 === void 0 ? void 0 : (_data$address27$city = _data$address27.city) === null || _data$address27$city === void 0 ? void 0 : (_data$address27$city$ = _data$address27$city.city) === null || _data$address27$city$ === void 0 ? void 0 : _data$address27$city$.name,
597
- cityCode: data === null || data === void 0 ? void 0 : (_data$address28 = data.address) === null || _data$address28 === void 0 ? void 0 : (_data$address28$city = _data$address28.city) === null || _data$address28$city === void 0 ? void 0 : (_data$address28$city$ = _data$address28$city.city) === null || _data$address28$city$ === void 0 ? void 0 : _data$address28$city$.code,
597
+ city: (data === null || data === void 0 ? void 0 : (_data$address27 = data.address) === null || _data$address27 === void 0 ? void 0 : (_data$address27$city = _data$address27.city) === null || _data$address27$city === void 0 ? void 0 : (_data$address27$city$ = _data$address27$city.city) === null || _data$address27$city$ === void 0 ? void 0 : _data$address27$city$.name) || "DJB",
598
+ cityCode: (data === null || data === void 0 ? void 0 : (_data$address28 = data.address) === null || _data$address28 === void 0 ? void 0 : (_data$address28$city = _data$address28.city) === null || _data$address28$city === void 0 ? void 0 : (_data$address28$city$ = _data$address28$city.city) === null || _data$address28$city$ === void 0 ? void 0 : _data$address28$city$.code) || "DJB",
598
599
  addressLine1: data === null || data === void 0 ? void 0 : (_data$address29 = data.address) === null || _data$address29 === void 0 ? void 0 : _data$address29.addressLine1,
599
600
  addressLine2: data === null || data === void 0 ? void 0 : (_data$address30 = data.address) === null || _data$address30 === void 0 ? void 0 : _data$address30.addressLine2,
600
601
  locality: data === null || data === void 0 ? void 0 : (_data$address31 = data.address) === null || _data$address31 === void 0 ? void 0 : (_data$address31$local = _data$address31.locality) === null || _data$address31$local === void 0 ? void 0 : _data$address31$local.i18nKey,
@@ -643,7 +644,7 @@ const fillingPointPayload = data => {
643
644
  addressLine1: data === null || data === void 0 ? void 0 : (_data$address38 = data.address) === null || _data$address38 === void 0 ? void 0 : _data$address38.addressLine1,
644
645
  addressLine2: data === null || data === void 0 ? void 0 : (_data$address39 = data.address) === null || _data$address39 === void 0 ? void 0 : _data$address39.addressLine2,
645
646
  landmark: data === null || data === void 0 ? void 0 : (_data$address40 = data.address) === null || _data$address40 === void 0 ? void 0 : _data$address40.landmark,
646
- city: (data === null || data === void 0 ? void 0 : (_data$address41 = data.address) === null || _data$address41 === void 0 ? void 0 : (_data$address41$city = _data$address41.city) === null || _data$address41$city === void 0 ? void 0 : _data$address41$city.name) || (data === null || data === void 0 ? void 0 : (_data$address42 = data.address) === null || _data$address42 === void 0 ? void 0 : _data$address42.city) || "",
647
+ city: (data === null || data === void 0 ? void 0 : (_data$address41 = data.address) === null || _data$address41 === void 0 ? void 0 : (_data$address41$city = _data$address41.city) === null || _data$address41$city === void 0 ? void 0 : _data$address41$city.name) || (data === null || data === void 0 ? void 0 : (_data$address42 = data.address) === null || _data$address42 === void 0 ? void 0 : _data$address42.city) || "DJB",
647
648
  cityCode: (data === null || data === void 0 ? void 0 : (_data$address43 = data.address) === null || _data$address43 === void 0 ? void 0 : _data$address43.cityCode) || (data === null || data === void 0 ? void 0 : (_data$address44 = data.address) === null || _data$address44 === void 0 ? void 0 : (_data$address44$city = _data$address44.city) === null || _data$address44$city === void 0 ? void 0 : _data$address44$city.code) || "DJB",
648
649
  locality: (data === null || data === void 0 ? void 0 : (_data$address45 = data.address) === null || _data$address45 === void 0 ? void 0 : (_data$address45$local = _data$address45.locality) === null || _data$address45$local === void 0 ? void 0 : _data$address45$local.label) || (data === null || data === void 0 ? void 0 : (_data$address46 = data.address) === null || _data$address46 === void 0 ? void 0 : (_data$address46$local = _data$address46.locality) === null || _data$address46$local === void 0 ? void 0 : _data$address46$local.name) || (data === null || data === void 0 ? void 0 : (_data$address47 = data.address) === null || _data$address47 === void 0 ? void 0 : _data$address47.locality) || "",
649
650
  localityCode: (data === null || data === void 0 ? void 0 : (_data$address48 = data.address) === null || _data$address48 === void 0 ? void 0 : (_data$address48$local = _data$address48.locality) === null || _data$address48$local === void 0 ? void 0 : _data$address48$local.code) || (data === null || data === void 0 ? void 0 : (_data$address49 = data.address) === null || _data$address49 === void 0 ? void 0 : _data$address49.localityCode) || "",
@@ -683,7 +684,7 @@ const fixedPointPayload = data => {
683
684
  addressLine1: (data === null || data === void 0 ? void 0 : (_data$address62 = data.address) === null || _data$address62 === void 0 ? void 0 : _data$address62.addressLine1) || "",
684
685
  addressLine2: (data === null || data === void 0 ? void 0 : (_data$address63 = data.address) === null || _data$address63 === void 0 ? void 0 : _data$address63.addressLine2) || "",
685
686
  landmark: (data === null || data === void 0 ? void 0 : (_data$address64 = data.address) === null || _data$address64 === void 0 ? void 0 : _data$address64.landmark) || "",
686
- city: (data === null || data === void 0 ? void 0 : (_data$address65 = data.address) === null || _data$address65 === void 0 ? void 0 : (_data$address65$city = _data$address65.city) === null || _data$address65$city === void 0 ? void 0 : _data$address65$city.name) || (data === null || data === void 0 ? void 0 : (_data$address66 = data.address) === null || _data$address66 === void 0 ? void 0 : _data$address66.city) || "",
687
+ city: (data === null || data === void 0 ? void 0 : (_data$address65 = data.address) === null || _data$address65 === void 0 ? void 0 : (_data$address65$city = _data$address65.city) === null || _data$address65$city === void 0 ? void 0 : _data$address65$city.name) || (data === null || data === void 0 ? void 0 : (_data$address66 = data.address) === null || _data$address66 === void 0 ? void 0 : _data$address66.city) || "DJB",
687
688
  cityCode: (data === null || data === void 0 ? void 0 : (_data$address67 = data.address) === null || _data$address67 === void 0 ? void 0 : _data$address67.cityCode) || (data === null || data === void 0 ? void 0 : (_data$address68 = data.address) === null || _data$address68 === void 0 ? void 0 : (_data$address68$city = _data$address68.city) === null || _data$address68$city === void 0 ? void 0 : _data$address68$city.code) || "DJB",
688
689
  locality: (data === null || data === void 0 ? void 0 : (_data$address69 = data.address) === null || _data$address69 === void 0 ? void 0 : (_data$address69$local = _data$address69.locality) === null || _data$address69$local === void 0 ? void 0 : _data$address69$local.label) || (data === null || data === void 0 ? void 0 : (_data$address70 = data.address) === null || _data$address70 === void 0 ? void 0 : (_data$address70$local = _data$address70.locality) === null || _data$address70$local === void 0 ? void 0 : _data$address70$local.name) || (data === null || data === void 0 ? void 0 : (_data$address71 = data.address) === null || _data$address71 === void 0 ? void 0 : _data$address71.locality) || "",
689
690
  localityCode: (data === null || data === void 0 ? void 0 : (_data$address72 = data.address) === null || _data$address72 === void 0 ? void 0 : (_data$address72$local = _data$address72.locality) === null || _data$address72$local === void 0 ? void 0 : _data$address72$local.code) || (data === null || data === void 0 ? void 0 : (_data$address73 = data.address) === null || _data$address73 === void 0 ? void 0 : _data$address73.localityCode) || "",
@@ -741,7 +742,7 @@ const emergencyWaterTankerPayload = data => {
741
742
  addressType: (data === null || data === void 0 ? void 0 : (_data$address84 = data.address) === null || _data$address84 === void 0 ? void 0 : (_data$address84$addre = _data$address84.addressType) === null || _data$address84$addre === void 0 ? void 0 : _data$address84$addre.code) || (data === null || data === void 0 ? void 0 : (_data$address85 = data.address) === null || _data$address85 === void 0 ? void 0 : _data$address85.addressType) || "CORRESPONDENCE",
742
743
  pincode: (data === null || data === void 0 ? void 0 : (_data$address86 = data.address) === null || _data$address86 === void 0 ? void 0 : _data$address86.pincode) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.pincode) || "",
743
744
  city: (data === null || data === void 0 ? void 0 : (_data$address87 = data.address) === null || _data$address87 === void 0 ? void 0 : (_data$address87$city = _data$address87.city) === null || _data$address87$city === void 0 ? void 0 : (_data$address87$city$ = _data$address87$city.city) === null || _data$address87$city$ === void 0 ? void 0 : _data$address87$city$.name) || (data === null || data === void 0 ? void 0 : (_data$address88 = data.address) === null || _data$address88 === void 0 ? void 0 : (_data$address88$city = _data$address88.city) === null || _data$address88$city === void 0 ? void 0 : _data$address88$city.name) || (data === null || data === void 0 ? void 0 : (_data$address89 = data.address) === null || _data$address89 === void 0 ? void 0 : _data$address89.city) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.city) || "",
744
- cityCode: (data === null || data === void 0 ? void 0 : (_data$address90 = data.address) === null || _data$address90 === void 0 ? void 0 : (_data$address90$city = _data$address90.city) === null || _data$address90$city === void 0 ? void 0 : (_data$address90$city$ = _data$address90$city.city) === null || _data$address90$city$ === void 0 ? void 0 : _data$address90$city$.code) || (data === null || data === void 0 ? void 0 : (_data$address91 = data.address) === null || _data$address91 === void 0 ? void 0 : _data$address91.cityCode) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.cityCode) || "DL",
745
+ cityCode: (data === null || data === void 0 ? void 0 : (_data$address90 = data.address) === null || _data$address90 === void 0 ? void 0 : (_data$address90$city = _data$address90.city) === null || _data$address90$city === void 0 ? void 0 : (_data$address90$city$ = _data$address90$city.city) === null || _data$address90$city$ === void 0 ? void 0 : _data$address90$city$.code) || (data === null || data === void 0 ? void 0 : (_data$address91 = data.address) === null || _data$address91 === void 0 ? void 0 : _data$address91.cityCode) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.cityCode) || "DJB",
745
746
  addressLine1: (data === null || data === void 0 ? void 0 : (_data$address92 = data.address) === null || _data$address92 === void 0 ? void 0 : _data$address92.addressLine1) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.addressLine1) || "",
746
747
  addressLine2: (data === null || data === void 0 ? void 0 : (_data$address93 = data.address) === null || _data$address93 === void 0 ? void 0 : _data$address93.addressLine2) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.addressLine2) || "",
747
748
  locality: (data === null || data === void 0 ? void 0 : (_data$address94 = data.address) === null || _data$address94 === void 0 ? void 0 : (_data$address94$local = _data$address94.locality) === null || _data$address94$local === void 0 ? void 0 : _data$address94$local.i18nKey) || (data === null || data === void 0 ? void 0 : (_data$address95 = data.address) === null || _data$address95 === void 0 ? void 0 : (_data$address95$local = _data$address95.locality) === null || _data$address95$local === void 0 ? void 0 : _data$address95$local.name) || (data === null || data === void 0 ? void 0 : (_data$address96 = data.address) === null || _data$address96 === void 0 ? void 0 : _data$address96.locality) || (addressFromFP === null || addressFromFP === void 0 ? void 0 : addressFromFP.locality) || "",
@@ -4386,9 +4387,26 @@ const FixedPointScheduleManagement = ({
4386
4387
  totalCount: item.totalCount,
4387
4388
  fillingPointId: item.fillingPointId
4388
4389
  })), []);
4390
+ const dayOrder = React.useMemo(() => ({
4391
+ MONDAY: 1,
4392
+ TUESDAY: 2,
4393
+ WEDNESDAY: 3,
4394
+ THURSDAY: 4,
4395
+ FRIDAY: 5,
4396
+ SATURDAY: 6,
4397
+ SUNDAY: 7
4398
+ }), []);
4389
4399
  const data = React.useMemo(() => {
4390
- return mapScheduleRows((scheduleData === null || scheduleData === void 0 ? void 0 : scheduleData.fixedPointTimeTableDetails) || []);
4391
- }, [scheduleData, mapScheduleRows]);
4400
+ const rows = mapScheduleRows((scheduleData === null || scheduleData === void 0 ? void 0 : scheduleData.fixedPointTimeTableDetails) || []);
4401
+ return rows.sort((a, b) => {
4402
+ var _a$day, _b$day;
4403
+ const fixedPointCompare = (a.fixedPoint || "").localeCompare(b.fixedPoint || "");
4404
+ if (fixedPointCompare !== 0) return fixedPointCompare;
4405
+ const dayA = dayOrder[(_a$day = a.day) === null || _a$day === void 0 ? void 0 : _a$day.toUpperCase()] || 8;
4406
+ const dayB = dayOrder[(_b$day = b.day) === null || _b$day === void 0 ? void 0 : _b$day.toUpperCase()] || 8;
4407
+ return dayA - dayB;
4408
+ });
4409
+ }, [scheduleData, mapScheduleRows, dayOrder]);
4392
4410
  const fetchNextPage = () => {
4393
4411
  const newOffset = pageOffset + pageSize;
4394
4412
  setPageOffset(newOffset);
@@ -4768,7 +4786,7 @@ const FixedPointScheduleManagement = ({
4768
4786
  onPrevPage: fetchPrevPage,
4769
4787
  pageSizeLimit: pageSize,
4770
4788
  onSort: props.onSort,
4771
- disableSort: props.disableSort,
4789
+ disableSort: true,
4772
4790
  sortParams: props.sortParams,
4773
4791
  totalRecords: (scheduleData === null || scheduleData === void 0 ? void 0 : scheduleData.count) || (scheduleData === null || scheduleData === void 0 ? void 0 : scheduleData.totalCount) || (data === null || data === void 0 ? void 0 : (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.totalCount),
4774
4792
  showCSVExport: true,
@@ -4968,13 +4986,46 @@ L.Icon.Default.mergeOptions({
4968
4986
  iconUrl: "https://unpkg.com/leaflet@1.9.4/dist/images/marker-icon.png",
4969
4987
  shadowUrl: "https://unpkg.com/leaflet@1.9.4/dist/images/marker-shadow.png"
4970
4988
  });
4971
- const onlineIcon = new L.Icon({
4972
- iconUrl: "https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-green.png",
4973
- shadowUrl: "https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png",
4974
- iconSize: [25, 41],
4975
- iconAnchor: [12, 41],
4976
- popupAnchor: [1, -34],
4977
- shadowSize: [41, 41]
4989
+ const onlineIcon = L.divIcon({
4990
+ className: "blinking-green-dot",
4991
+ html: `
4992
+ <div style="position: relative;">
4993
+ <div style="
4994
+ width: 14px;
4995
+ height: 14px;
4996
+ background: #4caf50;
4997
+ border: 2px solid white;
4998
+ border-radius: 50%;
4999
+ box-shadow: 0 0 10px rgba(76, 175, 80, 0.8);
5000
+ z-index: 2;
5001
+ position: relative;
5002
+ animation: blink 1s infinite ease-in-out;
5003
+ "></div>
5004
+ <div style="
5005
+ position: absolute;
5006
+ top: -6px;
5007
+ left: -6px;
5008
+ width: 26px;
5009
+ height: 26px;
5010
+ background: rgba(76, 175, 80, 0.3);
5011
+ border-radius: 50%;
5012
+ animation: pulse 2s infinite;
5013
+ z-index: 1;
5014
+ "></div>
5015
+ <style>
5016
+ @keyframes blink {
5017
+ 0%, 100% { opacity: 1; }
5018
+ 50% { opacity: 0.6; }
5019
+ }
5020
+ @keyframes pulse {
5021
+ 0% { transform: scale(0.6); opacity: 1; }
5022
+ 100% { transform: scale(2); opacity: 0; }
5023
+ }
5024
+ </style>
5025
+ </div>
5026
+ `,
5027
+ iconSize: [14, 14],
5028
+ iconAnchor: [7, 7]
4978
5029
  });
4979
5030
  const offlineIcon = new L.Icon({
4980
5031
  iconUrl: "https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-red.png",
@@ -5127,68 +5178,13 @@ const RouteLayer = ({
5127
5178
  }, t("ERROR_LOADING_ROUTE"), error);
5128
5179
  }
5129
5180
  if (!routeData) return null;
5130
- const renderRouteSegments = () => {
5131
- if (!routeData.legs) return null;
5132
- const segments = [];
5133
- routeData.legs.forEach((leg, legIndex) => {
5134
- leg.steps.forEach((step, stepIndex) => {
5135
- const stepCoordinates = step.geometry.coordinates.map(coord => [coord[1], coord[0]]);
5136
- let segmentColor = _color;
5137
- if (step.maneuver.type === "turn") {
5138
- segmentColor = "#ff9800";
5139
- } else if (step.maneuver.type === "straight") {
5140
- segmentColor = "#4caf50";
5141
- } else if (step.maneuver.type === "arrive") {
5142
- segmentColor = "#f44336";
5143
- }
5144
- segments.push(/*#__PURE__*/React.createElement(React.Fragment, {
5145
- key: `${legIndex}-${stepIndex}`
5146
- }, /*#__PURE__*/React.createElement(Polyline, {
5147
- positions: stepCoordinates,
5148
- color: segmentColor,
5149
- weight: _weight + 2,
5150
- opacity: 0.3,
5151
- lineCap: "round"
5152
- }), /*#__PURE__*/React.createElement(Polyline, {
5153
- positions: stepCoordinates,
5154
- color: segmentColor,
5155
- weight: _weight,
5156
- opacity: 0.9,
5157
- lineCap: "round",
5158
- eventHandlers: {
5159
- mouseover: () => setSelectedStep(step),
5160
- mouseout: () => setSelectedStep(null),
5161
- click: () => setShowSteps(!showSteps)
5162
- }
5163
- }), stepCoordinates.map((coord, idx) => {
5164
- if (idx % 5 === 0 && idx < stepCoordinates.length - 1) {
5165
- const nextCoord = stepCoordinates[idx + 1];
5166
- const angle = Math.atan2(nextCoord[0] - coord[0], nextCoord[1] - coord[1]) * 180 / Math.PI;
5167
- return /*#__PURE__*/React.createElement(Marker, {
5168
- key: `dot-${legIndex}-${stepIndex}-${idx}`,
5169
- position: coord,
5170
- icon: L.divIcon({
5171
- className: "direction-dot",
5172
- html: `<div style="
5173
- width: 6px;
5174
- height: 6px;
5175
- background: white;
5176
- border: 2px solid ${segmentColor};
5177
- border-radius: 50%;
5178
- transform: rotate(${angle}deg);
5179
- "></div>`,
5180
- iconSize: [10, 10],
5181
- iconAnchor: [5, 5]
5182
- })
5183
- });
5184
- }
5185
- return null;
5186
- })));
5187
- });
5188
- });
5189
- return segments;
5190
- };
5191
- return /*#__PURE__*/React.createElement(React.Fragment, null, renderRouteSegments(), (selectedStep || showSteps) && /*#__PURE__*/React.createElement("div", {
5181
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Polyline, {
5182
+ positions: routeData.coordinates,
5183
+ color: "#1F5FA8",
5184
+ weight: 5,
5185
+ opacity: 0.8,
5186
+ lineJoin: "round"
5187
+ }), (selectedStep || showSteps) && /*#__PURE__*/React.createElement("div", {
5192
5188
  style: {
5193
5189
  position: "absolute",
5194
5190
  bottom: "80px",
@@ -5285,43 +5281,7 @@ const RouteLayer = ({
5285
5281
  style: {
5286
5282
  color: "#666"
5287
5283
  }
5288
- }, (step.distance / 1000).toFixed(2), " km \xB7 ", Math.round(step.duration / 60), " min"))))))), routeData.distance > 1000 && routeData.coordinates && /*#__PURE__*/React.createElement(RouteMarkers, {
5289
- coordinates: routeData.coordinates,
5290
- totalDistance: routeData.distance
5291
- }));
5292
- };
5293
- const RouteMarkers = ({
5294
- coordinates,
5295
- totalDistance
5296
- }) => {
5297
- const markers = [];
5298
- const interval = 1000;
5299
- for (let i = interval; i < totalDistance; i += interval) {
5300
- const fraction = i / totalDistance;
5301
- const index = Math.floor(coordinates.length * fraction);
5302
- if (index < coordinates.length) {
5303
- markers.push(/*#__PURE__*/React.createElement(Marker, {
5304
- key: `dist-${i}`,
5305
- position: coordinates[index],
5306
- icon: L.divIcon({
5307
- className: "distance-marker",
5308
- html: `<div style="
5309
- background: white;
5310
- border: 2px solid #1F5FA8;
5311
- border-radius: 12px;
5312
- padding: 2px 6px;
5313
- font-size: 10px;
5314
- font-weight: bold;
5315
- color: #1F5FA8;
5316
- white-space: nowrap;
5317
- ">${(i / 1000).toFixed(0)} km</div>`,
5318
- iconSize: [40, 20],
5319
- iconAnchor: [20, 10]
5320
- })
5321
- }));
5322
- }
5323
- }
5324
- return /*#__PURE__*/React.createElement(React.Fragment, null, markers);
5284
+ }, (step.distance / 1000).toFixed(2), " km \xB7 ", Math.round(step.duration / 60), " min"))))))));
5325
5285
  };
5326
5286
  const StatusBadge = ({
5327
5287
  isOnline
@@ -5424,8 +5384,8 @@ const DriverCard = ({
5424
5384
  return /*#__PURE__*/React.createElement("div", {
5425
5385
  onClick: onClick,
5426
5386
  style: {
5427
- padding: "16px",
5428
- borderRadius: "12px",
5387
+ padding: "10px",
5388
+ borderRadius: "8px",
5429
5389
  background: isSelected ? "#f0f4ff" : "white",
5430
5390
  border: `2px solid ${isSelected ? "#1F5FA8" : "#f0f0f0"}`,
5431
5391
  cursor: "pointer",
@@ -5436,7 +5396,7 @@ const DriverCard = ({
5436
5396
  style: {
5437
5397
  display: "flex",
5438
5398
  gap: "12px",
5439
- marginBottom: "12px"
5399
+ marginBottom: "8px"
5440
5400
  }
5441
5401
  }, /*#__PURE__*/React.createElement("div", {
5442
5402
  style: {
@@ -5483,7 +5443,7 @@ const DriverCard = ({
5483
5443
  style: {
5484
5444
  display: "grid",
5485
5445
  gridTemplateColumns: "1fr 1fr",
5486
- gap: "12px"
5446
+ gap: "8px"
5487
5447
  }
5488
5448
  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
5489
5449
  style: {
@@ -5711,9 +5671,9 @@ function LiveTrackingSystem() {
5711
5671
  display: "flex",
5712
5672
  justifyContent: "space-between",
5713
5673
  alignItems: "center",
5714
- marginBottom: "16px",
5674
+ marginBottom: "12px",
5715
5675
  background: "white",
5716
- padding: "16px 24px",
5676
+ padding: "12px 24px",
5717
5677
  borderRadius: "12px",
5718
5678
  boxShadow: "0 2px 8px rgba(0,0,0,0.05)",
5719
5679
  border: "2px solid #1F5FA844"
@@ -5743,7 +5703,6 @@ function LiveTrackingSystem() {
5743
5703
  gap: "6px",
5744
5704
  background: "#e8f5e9",
5745
5705
  color: "#2e7d32",
5746
- padding: "4px 12px",
5747
5706
  borderRadius: "20px",
5748
5707
  fontSize: "12px",
5749
5708
  fontWeight: "700",
@@ -5851,7 +5810,7 @@ function LiveTrackingSystem() {
5851
5810
  }
5852
5811
  }, showSidebar && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
5853
5812
  style: {
5854
- padding: "20px",
5813
+ padding: "12px",
5855
5814
  background: "white",
5856
5815
  borderRadius: "12px",
5857
5816
  display: "flex",
@@ -5865,7 +5824,7 @@ function LiveTrackingSystem() {
5865
5824
  display: "flex",
5866
5825
  justifyContent: "space-between",
5867
5826
  alignItems: "center",
5868
- marginBottom: "16px"
5827
+ marginBottom: "8px"
5869
5828
  }
5870
5829
  }, /*#__PURE__*/React.createElement("h3", {
5871
5830
  style: {
@@ -5894,8 +5853,8 @@ function LiveTrackingSystem() {
5894
5853
  style: {
5895
5854
  display: "flex",
5896
5855
  flexDirection: "column",
5897
- gap: "16px",
5898
- marginBottom: "20px"
5856
+ gap: "8px",
5857
+ marginBottom: "12px"
5899
5858
  }
5900
5859
  }, /*#__PURE__*/React.createElement("div", {
5901
5860
  style: {
@@ -5987,7 +5946,7 @@ function LiveTrackingSystem() {
5987
5946
  display: "flex",
5988
5947
  justifyContent: "space-between",
5989
5948
  alignItems: "center",
5990
- marginBottom: "12px"
5949
+ marginBottom: "8px"
5991
5950
  }
5992
5951
  }, /*#__PURE__*/React.createElement("div", {
5993
5952
  style: {
@@ -6075,7 +6034,7 @@ function LiveTrackingSystem() {
6075
6034
  },
6076
6035
  zoomControl: false
6077
6036
  }, /*#__PURE__*/React.createElement(TileLayer, {
6078
- url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
6037
+ url: "https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png",
6079
6038
  attribution: "\xA9 <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a>"
6080
6039
  }), /*#__PURE__*/React.createElement(MapController, {
6081
6040
  selectedDriver: selectedDriver,
@@ -6445,7 +6404,7 @@ const AddFixFillAddress = ({
6445
6404
  isEdit,
6446
6405
  userDetails
6447
6406
  }) => {
6448
- var _location$state, _formData$address, _formData$address2, _formData$address3, _formData$address4, _formData$address5, _formData$address6, _formData$address7, _formData$address8, _formData$address9, _formData$address0, _formData$address1, _formData$address10, _formData$address11, _formData$address12, _userDetails$addresse;
6407
+ var _location$state, _formData$address, _formData$address2, _formData$address3, _formData$address4, _formData$address5, _formData$address6, _formData$address7, _formData$address8, _formData$address9, _formData$address0, _formData$address1, _formData$address10, _formData$address11, _formData$address12;
6449
6408
  const {
6450
6409
  data: allCities
6451
6410
  } = Digit.Hooks.useTenants();
@@ -6694,32 +6653,7 @@ const AddFixFillAddress = ({
6694
6653
  defaultOpen: true
6695
6654
  }, /*#__PURE__*/React.createElement("div", {
6696
6655
  className: "formcomposer-section-grid"
6697
- }, (userDetails === null || userDetails === void 0 ? void 0 : (_userDetails$addresse = userDetails.addresses) === null || _userDetails$addresse === void 0 ? void 0 : _userDetails$addresse.length) > 0 && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("COMMON_ADDRESS_TYPE")), /*#__PURE__*/React.createElement(Dropdown, {
6698
- selected: selectedAddress,
6699
- select: setSelectedAddress,
6700
- option: userDetails.addresses || [],
6701
- optionKey: "address",
6702
- t: t,
6703
- style: {
6704
- width: "100%"
6705
- }
6706
- })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("COMMON_ADDRESS_TYPE")), /*#__PURE__*/React.createElement(Dropdown, {
6707
- selected: addressType,
6708
- select: setAddressType,
6709
- option: availableAddressTypeOptions || [],
6710
- optionKey: "i18nKey",
6711
- t: t,
6712
- style: {
6713
- width: "100%"
6714
- }
6715
- })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(CardLabel, null, t("CITY")), /*#__PURE__*/React.createElement(Dropdown, {
6716
- selected: city,
6717
- select: setCity,
6718
- option: allCities || [],
6719
- optionKey: "i18nKey",
6720
- t: t,
6721
- disable: true
6722
- })), /*#__PURE__*/React.createElement("div", {
6656
+ }, /*#__PURE__*/React.createElement("div", {
6723
6657
  style: {
6724
6658
  position: "relative"
6725
6659
  }
@@ -7475,11 +7409,13 @@ const PointAddressMap = ({
7475
7409
  t
7476
7410
  }) => {
7477
7411
  var _selectedFillingPoint;
7412
+ const history = useHistory();
7478
7413
  const [selectedFillingPoint, setSelectedFillingPoint] = useState(null);
7479
7414
  const [selectedFixedPoint, setSelectedFixedPoint] = useState(null);
7480
7415
  const [hoveredFixedPointId, setHoveredFixedPointId] = useState(null);
7481
7416
  const [mapCenter, setMapCenter] = useState(null);
7482
7417
  const [mapZoom, setMapZoom] = useState(11);
7418
+ const markerRefs = useRef({});
7483
7419
  const defaultCenter = [28.6139, 77.209];
7484
7420
  const getFpId = fp => {
7485
7421
  var _fp$fillingpointmetad;
@@ -7514,17 +7450,21 @@ const PointAddressMap = ({
7514
7450
  })) || [];
7515
7451
  }, [_fillingPoints, selectedFillingPoint]);
7516
7452
  const displayFixedPoints = useMemo(() => {
7517
- if (selectedFixedPoint) {
7518
- return [selectedFixedPoint].filter(fx => {
7519
- var _fx$address, _fx$address2;
7520
- return ((_fx$address = fx.address) === null || _fx$address === void 0 ? void 0 : _fx$address.latitude) && ((_fx$address2 = fx.address) === null || _fx$address2 === void 0 ? void 0 : _fx$address2.longitude);
7521
- });
7522
- }
7523
7453
  return relatedFixedPoints.filter(fx => {
7524
- var _fx$address3, _fx$address4;
7525
- return ((_fx$address3 = fx.address) === null || _fx$address3 === void 0 ? void 0 : _fx$address3.latitude) && ((_fx$address4 = fx.address) === null || _fx$address4 === void 0 ? void 0 : _fx$address4.longitude);
7454
+ var _fx$address, _fx$address2;
7455
+ return ((_fx$address = fx.address) === null || _fx$address === void 0 ? void 0 : _fx$address.latitude) && ((_fx$address2 = fx.address) === null || _fx$address2 === void 0 ? void 0 : _fx$address2.longitude);
7526
7456
  });
7527
- }, [relatedFixedPoints, selectedFixedPoint]);
7457
+ }, [relatedFixedPoints]);
7458
+ useEffect(() => {
7459
+ if (selectedFixedPoint) {
7460
+ var _selectedFixedPoint$a;
7461
+ const fxId = selectedFixedPoint.id || ((_selectedFixedPoint$a = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a === void 0 ? void 0 : _selectedFixedPoint$a.applicantId);
7462
+ const marker = markerRefs.current[fxId];
7463
+ if (marker) {
7464
+ marker.openPopup();
7465
+ }
7466
+ }
7467
+ }, [selectedFixedPoint]);
7528
7468
  const bounds = useMemo(() => {
7529
7469
  const allPoints = [...displayFillingPoints.map(p => [parseFloat(p.address.latitude), parseFloat(p.address.longitude)]), ...displayFixedPoints.map(p => [parseFloat(p.address.latitude), parseFloat(p.address.longitude)])];
7530
7470
  if (allPoints.length === 0) return null;
@@ -7536,11 +7476,24 @@ const PointAddressMap = ({
7536
7476
  setMapCenter(null);
7537
7477
  };
7538
7478
  const handleFixedPointSelect = val => {
7539
- var _val$address, _val$address2;
7540
- setSelectedFixedPoint(val);
7541
- if (val !== null && val !== void 0 && (_val$address = val.address) !== null && _val$address !== void 0 && _val$address.latitude && val !== null && val !== void 0 && (_val$address2 = val.address) !== null && _val$address2 !== void 0 && _val$address2.longitude) {
7542
- setMapCenter([parseFloat(val.address.latitude), parseFloat(val.address.longitude)]);
7543
- setMapZoom(16);
7479
+ var _selectedFixedPoint$a2, _selectedFixedPoint$a3, _val$applicantDetail, _val$applicantDetail2;
7480
+ const currentId = (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a2 = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a2 === void 0 ? void 0 : _selectedFixedPoint$a2.fixedPointId) || (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : selectedFixedPoint.id) || (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a3 = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a3 === void 0 ? void 0 : _selectedFixedPoint$a3.applicantId);
7481
+ const incomingId = (val === null || val === void 0 ? void 0 : (_val$applicantDetail = val.applicantDetail) === null || _val$applicantDetail === void 0 ? void 0 : _val$applicantDetail.fixedPointId) || (val === null || val === void 0 ? void 0 : val.id) || (val === null || val === void 0 ? void 0 : (_val$applicantDetail2 = val.applicantDetail) === null || _val$applicantDetail2 === void 0 ? void 0 : _val$applicantDetail2.applicantId);
7482
+ if (selectedFixedPoint && currentId === incomingId) {
7483
+ var _val$applicantDetail3;
7484
+ setSelectedFixedPoint(null);
7485
+ const markerId = val.id || ((_val$applicantDetail3 = val.applicantDetail) === null || _val$applicantDetail3 === void 0 ? void 0 : _val$applicantDetail3.applicantId);
7486
+ const marker = markerRefs.current[markerId];
7487
+ if (marker) {
7488
+ marker.closePopup();
7489
+ }
7490
+ } else {
7491
+ var _val$address, _val$address2;
7492
+ setSelectedFixedPoint(val);
7493
+ if (val !== null && val !== void 0 && (_val$address = val.address) !== null && _val$address !== void 0 && _val$address.latitude && val !== null && val !== void 0 && (_val$address2 = val.address) !== null && _val$address2 !== void 0 && _val$address2.longitude) {
7494
+ setMapCenter([parseFloat(val.address.latitude), parseFloat(val.address.longitude)]);
7495
+ setMapZoom(16);
7496
+ }
7544
7497
  }
7545
7498
  };
7546
7499
  const fixedPointOptions = useMemo(() => {
@@ -7581,7 +7534,8 @@ const PointAddressMap = ({
7581
7534
  flexDirection: "column",
7582
7535
  gap: "20px",
7583
7536
  background: "#f9f9f9",
7584
- zIndex: 10
7537
+ zIndex: 10,
7538
+ overflowY: "auto"
7585
7539
  }
7586
7540
  }, /*#__PURE__*/React.createElement("h3", {
7587
7541
  style: {
@@ -7632,15 +7586,18 @@ const PointAddressMap = ({
7632
7586
  gap: "8px"
7633
7587
  }
7634
7588
  }, relatedFixedPoints.length > 0 ? relatedFixedPoints.map((fx, idx) => {
7635
- var _fx$applicantDetail2, _selectedFixedPoint$a, _fx$applicantDetail3, _fx$applicantDetail5, _fx$applicantDetail6, _fx$applicantDetail7, _fx$applicantDetail8;
7636
- const isSelected = (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : selectedFixedPoint.id) === fx.id || ((_fx$applicantDetail2 = fx.applicantDetail) === null || _fx$applicantDetail2 === void 0 ? void 0 : _fx$applicantDetail2.applicantId) && (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a === void 0 ? void 0 : _selectedFixedPoint$a.applicantId) === ((_fx$applicantDetail3 = fx.applicantDetail) === null || _fx$applicantDetail3 === void 0 ? void 0 : _fx$applicantDetail3.applicantId);
7589
+ var _fx$applicantDetail2, _fx$applicantDetail3, _selectedFixedPoint$a4, _selectedFixedPoint$a5, _fx$applicantDetail4, _fx$applicantDetail5, _fx$applicantDetail6, _fx$applicantDetail7, _fx$address5, _fx$applicantDetail8, _fx$applicantDetail9, _fx$address6, _fx$address7, _fx$address8, _fx$address9;
7590
+ const currentFxId = (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail2 = fx.applicantDetail) === null || _fx$applicantDetail2 === void 0 ? void 0 : _fx$applicantDetail2.fixedPointId) || (fx === null || fx === void 0 ? void 0 : fx.id) || (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail3 = fx.applicantDetail) === null || _fx$applicantDetail3 === void 0 ? void 0 : _fx$applicantDetail3.applicantId) || idx;
7591
+ const selectedFxId = (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a4 = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a4 === void 0 ? void 0 : _selectedFixedPoint$a4.fixedPointId) || (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : selectedFixedPoint.id) || (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a5 = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a5 === void 0 ? void 0 : _selectedFixedPoint$a5.applicantId);
7592
+ const isSelected = selectedFixedPoint && currentFxId === selectedFxId;
7593
+ const hoverOrMarkerId = fx.id || ((_fx$applicantDetail4 = fx.applicantDetail) === null || _fx$applicantDetail4 === void 0 ? void 0 : _fx$applicantDetail4.applicantId) || idx;
7637
7594
  return /*#__PURE__*/React.createElement("div", {
7638
7595
  key: idx,
7639
7596
  onClick: () => handleFixedPointSelect(fx),
7640
7597
  onMouseEnter: () => {
7641
- var _fx$applicantDetail4, _fx$address5, _fx$address6;
7642
- setHoveredFixedPointId(fx.id || ((_fx$applicantDetail4 = fx.applicantDetail) === null || _fx$applicantDetail4 === void 0 ? void 0 : _fx$applicantDetail4.applicantId) || idx);
7643
- if (fx !== null && fx !== void 0 && (_fx$address5 = fx.address) !== null && _fx$address5 !== void 0 && _fx$address5.latitude && fx !== null && fx !== void 0 && (_fx$address6 = fx.address) !== null && _fx$address6 !== void 0 && _fx$address6.longitude) {
7598
+ var _fx$address3, _fx$address4;
7599
+ setHoveredFixedPointId(hoverOrMarkerId);
7600
+ if (fx !== null && fx !== void 0 && (_fx$address3 = fx.address) !== null && _fx$address3 !== void 0 && _fx$address3.latitude && fx !== null && fx !== void 0 && (_fx$address4 = fx.address) !== null && _fx$address4 !== void 0 && _fx$address4.longitude) {
7644
7601
  setMapCenter([parseFloat(fx.address.latitude), parseFloat(fx.address.longitude)]);
7645
7602
  setMapZoom(16);
7646
7603
  }
@@ -7657,10 +7614,10 @@ const PointAddressMap = ({
7657
7614
  color: isSelected ? "#1D4E7F" : "#333",
7658
7615
  fontWeight: isSelected ? "600" : "400",
7659
7616
  display: "flex",
7660
- alignItems: "center",
7617
+ alignItems: "flex-start",
7661
7618
  gap: "10px",
7662
- boxShadow: isSelected ? "0 2px 8px rgba(29, 78, 127, 0.15)" : hoveredFixedPointId === (fx.id || ((_fx$applicantDetail5 = fx.applicantDetail) === null || _fx$applicantDetail5 === void 0 ? void 0 : _fx$applicantDetail5.applicantId) || idx) ? "0 4px 12px rgba(0,0,0,0.1)" : "none",
7663
- transform: hoveredFixedPointId === (fx.id || ((_fx$applicantDetail6 = fx.applicantDetail) === null || _fx$applicantDetail6 === void 0 ? void 0 : _fx$applicantDetail6.applicantId) || idx) ? "translateX(4px)" : "none"
7619
+ boxShadow: isSelected ? "0 2px 8px rgba(29, 78, 127, 0.15)" : hoveredFixedPointId === hoverOrMarkerId ? "0 4px 12px rgba(0,0,0,0.1)" : "none",
7620
+ transform: hoveredFixedPointId === hoverOrMarkerId ? "translateX(4px)" : "none"
7664
7621
  }
7665
7622
  }, /*#__PURE__*/React.createElement("div", {
7666
7623
  style: {
@@ -7668,20 +7625,77 @@ const PointAddressMap = ({
7668
7625
  height: "10px",
7669
7626
  borderRadius: "50%",
7670
7627
  background: "#417505",
7671
- boxShadow: "0 0 4px rgba(65, 117, 5, 0.4)"
7628
+ boxShadow: "0 0 4px rgba(65, 117, 5, 0.4)",
7629
+ marginTop: "5px",
7630
+ flexShrink: 0
7672
7631
  }
7673
7632
  }), /*#__PURE__*/React.createElement("div", {
7633
+ style: {
7634
+ display: "flex",
7635
+ flexDirection: "column",
7636
+ flex: 1
7637
+ }
7638
+ }, /*#__PURE__*/React.createElement("div", {
7639
+ style: {
7640
+ display: "flex",
7641
+ justifyContent: "space-between",
7642
+ alignItems: "flex-start"
7643
+ }
7644
+ }, /*#__PURE__*/React.createElement("div", {
7674
7645
  style: {
7675
7646
  display: "flex",
7676
7647
  flexDirection: "column"
7677
7648
  }
7678
- }, /*#__PURE__*/React.createElement("span", null, (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail7 = fx.applicantDetail) === null || _fx$applicantDetail7 === void 0 ? void 0 : _fx$applicantDetail7.name) || (fx === null || fx === void 0 ? void 0 : fx.name) || "NA"), /*#__PURE__*/React.createElement("span", {
7649
+ }, /*#__PURE__*/React.createElement("span", {
7650
+ style: {
7651
+ fontWeight: "700"
7652
+ }
7653
+ }, (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail5 = fx.applicantDetail) === null || _fx$applicantDetail5 === void 0 ? void 0 : _fx$applicantDetail5.fixedPointId) || "NA"), /*#__PURE__*/React.createElement("span", {
7679
7654
  style: {
7680
7655
  fontSize: "11px",
7681
7656
  color: "#888",
7682
7657
  fontWeight: "400"
7683
7658
  }
7684
- }, fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail8 = fx.applicantDetail) === null || _fx$applicantDetail8 === void 0 ? void 0 : _fx$applicantDetail8.fixedPointId)));
7659
+ }, (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail6 = fx.applicantDetail) === null || _fx$applicantDetail6 === void 0 ? void 0 : _fx$applicantDetail6.name) || (fx === null || fx === void 0 ? void 0 : fx.name) || "NA")), /*#__PURE__*/React.createElement("div", {
7660
+ style: {
7661
+ color: "#1D4E7F",
7662
+ fontSize: "10px",
7663
+ paddingTop: "4px"
7664
+ }
7665
+ }, isSelected ? "▲" : "▼")), isSelected && /*#__PURE__*/React.createElement("div", {
7666
+ style: {
7667
+ marginTop: "8px",
7668
+ paddingTop: "8px",
7669
+ borderTop: "1px solid #eee",
7670
+ fontSize: "12px",
7671
+ color: "#555",
7672
+ display: "flex",
7673
+ flexDirection: "column",
7674
+ gap: "4px"
7675
+ }
7676
+ }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("strong", null, t("WT_MOBILE_NUMBER"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail7 = fx.applicantDetail) === null || _fx$applicantDetail7 === void 0 ? void 0 : _fx$applicantDetail7.mobileNumber) || "NA"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("strong", null, t("WT_LOCALITY"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$address5 = fx.address) === null || _fx$address5 === void 0 ? void 0 : _fx$address5.locality) || "NA"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("strong", null, "Email:"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail8 = fx.applicantDetail) === null || _fx$applicantDetail8 === void 0 ? void 0 : _fx$applicantDetail8.emailId) || "NA"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("strong", null, "Alt Mobile:"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail9 = fx.applicantDetail) === null || _fx$applicantDetail9 === void 0 ? void 0 : _fx$applicantDetail9.alternateNumber) || "NA"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("strong", null, "Address:"), " ", [fx === null || fx === void 0 ? void 0 : (_fx$address6 = fx.address) === null || _fx$address6 === void 0 ? void 0 : _fx$address6.houseNo, fx === null || fx === void 0 ? void 0 : (_fx$address7 = fx.address) === null || _fx$address7 === void 0 ? void 0 : _fx$address7.streetName, fx === null || fx === void 0 ? void 0 : (_fx$address8 = fx.address) === null || _fx$address8 === void 0 ? void 0 : _fx$address8.city, fx === null || fx === void 0 ? void 0 : (_fx$address9 = fx.address) === null || _fx$address9 === void 0 ? void 0 : _fx$address9.pincode].filter(Boolean).join(", ") || "NA"), /*#__PURE__*/React.createElement("button", {
7677
+ onClick: e => {
7678
+ var _fx$applicantDetail0;
7679
+ e.stopPropagation();
7680
+ const idToEdit = (fx === null || fx === void 0 ? void 0 : fx.id) || (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail0 = fx.applicantDetail) === null || _fx$applicantDetail0 === void 0 ? void 0 : _fx$applicantDetail0.applicantId);
7681
+ history.push(`/digit-ui/employee/wt/add-fix-point-address?id=${idToEdit}`);
7682
+ },
7683
+ style: {
7684
+ marginTop: "8px",
7685
+ padding: "6px 12px",
7686
+ background: "#F47738",
7687
+ color: "#fff",
7688
+ border: "none",
7689
+ borderRadius: "4px",
7690
+ cursor: "pointer",
7691
+ fontSize: "12px",
7692
+ fontWeight: "bold",
7693
+ alignSelf: "flex-start",
7694
+ transition: "background 0.2s"
7695
+ },
7696
+ onMouseEnter: e => e.target.style.background = "#D6662E",
7697
+ onMouseLeave: e => e.target.style.background = "#F47738"
7698
+ }, "Edit Fixed Point"))));
7685
7699
  }) : /*#__PURE__*/React.createElement("div", {
7686
7700
  style: {
7687
7701
  textAlign: "center",
@@ -7782,7 +7796,7 @@ const PointAddressMap = ({
7782
7796
  center: mapCenter,
7783
7797
  zoom: mapZoom
7784
7798
  }), displayFillingPoints.map((fp, index) => {
7785
- var _fp$address5;
7799
+ var _fp$address5, _fp$address6, _fp$address7;
7786
7800
  return /*#__PURE__*/React.createElement(React.Fragment, {
7787
7801
  key: `fp-group-${fp.id || index}`
7788
7802
  }, /*#__PURE__*/React.createElement(Circle, {
@@ -7829,6 +7843,31 @@ const PointAddressMap = ({
7829
7843
  fontSize: "12px"
7830
7844
  }
7831
7845
  }, /*#__PURE__*/React.createElement("strong", null, t("WT_LOCALITY"), ":"), " ", ((_fp$address5 = fp.address) === null || _fp$address5 === void 0 ? void 0 : _fp$address5.locality) || "NA"), /*#__PURE__*/React.createElement("p", {
7846
+ style: {
7847
+ margin: 0,
7848
+ fontSize: "12px"
7849
+ }
7850
+ }, /*#__PURE__*/React.createElement("strong", null, t("WT_AE_NAME"), ":"), " ", (fp === null || fp === void 0 ? void 0 : fp.aeName) || "NA", " (", (fp === null || fp === void 0 ? void 0 : fp.aeMobile) || "NA", ")"), /*#__PURE__*/React.createElement("p", {
7851
+ style: {
7852
+ margin: 0,
7853
+ fontSize: "12px"
7854
+ }
7855
+ }, /*#__PURE__*/React.createElement("strong", null, t("WT_JE_NAME"), ":"), " ", (fp === null || fp === void 0 ? void 0 : fp.jeName) || "NA", " (", (fp === null || fp === void 0 ? void 0 : fp.jeMobile) || "NA", ")"), /*#__PURE__*/React.createElement("p", {
7856
+ style: {
7857
+ margin: 0,
7858
+ fontSize: "12px"
7859
+ }
7860
+ }, /*#__PURE__*/React.createElement("strong", null, t("WT_EE_NAME"), ":"), " ", (fp === null || fp === void 0 ? void 0 : fp.eeName) || "NA", " (", (fp === null || fp === void 0 ? void 0 : fp.eeMobile) || "NA", ")"), /*#__PURE__*/React.createElement("p", {
7861
+ style: {
7862
+ margin: 0,
7863
+ fontSize: "12px"
7864
+ }
7865
+ }, /*#__PURE__*/React.createElement("strong", null, "Latitude:"), " ", ((_fp$address6 = fp.address) === null || _fp$address6 === void 0 ? void 0 : _fp$address6.latitude) || "NA"), /*#__PURE__*/React.createElement("p", {
7866
+ style: {
7867
+ margin: 0,
7868
+ fontSize: "12px"
7869
+ }
7870
+ }, /*#__PURE__*/React.createElement("strong", null, "Longitude:"), " ", ((_fp$address7 = fp.address) === null || _fp$address7 === void 0 ? void 0 : _fp$address7.longitude) || "NA"), /*#__PURE__*/React.createElement("p", {
7832
7871
  style: {
7833
7872
  margin: 0,
7834
7873
  fontSize: "12px",
@@ -7836,14 +7875,18 @@ const PointAddressMap = ({
7836
7875
  }
7837
7876
  }, /*#__PURE__*/React.createElement("strong", null, "Coverage:"), " 5 KM Radius"))))));
7838
7877
  }), displayFixedPoints.map((fx, index) => {
7839
- var _fx$applicantDetail9, _fx$applicantDetail0, _fx$applicantDetail1, _fx$applicantDetail10, _fx$address7;
7840
- const fxId = fx.id || ((_fx$applicantDetail9 = fx.applicantDetail) === null || _fx$applicantDetail9 === void 0 ? void 0 : _fx$applicantDetail9.applicantId) || index;
7878
+ var _fx$applicantDetail1, _fx$applicantDetail10, _fx$applicantDetail11, _selectedFixedPoint$a6, _selectedFixedPoint$a7, _fx$applicantDetail12, _fx$applicantDetail13, _fx$applicantDetail14, _fx$address0, _fx$applicantDetail15, _fx$applicantDetail16, _fx$address1, _fx$address10, _fx$address11, _fx$address12, _fx$address13, _fx$address14;
7879
+ const fxId = fx.id || ((_fx$applicantDetail1 = fx.applicantDetail) === null || _fx$applicantDetail1 === void 0 ? void 0 : _fx$applicantDetail1.applicantId) || index;
7841
7880
  const isHovered = hoveredFixedPointId === fxId;
7881
+ const currentFxId = (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail10 = fx.applicantDetail) === null || _fx$applicantDetail10 === void 0 ? void 0 : _fx$applicantDetail10.fixedPointId) || (fx === null || fx === void 0 ? void 0 : fx.id) || (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail11 = fx.applicantDetail) === null || _fx$applicantDetail11 === void 0 ? void 0 : _fx$applicantDetail11.applicantId) || index;
7882
+ const selectedFxId = (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a6 = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a6 === void 0 ? void 0 : _selectedFixedPoint$a6.fixedPointId) || (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : selectedFixedPoint.id) || (selectedFixedPoint === null || selectedFixedPoint === void 0 ? void 0 : (_selectedFixedPoint$a7 = selectedFixedPoint.applicantDetail) === null || _selectedFixedPoint$a7 === void 0 ? void 0 : _selectedFixedPoint$a7.applicantId);
7883
+ const isSelected = selectedFixedPoint && currentFxId === selectedFxId;
7842
7884
  return /*#__PURE__*/React.createElement(Marker, {
7843
7885
  key: `fx-${fxId}`,
7844
7886
  position: [parseFloat(fx.address.latitude), parseFloat(fx.address.longitude)],
7845
- icon: isHovered ? enlargedFixedPointIcon : fixedPointIcon,
7846
- zIndexOffset: isHovered ? 1000 : 0
7887
+ icon: isHovered || isSelected ? enlargedFixedPointIcon : fixedPointIcon,
7888
+ zIndexOffset: isHovered || isSelected ? 1000 : 0,
7889
+ ref: r => markerRefs.current[fxId] = r
7847
7890
  }, /*#__PURE__*/React.createElement(Popup, null, /*#__PURE__*/React.createElement("div", {
7848
7891
  style: {
7849
7892
  padding: "8px",
@@ -7857,7 +7900,7 @@ const PointAddressMap = ({
7857
7900
  borderBottom: "1px solid #eee",
7858
7901
  paddingBottom: "4px"
7859
7902
  }
7860
- }, (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail0 = fx.applicantDetail) === null || _fx$applicantDetail0 === void 0 ? void 0 : _fx$applicantDetail0.name) || (fx === null || fx === void 0 ? void 0 : fx.name) || "NA", " (Fixed Point)"), /*#__PURE__*/React.createElement("div", {
7903
+ }, (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail12 = fx.applicantDetail) === null || _fx$applicantDetail12 === void 0 ? void 0 : _fx$applicantDetail12.name) || (fx === null || fx === void 0 ? void 0 : fx.name) || "NA", " (Fixed Point)"), /*#__PURE__*/React.createElement("div", {
7861
7904
  style: {
7862
7905
  display: "flex",
7863
7906
  flexDirection: "column",
@@ -7868,17 +7911,42 @@ const PointAddressMap = ({
7868
7911
  margin: 0,
7869
7912
  fontSize: "12px"
7870
7913
  }
7871
- }, /*#__PURE__*/React.createElement("strong", null, t("WT_FIXED_POINT_CODE"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail1 = fx.applicantDetail) === null || _fx$applicantDetail1 === void 0 ? void 0 : _fx$applicantDetail1.fixedPointId) || "NA"), /*#__PURE__*/React.createElement("p", {
7914
+ }, /*#__PURE__*/React.createElement("strong", null, t("WT_FIXED_POINT_CODE"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail13 = fx.applicantDetail) === null || _fx$applicantDetail13 === void 0 ? void 0 : _fx$applicantDetail13.fixedPointId) || "NA"), /*#__PURE__*/React.createElement("p", {
7915
+ style: {
7916
+ margin: 0,
7917
+ fontSize: "12px"
7918
+ }
7919
+ }, /*#__PURE__*/React.createElement("strong", null, t("WT_MOBILE_NUMBER"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail14 = fx.applicantDetail) === null || _fx$applicantDetail14 === void 0 ? void 0 : _fx$applicantDetail14.mobileNumber) || "NA"), /*#__PURE__*/React.createElement("p", {
7920
+ style: {
7921
+ margin: 0,
7922
+ fontSize: "12px"
7923
+ }
7924
+ }, /*#__PURE__*/React.createElement("strong", null, t("WT_LOCALITY"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$address0 = fx.address) === null || _fx$address0 === void 0 ? void 0 : _fx$address0.locality) || "NA"), /*#__PURE__*/React.createElement("p", {
7925
+ style: {
7926
+ margin: 0,
7927
+ fontSize: "12px"
7928
+ }
7929
+ }, /*#__PURE__*/React.createElement("strong", null, "Email:"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail15 = fx.applicantDetail) === null || _fx$applicantDetail15 === void 0 ? void 0 : _fx$applicantDetail15.emailId) || "NA"), /*#__PURE__*/React.createElement("p", {
7930
+ style: {
7931
+ margin: 0,
7932
+ fontSize: "12px"
7933
+ }
7934
+ }, /*#__PURE__*/React.createElement("strong", null, "Alt Mobile:"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail16 = fx.applicantDetail) === null || _fx$applicantDetail16 === void 0 ? void 0 : _fx$applicantDetail16.alternateNumber) || "NA"), /*#__PURE__*/React.createElement("p", {
7935
+ style: {
7936
+ margin: 0,
7937
+ fontSize: "12px"
7938
+ }
7939
+ }, /*#__PURE__*/React.createElement("strong", null, "Address:"), " ", [fx === null || fx === void 0 ? void 0 : (_fx$address1 = fx.address) === null || _fx$address1 === void 0 ? void 0 : _fx$address1.houseNo, fx === null || fx === void 0 ? void 0 : (_fx$address10 = fx.address) === null || _fx$address10 === void 0 ? void 0 : _fx$address10.streetName, fx === null || fx === void 0 ? void 0 : (_fx$address11 = fx.address) === null || _fx$address11 === void 0 ? void 0 : _fx$address11.city, fx === null || fx === void 0 ? void 0 : (_fx$address12 = fx.address) === null || _fx$address12 === void 0 ? void 0 : _fx$address12.pincode].filter(Boolean).join(", ") || "NA"), /*#__PURE__*/React.createElement("p", {
7872
7940
  style: {
7873
7941
  margin: 0,
7874
7942
  fontSize: "12px"
7875
7943
  }
7876
- }, /*#__PURE__*/React.createElement("strong", null, t("WT_MOBILE_NUMBER"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail10 = fx.applicantDetail) === null || _fx$applicantDetail10 === void 0 ? void 0 : _fx$applicantDetail10.mobileNumber) || "NA"), /*#__PURE__*/React.createElement("p", {
7944
+ }, /*#__PURE__*/React.createElement("strong", null, "Latitude:"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$address13 = fx.address) === null || _fx$address13 === void 0 ? void 0 : _fx$address13.latitude) || "NA"), /*#__PURE__*/React.createElement("p", {
7877
7945
  style: {
7878
7946
  margin: 0,
7879
7947
  fontSize: "12px"
7880
7948
  }
7881
- }, /*#__PURE__*/React.createElement("strong", null, t("WT_LOCALITY"), ":"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$address7 = fx.address) === null || _fx$address7 === void 0 ? void 0 : _fx$address7.locality) || "NA")))));
7949
+ }, /*#__PURE__*/React.createElement("strong", null, "Longitude:"), " ", (fx === null || fx === void 0 ? void 0 : (_fx$address14 = fx.address) === null || _fx$address14 === void 0 ? void 0 : _fx$address14.longitude) || "NA")))));
7882
7950
  }))));
7883
7951
  };
7884
7952
 
@@ -28156,6 +28224,7 @@ const WTEmergencyFixedPointCreate = () => {
28156
28224
  }
28157
28225
  });
28158
28226
  }
28227
+ if (data !== null && data !== void 0 && data.silent) return;
28159
28228
  goNext(skipStep, index, isAddMultiple, key);
28160
28229
  }
28161
28230
  const onSuccess = () => {