@djb25/digit-ui-module-wt 1.0.46 → 1.0.48

package/dist/index.modern.js

@@ -5,7 +5,7 @@ import { useLocation, useRouteMatch, useHistory, Switch, Route, Redirect, Link,
 import { useQueryClient } from 'react-query';
 import { useForm, Controller } from 'react-hook-form';
 import { io } from 'socket.io-client';
-import { MapContainer, TileLayer, Marker, Popup, useMap, Polyline } from 'react-leaflet';
+import { MapContainer, TileLayer, Marker, Popup, useMap, Polyline, Circle } from 'react-leaflet';
 import L from 'leaflet';
 import 'leaflet/dist/leaflet.css';
 
@@ -465,7 +465,7 @@ const WTCreate = () => {
 };
 
 const checkForNotNull = (value = "") => {
-  return value && value != null && value != undefined && value != "" ? true : false;
+  return value && value != null && value !== undefined && value !== "" ? true : false;
 };
 const checkForNA = (value = "") => {
   return checkForNotNull(value) ? value : "NA";
@@ -699,12 +699,14 @@ const fixedPointPayload = data => {
   };
 };
 const emergencyWaterTankerPayload = data => {
-  var _data$owner29, _data$owner30, _ref2, _data$requestDetails12, _data$requestDetails13, _data$requestDetails14, _data$requestDetails15, _data$requestDetails16, _data$requestDetails17, _data$requestDetails18, _data$requestDetails19, _data$requestDetails20, _data$requestDetails21, _data$requestDetails22, _data$requestDetails23, _data$requestDetails24, _data$requestDetails25, _data$requestDetails26, _data$requestDetails27, _data$requestDetails28, _data$requestDetails29, _data$address82, _data$dispatchDetails, _data$dispatchDetails2, _data$owner31, _data$owner31$vendor, _data$dispatchDetails3, _data$dispatchDetails4, _data$owner32, _data$owner32$vehicle, _data$dispatchDetails5, _data$dispatchDetails6, _data$owner33, _data$owner33$driver, _data$dispatchDetails7, _data$dispatchDetails8, _data$owner34, _data$owner34$filling, _data$dispatchDetails9, _data$dispatchDetails0, _data$owner35, _data$owner35$vehicle, _data$dispatchDetails1, _data$dispatchDetails10, _data$owner36, _data$owner36$vehicle, _data$owner37, _data$owner38, _data$owner39, _data$owner40, _data$owner41, _data$owner42, _data$address83, _data$address84, _data$address84$addre, _data$address85, _data$address86, _data$address87, _data$address87$city, _data$address87$city$, _data$address88, _data$address88$city, _data$address89, _data$address90, _data$address90$city, _data$address90$city$, _data$address91, _data$address92, _data$address93, _data$address94, _data$address94$local, _data$address95, _data$address95$local, _data$address96, _data$address97, _data$address97$local, _data$address98, _data$address99, _data$address100, _data$address101, _data$address102, _data$address103, _data$address104, _data$address105, _data$address106, _data$address107, _data$address108, _data$requestDetails30;
+  var _data$owner29, _data$waterTankerBook, _data$waterTankerBook2, _data$owner30, _ref2, _data$requestDetails12, _data$requestDetails13, _data$requestDetails14, _data$requestDetails15, _data$requestDetails16, _data$requestDetails17, _data$requestDetails18, _data$requestDetails19, _data$requestDetails20, _data$requestDetails21, _data$requestDetails22, _data$requestDetails23, _data$requestDetails24, _data$requestDetails25, _data$requestDetails26, _data$requestDetails27, _data$requestDetails28, _data$requestDetails29, _data$address82, _data$dispatchDetails, _data$dispatchDetails2, _data$owner31, _data$owner31$vendor, _data$dispatchDetails3, _data$dispatchDetails4, _data$owner32, _data$owner32$vehicle, _data$dispatchDetails5, _data$dispatchDetails6, _data$owner33, _data$owner33$driver, _data$dispatchDetails7, _data$dispatchDetails8, _data$owner34, _data$owner34$filling, _data$dispatchDetails9, _data$dispatchDetails0, _data$owner35, _data$owner35$vehicle, _data$dispatchDetails1, _data$dispatchDetails10, _data$owner36, _data$owner36$vehicle, _data$owner37, _data$owner38, _data$owner39, _data$owner40, _data$owner41, _data$owner42, _data$address83, _data$address84, _data$address84$addre, _data$address85, _data$address86, _data$address87, _data$address87$city, _data$address87$city$, _data$address88, _data$address88$city, _data$address89, _data$address90, _data$address90$city, _data$address90$city$, _data$address91, _data$address92, _data$address93, _data$address94, _data$address94$local, _data$address95, _data$address95$local, _data$address96, _data$address97, _data$address97$local, _data$address98, _data$address99, _data$address100, _data$address101, _data$address102, _data$address103, _data$address104, _data$address105, _data$address106, _data$address107, _data$address108, _data$requestDetails30;
   const fixedPoint = data === null || data === void 0 ? void 0 : (_data$owner29 = data.owner) === null || _data$owner29 === void 0 ? void 0 : _data$owner29.fixedPoint;
   const applicantDetailFromFP = (fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.applicantDetail) || {};
   const addressFromFP = (fixedPoint === null || fixedPoint === void 0 ? void 0 : fixedPoint.address) || {};
   const formdata = {
     waterTankerBookingDetail: {
+      id: (data === null || data === void 0 ? void 0 : data.id) || (data === null || data === void 0 ? void 0 : (_data$waterTankerBook = data.waterTankerBookingDetail) === null || _data$waterTankerBook === void 0 ? void 0 : _data$waterTankerBook.id) || "",
+      bookingNo: (data === null || data === void 0 ? void 0 : data.bookingNo) || (data === null || data === void 0 ? void 0 : (_data$waterTankerBook2 = data.waterTankerBookingDetail) === null || _data$waterTankerBook2 === void 0 ? void 0 : _data$waterTankerBook2.bookingNo) || null,
       applicantId: (applicantDetailFromFP === null || applicantDetailFromFP === void 0 ? void 0 : applicantDetailFromFP.applicantId) || (data === null || data === void 0 ? void 0 : (_data$owner30 = data.owner) === null || _data$owner30 === void 0 ? void 0 : _data$owner30.applicantId) || "",
       tenantId: data === null || data === void 0 ? void 0 : data.tenantId,
       tankerType: (_ref2 = (data === null || data === void 0 ? void 0 : (_data$requestDetails12 = data.requestDetails) === null || _data$requestDetails12 === void 0 ? void 0 : (_data$requestDetails13 = _data$requestDetails12.tankerType) === null || _data$requestDetails13 === void 0 ? void 0 : _data$requestDetails13.code) || (data === null || data === void 0 ? void 0 : (_data$requestDetails14 = data.requestDetails) === null || _data$requestDetails14 === void 0 ? void 0 : _data$requestDetails14.tankerType) || "") === null || _ref2 === void 0 ? void 0 : _ref2.toUpperCase(),
@@ -816,6 +818,10 @@ const WTSearchApplication = ({
   moduleCode,
   isFixedPoint
 }) => {
+  console.log("WTSearchApplication Rendered", {
+    moduleCode,
+    isFixedPoint
+  });
   const isMobile = window.Digit.Utils.browser.isMobile();
   const user = Digit.UserService.getUser().info;
   const [showImageModal, setShowImageModal] = useState(false);
@@ -1092,7 +1098,13 @@ const WTSearchApplication = ({
       }),
       type: "number",
       maxlength: 10
-    }), /*#__PURE__*/React.createElement(CardLabelError, null, formState === null || formState === void 0 ? void 0 : (_formState$errors = formState.errors) === null || _formState$errors === void 0 ? void 0 : (_formState$errors$mob = _formState$errors["mobileNumber"]) === null || _formState$errors$mob === void 0 ? void 0 : _formState$errors$mob.message))), activeTab === t("WT_ADVANCED_SEARCH") && /*#__PURE__*/React.createElement("div", {
+    }), /*#__PURE__*/React.createElement(CardLabelError, null, formState === null || formState === void 0 ? void 0 : (_formState$errors = formState.errors) === null || _formState$errors === void 0 ? void 0 : (_formState$errors$mob = _formState$errors["mobileNumber"]) === null || _formState$errors$mob === void 0 ? void 0 : _formState$errors$mob.message)), /*#__PURE__*/React.createElement("div", {
+      className: "search-field-wrapper"
+    }, /*#__PURE__*/React.createElement("label", null, t("WT_BOOKING_NO")), /*#__PURE__*/React.createElement(TextInput, {
+      name: "bookingNo",
+      inputRef: register({}),
+      id: "wt-booking-no-input"
+    }))), activeTab === t("WT_ADVANCED_SEARCH") && /*#__PURE__*/React.createElement("div", {
       className: "formcomposer-section-grid"
     }, /*#__PURE__*/React.createElement("div", {
       className: "search-field-wrapper"
@@ -1401,11 +1413,8 @@ const App = () => {
     t
   } = useTranslation();
   const location = useLocation();
-  const history = useHistory();
   const {
-    path,
-    url,
-    ...match
+    path
   } = useRouteMatch();
   const WTCreate = (_Digit = Digit) === null || _Digit === void 0 ? void 0 : (_Digit$ComponentRegis = _Digit.ComponentRegistryService) === null || _Digit$ComponentRegis === void 0 ? void 0 : _Digit$ComponentRegis.getComponent("WTCreate");
   const WTApplicationDetails = (_Digit2 = Digit) === null || _Digit2 === void 0 ? void 0 : (_Digit2$ComponentRegi = _Digit2.ComponentRegistryService) === null || _Digit2$ComponentRegi === void 0 ? void 0 : _Digit2$ComponentRegi.getComponent("WTApplicationDetails");
@@ -1416,8 +1425,6 @@ const App = () => {
   const ApplicationDetails = (_Digit6 = Digit) === null || _Digit6 === void 0 ? void 0 : (_Digit6$ComponentRegi = _Digit6.ComponentRegistryService) === null || _Digit6$ComponentRegi === void 0 ? void 0 : _Digit6$ComponentRegi.getComponent("ApplicationDetails");
   const getDynamicBreadcrumbs = () => {
     const pathname = location.pathname;
-    if (pathname.includes("/mt/")) ;
-    if (pathname.includes("/tp/")) ;
     let crumbs = [{
       icon: HomeIcon,
       path: "/digit-ui/citizen"
@@ -1486,7 +1493,7 @@ const App = () => {
     onLeftClick: () => window.history.back(),
     breadcrumbs: getDynamicBreadcrumbs()
   }), /*#__PURE__*/React.createElement("div", {
-    className: "employee-form-content"
+    className: "employee-form-content abcd"
   }, /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/inbox`,
     component: () => /*#__PURE__*/React.createElement(Inbox, {
@@ -1535,7 +1542,7 @@ const App = () => {
       parentRoute: path
     })
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
-    path: `${path}/wt-Vendor`,
+    path: `${path}/vendor`,
     component: () => Digit.UserService.hasAccess(["WT_VENDOR"]) ? /*#__PURE__*/React.createElement("div", {
       style: {
         display: "flex",
@@ -3709,25 +3716,25 @@ const AddTripModal = ({
   onSubmit,
   initialValues
 }) => {
-  var _formData$day;
   const now = new Date();
   const currentTime = `${String(now.getHours()).padStart(2, "0")}:${String(now.getMinutes()).padStart(2, "0")}`;
   const defaultValues = initialValues ? {
     ...initialValues,
-    arrivalTimeFpl: initialValues.arrivalTimeFpl || currentTime,
-    departureTimeFpl: initialValues.departureTimeFpl || currentTime,
-    arrivalFixedPoint: initialValues.arrivalFixedPoint || currentTime,
-    departureFixedPoint: initialValues.departureFixedPoint || currentTime,
-    returnFpl: initialValues.returnFpl || currentTime,
-    frequencyNo: initialValues.frequencyNo,
-    vehicleId: initialValues.vehicleId,
-    fixedPointCode: initialValues.fixedPointCode,
+    arrivalTimeFpl: initialValues.arrivalTimeFpl || initialValues.arrival_time_to_fpl || currentTime,
+    departureTimeFpl: initialValues.departureTimeFpl || initialValues.departure_time_from_fpl || currentTime,
+    arrivalFixedPoint: initialValues.arrivalFixedPoint || initialValues.arrival_time_delivery_point || currentTime,
+    departureFixedPoint: initialValues.departureFixedPoint || initialValues.departure_time_delivery_point || currentTime,
+    returnFpl: initialValues.returnFpl || initialValues.time_of_arriving_back_fpl_after_delivery || currentTime,
+    frequencyNo: initialValues.frequencyNo || initialValues.trip_no || 1,
+    vehicleId: initialValues.vehicleId || initialValues.vehicle_id || "",
+    fixedPointCode: initialValues.fixedPointCode || initialValues.fixed_point_code || "",
+    fillingPointCode: initialValues.fillingPointCode || initialValues.fillingPointId || "",
     day: initialValues.day || [],
-    volume: initialValues.volume || "",
-    active: initialValues.active || null,
+    volume: initialValues.volume || initialValues.volume_water_tobe_delivery || "",
     remarks: initialValues.remarks || ""
   } : {
     fixedPointCode: "",
+    fillingPointCode: "",
     day: [],
     arrivalTimeFpl: currentTime,
     departureTimeFpl: currentTime,
@@ -3735,7 +3742,6 @@ const AddTripModal = ({
     departureFixedPoint: currentTime,
     returnFpl: currentTime,
     volume: "",
-    active: null,
     remarks: "",
     frequencyNo: 1
   };
@@ -3746,33 +3752,69 @@ const AddTripModal = ({
     formState: {
       errors
     },
-    watch,
-    setValue
+    watch
   } = useForm({
     defaultValues
   });
   const tenantId = Digit.ULBService.getCurrentTenantId();
+  const [searchQuery, setSearchQuery] = useState("");
+  const [debouncedSearchQuery, setDebouncedSearchQuery] = useState("");
+  useEffect(() => {
+    const handler = setTimeout(() => {
+      setDebouncedSearchQuery(searchQuery);
+    }, 500);
+    return () => clearTimeout(handler);
+  }, [searchQuery]);
+  const handleSearch = useCallback(val => {
+    setSearchQuery(val);
+  }, []);
   const {
     isLoading: isFixedPointLoading,
     data: fixedPointsData
   } = Digit.Hooks.wt.useFixedPointSearchAPI({
+    tenantId,
+    filters: {
+      limit: 1000,
+      ...(debouncedSearchQuery ? {
+        name: debouncedSearchQuery
+      } : {})
+    }
+  }, {
+    keepPreviousData: true
+  });
+  const {
+    isLoading: isFillingPointLoading,
+    data: fillingPointsData
+  } = Digit.Hooks.wt.useFillPointSearch({
     tenantId,
     filters: {
       limit: 1000
     }
   });
   const fixedPoints = (fixedPointsData === null || fixedPointsData === void 0 ? void 0 : fixedPointsData.waterTankerBookingDetail) || [];
+  const fillingPoints = (fillingPointsData === null || fillingPointsData === void 0 ? void 0 : fillingPointsData.fillingPoints) || [];
   const fixedPointOptions = fixedPoints.map(fp => {
-    var _fp$applicantDetail, _fp$applicantDetail2, _fp$address, _fp$applicantDetail3, _fp$applicantDetail4, _fp$address2, _fp$applicantDetail5, _fp$address3, _fp$address4, _fp$address5, _fp$address6;
+    var _fp$applicantDetail, _fp$applicantDetail2, _fp$applicantDetail3, _fp$address, _fp$applicantDetail4, _fp$address2, _fp$applicantDetail5, _fp$applicantDetail6, _fp$applicantDetail7, _fp$address3, _fp$address4, _fp$address5, _fp$address6;
+    const name = (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail = fp.applicantDetail) === null || _fp$applicantDetail === void 0 ? void 0 : _fp$applicantDetail.name) || "NA";
+    const fixedPointId = (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail2 = fp.applicantDetail) === null || _fp$applicantDetail2 === void 0 ? void 0 : _fp$applicantDetail2.fixedPointId) || (fp === null || fp === void 0 ? void 0 : fp.fixedPointCode) || "";
+    const displayName = fixedPointId ? `${name} (${fixedPointId})` : name;
     return {
-      name: (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail = fp.applicantDetail) === null || _fp$applicantDetail === void 0 ? void 0 : _fp$applicantDetail.name) || "NA",
-      mobileNumber: (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail2 = fp.applicantDetail) === null || _fp$applicantDetail2 === void 0 ? void 0 : _fp$applicantDetail2.mobileNumber) || "NA",
+      name: displayName,
+      mobileNumber: (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail3 = fp.applicantDetail) === null || _fp$applicantDetail3 === void 0 ? void 0 : _fp$applicantDetail3.mobileNumber) || "NA",
       locality: (fp === null || fp === void 0 ? void 0 : (_fp$address = fp.address) === null || _fp$address === void 0 ? void 0 : _fp$address.locality) || "NA",
-      displayLabel: `${(fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail3 = fp.applicantDetail) === null || _fp$applicantDetail3 === void 0 ? void 0 : _fp$applicantDetail3.name) || "NA"} | ${(fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail4 = fp.applicantDetail) === null || _fp$applicantDetail4 === void 0 ? void 0 : _fp$applicantDetail4.mobileNumber) || "NA"} | ${(fp === null || fp === void 0 ? void 0 : (_fp$address2 = fp.address) === null || _fp$address2 === void 0 ? void 0 : _fp$address2.locality) || "NA"}`,
-      value: fp.fixedPointCode || (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail5 = fp.applicantDetail) === null || _fp$applicantDetail5 === void 0 ? void 0 : _fp$applicantDetail5.fixedPointId) || fp.bookingId,
+      displayLabel: `${displayName} | ${(fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail4 = fp.applicantDetail) === null || _fp$applicantDetail4 === void 0 ? void 0 : _fp$applicantDetail4.mobileNumber) || "NA"} | ${(fp === null || fp === void 0 ? void 0 : (_fp$address2 = fp.address) === null || _fp$address2 === void 0 ? void 0 : _fp$address2.locality) || "NA"}`,
+      value: (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail5 = fp.applicantDetail) === null || _fp$applicantDetail5 === void 0 ? void 0 : _fp$applicantDetail5.applicantId) || (fp === null || fp === void 0 ? void 0 : fp.id) || (fp === null || fp === void 0 ? void 0 : fp.bookingId),
+      code: fp.fixedPointCode || (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail6 = fp.applicantDetail) === null || _fp$applicantDetail6 === void 0 ? void 0 : _fp$applicantDetail6.fixedPointId) || "",
+      id: (fp === null || fp === void 0 ? void 0 : (_fp$applicantDetail7 = fp.applicantDetail) === null || _fp$applicantDetail7 === void 0 ? void 0 : _fp$applicantDetail7.fixedPointId) || "",
       fullAddress: [(fp === null || fp === void 0 ? void 0 : (_fp$address3 = fp.address) === null || _fp$address3 === void 0 ? void 0 : _fp$address3.houseNo) && `${t("WT_HOUSE_NO")} = ${fp.address.houseNo}`, (fp === null || fp === void 0 ? void 0 : (_fp$address4 = fp.address) === null || _fp$address4 === void 0 ? void 0 : _fp$address4.streetName) && `${t("WT_STREET_NAME")} = ${fp.address.streetName}`, (fp === null || fp === void 0 ? void 0 : (_fp$address5 = fp.address) === null || _fp$address5 === void 0 ? void 0 : _fp$address5.landmark) && `${t("WT_LANDMARK")} = ${fp.address.landmark}`, (fp === null || fp === void 0 ? void 0 : (_fp$address6 = fp.address) === null || _fp$address6 === void 0 ? void 0 : _fp$address6.locality) && `${t("WT_LOCALITY")} = ${fp.address.locality}`].filter(Boolean).join(", ")
     };
   });
+  const fillingPointOptions = fillingPoints.map(fp => ({
+    displayLabel: (fp === null || fp === void 0 ? void 0 : fp.fillingPointName) || "NA",
+    value: fp === null || fp === void 0 ? void 0 : fp.id,
+    eeName: (fp === null || fp === void 0 ? void 0 : fp.eeName) || "NA",
+    aeName: (fp === null || fp === void 0 ? void 0 : fp.aeName) || "NA"
+  }));
   const selectedFixedPointCode = watch("fixedPointCode");
   const selectedFixedPoint = fixedPointOptions.find(opt => opt.value === selectedFixedPointCode);
   const dayOptions = [{
@@ -3797,20 +3839,15 @@ const AddTripModal = ({
     label: t("SUNDAY"),
     value: "SUNDAY"
   }];
-  const activeOptions = [{
-    label: t("YES"),
-    value: "Yes"
-  }, {
-    label: t("NO"),
-    value: "No"
-  }];
   const formData = watch();
-  const isFormValid = (formData === null || formData === void 0 ? void 0 : formData.fixedPointCode) && (formData === null || formData === void 0 ? void 0 : formData.day) && Array.isArray(formData === null || formData === void 0 ? void 0 : formData.day) && (formData === null || formData === void 0 ? void 0 : (_formData$day = formData.day) === null || _formData$day === void 0 ? void 0 : _formData$day.length) > 0 && (formData === null || formData === void 0 ? void 0 : formData.arrivalTimeFpl) && (formData === null || formData === void 0 ? void 0 : formData.departureTimeFpl) && (formData === null || formData === void 0 ? void 0 : formData.arrivalFixedPoint) && (formData === null || formData === void 0 ? void 0 : formData.departureFixedPoint) && (formData === null || formData === void 0 ? void 0 : formData.returnFpl) && (formData === null || formData === void 0 ? void 0 : formData.volume) !== "" && (formData === null || formData === void 0 ? void 0 : formData.volume) !== undefined && (formData === null || formData === void 0 ? void 0 : formData.volume) !== null && (formData === null || formData === void 0 ? void 0 : formData.active);
   const onFormSubmit = data => {
-    onSubmit({
-      ...initialValues,
-      ...data
-    });
+    const selectedFixedPoint = fixedPointOptions.find(opt => opt.value === data.fixedPointCode);
+    const enrichedData = {
+      ...data,
+      fixedPointId: selectedFixedPoint ? selectedFixedPoint.id : (initialValues === null || initialValues === void 0 ? void 0 : initialValues.fixedPointId) || "",
+      fixedPointCode: selectedFixedPoint ? selectedFixedPoint.code : (initialValues === null || initialValues === void 0 ? void 0 : initialValues.fixedPointCode) || ""
+    };
+    onSubmit(enrichedData);
   };
   return /*#__PURE__*/React.createElement("div", {
     className: "custom-modal-overlay",
@@ -3827,61 +3864,117 @@ const AddTripModal = ({
       zIndex: 200000
     }
   }, /*#__PURE__*/React.createElement("style", null, `
+
           .custom-modal-content {
+
             background-color: #fff;
+
             border-radius: 8px;
+
             width: 70%;
+
             max-width: 800px;
+
             max-height: 90vh;
+
             display: flex;
+
             flex-direction: column;
+
             box-shadow: 0 4px 12px rgba(0,0,0,0.15);
+
             position: relative;
+
           }
+
           .add-trip-form {
+
             display: grid;
+
             grid-template-columns: repeat(2, 1fr);
+
             gap: 20px;
+
           }
+
           @media (max-width: 768px) {
+
             .custom-modal-content {
+
               width: 90%;
+
               max-height: 85vh;
+
             }
+
             .add-trip-form {
+
               grid-template-columns: 1fr;
+
               gap: 15px;
+
             }
+
           }
+
           @media (max-width: 480px) {
+
             .custom-modal-content {
+
               width: 95%;
+
               max-height: 95vh;
+
             }
+
             .custom-modal-body {
+
               padding: 15px !important;
+
             }
+
             .custom-modal-footer {
+
               padding: 12px 15px !important;
+
               flex-direction: row;
+
               justify-content: flex-end;
+
             }
+
             .custom-modal-header {
+
                 padding: 12px 15px !important;
+
             }
+
             .custom-modal-header h1 {
+
                 font-size: 18px !important;
+
             }
+
           }
+
            @media (max-width: 320px) {
+
              .custom-modal-footer {
+
               flex-direction: column-reverse;
+
               align-items: stretch;
+
             }
+
             .custom-modal-footer button {
+
               width: 100%;
+
             }
+
           }
+
         `), /*#__PURE__*/React.createElement("div", {
     className: "custom-modal-content"
   }, /*#__PURE__*/React.createElement("div", {
@@ -3927,7 +4020,7 @@ const AddTripModal = ({
   }, t("WT_FIXED_POINT_CODE")), isFixedPointLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "fixedPointCode",
-    defaultValue: defaultValues.fixedPointCode,
+    defaultValue: defaultValues.fixedPointId || defaultValues.fixedPointCode,
     render: props => /*#__PURE__*/React.createElement(CustomNameDropdown, {
       option: fixedPointOptions,
       optionKey: "displayLabel",
@@ -3938,7 +4031,8 @@ const AddTripModal = ({
         name: "WT_NAME",
         mobileNumber: "WT_MOBILE_NUMBER",
         locality: "WT_LOCALITY"
-      }
+      },
+      onSearch: handleSearch
     })
   }), selectedFixedPoint && /*#__PURE__*/React.createElement("div", {
     style: {
@@ -3957,6 +4051,24 @@ const AddTripModal = ({
       marginBottom: "8px",
       fontWeight: "500"
     }
+  }, t("WT_FILLING_POINT")), isFillingPointLoading ? /*#__PURE__*/React.createElement(Loader, null) : /*#__PURE__*/React.createElement(Controller, {
+    control: control,
+    name: "fillingPointCode",
+    defaultValue: defaultValues.fillingPointCode,
+    render: props => /*#__PURE__*/React.createElement(CustomNameDropdown, {
+      option: fillingPointOptions,
+      optionKey: "displayLabel",
+      selected: fillingPointOptions.find(opt => opt.value === props.value),
+      select: val => props.onChange(val.value),
+      t: t
+    })
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "field-group"
+  }, /*#__PURE__*/React.createElement(CardLabel, {
+    style: {
+      marginBottom: "8px",
+      fontWeight: "500"
+    }
   }, t("WT_DAY")), /*#__PURE__*/React.createElement(Controller, {
     control: control,
     name: "day",
@@ -3970,7 +4082,14 @@ const AddTripModal = ({
       },
       t: t,
       defaultLabel: t("WT_SELECT_DAYS"),
-      defaultUnit: t("WT_DAYS")
+      defaultUnit: t("WT_DAYS"),
+      ServerStyle: {
+        backgroundColor: "#fff",
+        zIndex: 1000,
+        border: "1px solid #ccc",
+        boxShadow: "0px 4px 6px rgba(0,0,0,0.1)",
+        borderRadius: "4px"
+      }
     })
   })), /*#__PURE__*/React.createElement("div", {
     className: "field-group"
@@ -4073,23 +4192,6 @@ const AddTripModal = ({
       onChange: e => props.onChange(e.target.value),
       onBlur: props.onBlur
     })
-  })), /*#__PURE__*/React.createElement("div", {
-    className: "field-group"
-  }, /*#__PURE__*/React.createElement(CardLabel, {
-    style: {
-      marginBottom: "8px",
-      fontWeight: "500"
-    }
-  }, t("WT_ACTIVE")), /*#__PURE__*/React.createElement(Controller, {
-    control: control,
-    name: "active",
-    render: props => /*#__PURE__*/React.createElement(Dropdown, {
-      option: activeOptions,
-      optionKey: "label",
-      selected: props.value,
-      select: props.onChange,
-      t: t
-    })
   })), /*#__PURE__*/React.createElement("div", {
     className: "field-group remarks-field-group",
     style: {
@@ -4130,16 +4232,14 @@ const AddTripModal = ({
     }
   }, t("CS_COMMON_CANCEL")), /*#__PURE__*/React.createElement("button", {
     className: "button-save",
-    disabled: !isFormValid,
     onClick: handleSubmit(onFormSubmit),
     style: {
       padding: "8px 20px",
-      background: !isFormValid ? "#ccc" : "#1D4E7F",
-      color: "#fff",
+      background: "#1D4E7F",
+      color: "#ffffffff",
       border: "none",
       borderRadius: "4px",
-      cursor: !isFormValid ? "not-allowed" : "pointer",
-      opacity: !isFormValid ? 0.7 : 1
+      cursor: "pointer"
     }
   }, initialValues ? t("WT_UPDATE") : t("CS_COMMON_SAVE")))));
 };
@@ -4255,6 +4355,7 @@ const FixedPointScheduleManagement = ({
     scheduleId: item.systemAssignedScheduleId,
     fixedPointName: item.fixedPointName,
     fixedPoint: item.fixedPointCode || item.fixedPointId,
+    fixedPointId: item.fixedPointId || item.id || null,
     day: item.day,
     freq: item.tripNo,
     arrToFpl: item.arrivalTimeToFpl,
@@ -4597,7 +4698,24 @@ const FixedPointScheduleManagement = ({
       color: selectedDay === dayItem ? "#fff" : "#333",
       cursor: "pointer"
     }
-  }, t(dayItem.toUpperCase())))), /*#__PURE__*/React.createElement("div", {
+  }, t(dayItem.toUpperCase())))), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("button", {
+    onClick: () => {
+      setEditingRowIndex(null);
+      setShowModal(true);
+    },
+    style: {
+      background: "#1E8E3E",
+      color: "#fff",
+      border: "none",
+      padding: "10px 20px",
+      borderRadius: "4px",
+      cursor: "pointer",
+      display: "flex",
+      alignItems: "center",
+      gap: "5px",
+      marginBottom: "10px"
+    }
+  }, /*#__PURE__*/React.createElement("span", null, "+"), " ", t("WT_ADD_TRIP"))), /*#__PURE__*/React.createElement("div", {
     style: {
       width: "100%",
       overflowX: "auto"
@@ -4627,24 +4745,7 @@ const FixedPointScheduleManagement = ({
     getCSVExportData: getCSVExportData,
     csvExportColumns: csvExportColumns,
     csvExportFileName: "wt-fixed-point-schedule"
-  })), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("button", {
-    onClick: () => {
-      setEditingRowIndex(null);
-      setShowModal(true);
-    },
-    style: {
-      background: "#1E8E3E",
-      color: "#fff",
-      border: "none",
-      padding: "10px 20px",
-      borderRadius: "4px",
-      cursor: "pointer",
-      display: "flex",
-      alignItems: "center",
-      gap: "5px",
-      marginBottom: "10px"
-    }
-  }, /*#__PURE__*/React.createElement("span", null, "+"), " ", t("WT_ADD_TRIP")))), showModal && /*#__PURE__*/React.createElement(AddTripModal, {
+  }))), showModal && /*#__PURE__*/React.createElement(AddTripModal, {
     t: t,
     closeModal: () => {
       setShowModal(false);
@@ -4653,6 +4754,7 @@ const FixedPointScheduleManagement = ({
     initialValues: editingRowIndex !== null ? {
       scheduleId: data[editingRowIndex].scheduleId,
       fixedPointCode: data[editingRowIndex].fixedPoint,
+      fixedPointId: data[editingRowIndex].fixedPointId,
       day: [{
         label: t(data[editingRowIndex].day),
         value: data[editingRowIndex].day
@@ -4671,86 +4773,68 @@ const FixedPointScheduleManagement = ({
       }
     } : null,
     onSubmit: formData => {
-      var _formData$active, _formData$active2;
+      var _formData$active, _scheduleData$fixedPo, _scheduleData$fixedPo2;
+      console.log(formData, 'dsdsdsdsdsdsds');
       const formDataDay = formData === null || formData === void 0 ? void 0 : formData.day;
       let daysArr = [];
       if (Array.isArray(formDataDay)) {
-        daysArr = formDataDay.map(d => typeof d === "string" ? d : (d === null || d === void 0 ? void 0 : d.value) || (Array.isArray(d) ? d[1] : d)).filter(d => typeof d === "string" && d !== "WT_SELECT_ALL");
-        if (daysArr.length === 0 && formDataDay.some(d => {
-          const val = typeof d === "string" ? d : (d === null || d === void 0 ? void 0 : d.value) || (Array.isArray(d) ? d[1] : d);
-          return val === "WT_SELECT_ALL";
-        })) {
-          daysArr = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY", "SUNDAY"];
-        }
+        daysArr = formDataDay.map(d => typeof d === "string" ? d : (d === null || d === void 0 ? void 0 : d.value) || d).filter(d => d && d !== "WT_SELECT_ALL");
       } else if (formDataDay) {
-        const dayVal = typeof formDataDay === "string" ? formDataDay : (formDataDay === null || formDataDay === void 0 ? void 0 : formDataDay.value) || (Array.isArray(formDataDay) ? formDataDay[1] : formDataDay);
-        if (dayVal && dayVal !== "WT_SELECT_ALL") daysArr = [dayVal];
+        const val = (formDataDay === null || formDataDay === void 0 ? void 0 : formDataDay.value) || formDataDay;
+        if (val && val !== "WT_SELECT_ALL") daysArr = [val];
       }
+      const existingData = editingRowIndex !== null ? data[editingRowIndex] : {};
+      const isFormActive = ((_formData$active = formData.active) === null || _formData$active === void 0 ? void 0 : _formData$active.value) === "Yes" || formData.active === "Yes" || formData.active === true;
+      const isExistingActive = (existingData === null || existingData === void 0 ? void 0 : existingData.active) === "Y";
+      const finalActiveStatus = formData.active !== undefined ? isFormActive : editingRowIndex !== null ? isExistingActive : true;
       const fixedPointDetails = {
-        tenantId,
-        system_assigned_schedule_id: formData.scheduleId,
-        fixed_point_code: formData.fixedPointCode,
-        day: daysArr.map(d => {
-          var _d$toUpperCase;
-          return (d === null || d === void 0 ? void 0 : (_d$toUpperCase = d.toUpperCase) === null || _d$toUpperCase === void 0 ? void 0 : _d$toUpperCase.call(d)) || d;
-        }),
-        trip_no: Number(formData.frequencyNo) || Number(formData.tripNo) || 1,
+        system_assigned_schedule_id: formData.scheduleId || existingData.scheduleId || null,
+        fixed_point_code: formData.fixedPointId || formData.fixedPointCode || "",
+        fillingPointId: formData.fillingPointCode || null,
+        day: daysArr.map(d => d.toUpperCase()),
+        trip_no: Number(formData.frequencyNo) || 1,
         arrival_time_to_fpl: formData.arrivalTimeFpl,
         departure_time_from_fpl: formData.departureTimeFpl,
         arrival_time_delivery_point: formData.arrivalFixedPoint,
         departure_time_delivery_point: formData.departureFixedPoint,
         time_of_arriving_back_fpl_after_delivery: formData.returnFpl,
-        volume_water_tobe_delivery: formData.volume || "0",
-        active: ((_formData$active = formData.active) === null || _formData$active === void 0 ? void 0 : _formData$active.value) === "Yes" || formData.active === "Yes",
-        is_enable: ((_formData$active2 = formData.active) === null || _formData$active2 === void 0 ? void 0 : _formData$active2.value) === "Yes" || formData.active === "Yes",
-        remarks: formData.remarks,
-        vehicle_id: formData.vehicleId
+        volume_water_tobe_delivery: formData.volume,
+        active: finalActiveStatus,
+        is_enable: finalActiveStatus,
+        remarks: formData.remarks || "",
+        vehicle_id: formData.vehicleId || existingData.vehicle || null,
+        audit_details: (scheduleData === null || scheduleData === void 0 ? void 0 : (_scheduleData$fixedPo = scheduleData.fixedPointTimeTableDetails) === null || _scheduleData$fixedPo === void 0 ? void 0 : (_scheduleData$fixedPo2 = _scheduleData$fixedPo[editingRowIndex]) === null || _scheduleData$fixedPo2 === void 0 ? void 0 : _scheduleData$fixedPo2.auditDetails) || null
       };
+      if (!fixedPointDetails.system_assigned_schedule_id) delete fixedPointDetails.system_assigned_schedule_id;
+      if (!fixedPointDetails.vehicle_id) delete fixedPointDetails.vehicle_id;
+      if (!fixedPointDetails.audit_details) delete fixedPointDetails.audit_details;
       const payload = editingRowIndex !== null ? {
         fixedPointDetailsList: [fixedPointDetails]
       } : {
         fixedPointDetails
       };
+      const mutationOptions = {
+        onError: error => {
+          var _error$response, _error$response$data, _error$response$data$, _error$response$data$2;
+          setToast({
+            key: "error",
+            label: (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.Errors) === null || _error$response$data$ === void 0 ? void 0 : (_error$response$data$2 = _error$response$data$[0]) === null || _error$response$data$2 === void 0 ? void 0 : _error$response$data$2.message) || "Operation Failed"
+          });
+          setTimeout(closeToast, 5000);
+        },
+        onSuccess: () => {
+          setToast({
+            label: editingRowIndex !== null ? t("WT_SCHEDULE_UPDATE_SUCCESS") : t("WT_SCHEDULE_CREATE_SUCCESS")
+          });
+          setShowModal(false);
+          setEditingRowIndex(null);
+          queryClient.invalidateQueries(["FIXED_POINT_SCHEDULE_SEARCH", tenantId]);
+        }
+      };
       if (editingRowIndex !== null) {
-        updateSchedule(payload, {
-          onError: (error, variables) => {
-            var _error$response, _error$response$data, _error$response$data$, _error$response$data$2;
-            setToast({
-              key: "error",
-              label: (error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.Errors) === null || _error$response$data$ === void 0 ? void 0 : (_error$response$data$2 = _error$response$data$[0]) === null || _error$response$data$2 === void 0 ? void 0 : _error$response$data$2.message) || "ERROR_WHILE_UPDATING_SCHEDULE"
-            });
-            setTimeout(closeToast, 5000);
-          },
-          onSuccess: (data, variables) => {
-            setToast({
-              label: t("WT_SCHEDULE_UPDATE_SUCCESS")
-            });
-            setTimeout(closeToast, 5000);
-            setShowModal(false);
-            setEditingRowIndex(null);
-            queryClient.invalidateQueries(["FIXED_POINT_SCHEDULE_SEARCH", tenantId]);
-          }
-        });
+        updateSchedule(payload, mutationOptions);
       } else {
-        createSchedule(payload, {
-          onError: (error, variables) => {
-            var _error$response2, _error$response2$data, _error$response2$data2, _error$response2$data3;
-            setToast({
-              key: "error",
-              label: (error === null || error === void 0 ? void 0 : (_error$response2 = error.response) === null || _error$response2 === void 0 ? void 0 : (_error$response2$data = _error$response2.data) === null || _error$response2$data === void 0 ? void 0 : (_error$response2$data2 = _error$response2$data.Errors) === null || _error$response2$data2 === void 0 ? void 0 : (_error$response2$data3 = _error$response2$data2[0]) === null || _error$response2$data3 === void 0 ? void 0 : _error$response2$data3.message) || "ERROR_WHILE_CREATING_SCHEDULE"
-            });
-            setTimeout(closeToast, 5000);
-          },
-          onSuccess: (data, variables) => {
-            setToast({
-              label: t("WT_SCHEDULE_CREATE_SUCCESS")
-            });
-            setTimeout(closeToast, 5000);
-            setShowModal(false);
-            setEditingRowIndex(null);
-            queryClient.invalidateQueries(["FIXED_POINT_SCHEDULE_SEARCH", tenantId]);
-          }
-        });
+        createSchedule(payload, mutationOptions);
       }
     }
   }), toast && /*#__PURE__*/React.createElement(Toast, {
@@ -7286,6 +7370,477 @@ const LocalityModal = ({
   }, t("CS_COMMON_SAVE")))));
 };
 
+delete L.Icon.Default.prototype._getIconUrl;
+L.Icon.Default.mergeOptions({
+  iconRetinaUrl: "https://unpkg.com/leaflet@1.9.4/dist/images/marker-icon-2x.png",
+  iconUrl: "https://unpkg.com/leaflet@1.9.4/dist/images/marker-icon.png",
+  shadowUrl: "https://unpkg.com/leaflet@1.9.4/dist/images/marker-shadow.png"
+});
+const fillingPointIcon = new L.Icon({
+  iconUrl: "https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-blue.png",
+  shadowUrl: "https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png",
+  iconSize: [25, 41],
+  iconAnchor: [12, 41],
+  popupAnchor: [1, -34],
+  shadowSize: [41, 41]
+});
+const fixedPointIcon = new L.Icon({
+  iconUrl: "https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-green.png",
+  shadowUrl: "https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png",
+  iconSize: [25, 41],
+  iconAnchor: [12.5, 41],
+  popupAnchor: [1, -34],
+  shadowSize: [41, 41]
+});
+const enlargedFixedPointIcon = new L.Icon({
+  iconUrl: "https://raw.githubusercontent.com/pointhi/leaflet-color-markers/master/img/marker-icon-2x-green.png",
+  shadowUrl: "https://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/images/marker-shadow.png",
+  iconSize: [35, 57],
+  iconAnchor: [17.5, 57],
+  popupAnchor: [1, -45],
+  shadowSize: [50, 50],
+  className: "bouncing-marker"
+});
+const bounceStyles = `
+  @keyframes marker-bounce {
+    0%, 100% { margin-top: 0px; }
+    50% { margin-top: -15px; }
+  }
+  .bouncing-marker {
+    animation: marker-bounce 0.6s infinite ease-in-out !important;
+  }
+`;
+const ChangeView = ({
+  bounds,
+  center,
+  zoom
+}) => {
+  const map = useMap();
+  useEffect(() => {
+    if (center) {
+      map.setView(center, zoom || 15, {
+        animate: true
+      });
+    } else if (bounds && bounds.length > 0) {
+      map.fitBounds(bounds);
+    }
+  }, [bounds, center, zoom, map]);
+  return null;
+};
+const PointAddressMap = ({
+  fillingPoints: _fillingPoints = [],
+  fixedPoints: _fixedPoints = [],
+  isLoading,
+  t
+}) => {
+  var _selectedFillingPoint;
+  const [selectedFillingPoint, setSelectedFillingPoint] = useState(null);
+  const [selectedFixedPoint, setSelectedFixedPoint] = useState(null);
+  const [hoveredFixedPointId, setHoveredFixedPointId] = useState(null);
+  const [mapCenter, setMapCenter] = useState(null);
+  const [mapZoom, setMapZoom] = useState(11);
+  const defaultCenter = [28.6139, 77.209];
+  const getFpId = fp => {
+    var _fp$fillingpointmetad;
+    return (fp === null || fp === void 0 ? void 0 : fp.id) || (fp === null || fp === void 0 ? void 0 : fp.bookingId) || (fp === null || fp === void 0 ? void 0 : fp.fillingPointId) || (fp === null || fp === void 0 ? void 0 : fp.uuid) || (fp === null || fp === void 0 ? void 0 : (_fp$fillingpointmetad = fp.fillingpointmetadata) === null || _fp$fillingpointmetad === void 0 ? void 0 : _fp$fillingpointmetad.fillingPointId);
+  };
+  const {
+    isLoading: isRelatedLoading,
+    data: relatedFixedPointsData
+  } = Digit.Hooks.wt.useFixedPointSearchAPI({
+    tenantId: Digit.ULBService.getCurrentTenantId(),
+    filters: {
+      fillingPointId: getFpId(selectedFillingPoint),
+      limit: 1000
+    }
+  }, {
+    enabled: !!selectedFillingPoint
+  });
+  const relatedFixedPoints = useMemo(() => {
+    if (!selectedFillingPoint) return [];
+    return (relatedFixedPointsData === null || relatedFixedPointsData === void 0 ? void 0 : relatedFixedPointsData.waterTankerBookingDetail) || [];
+  }, [selectedFillingPoint, relatedFixedPointsData]);
+  const displayFillingPoints = useMemo(() => {
+    if (selectedFillingPoint) {
+      return [selectedFillingPoint].filter(fp => {
+        var _fp$address, _fp$address2;
+        return ((_fp$address = fp.address) === null || _fp$address === void 0 ? void 0 : _fp$address.latitude) && ((_fp$address2 = fp.address) === null || _fp$address2 === void 0 ? void 0 : _fp$address2.longitude);
+      });
+    }
+    return (_fillingPoints === null || _fillingPoints === void 0 ? void 0 : _fillingPoints.filter(fp => {
+      var _fp$address3, _fp$address4;
+      return ((_fp$address3 = fp.address) === null || _fp$address3 === void 0 ? void 0 : _fp$address3.latitude) && ((_fp$address4 = fp.address) === null || _fp$address4 === void 0 ? void 0 : _fp$address4.longitude);
+    })) || [];
+  }, [_fillingPoints, selectedFillingPoint]);
+  const displayFixedPoints = useMemo(() => {
+    if (selectedFixedPoint) {
+      return [selectedFixedPoint].filter(fx => {
+        var _fx$address, _fx$address2;
+        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);
+      });
+    }
+    return relatedFixedPoints.filter(fx => {
+      var _fx$address3, _fx$address4;
+      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);
+    });
+  }, [relatedFixedPoints, selectedFixedPoint]);
+  const bounds = useMemo(() => {
+    const allPoints = [...displayFillingPoints.map(p => [parseFloat(p.address.latitude), parseFloat(p.address.longitude)]), ...displayFixedPoints.map(p => [parseFloat(p.address.latitude), parseFloat(p.address.longitude)])];
+    if (allPoints.length === 0) return null;
+    return allPoints;
+  }, [displayFillingPoints, displayFixedPoints]);
+  const handleFillingPointSelect = val => {
+    setSelectedFillingPoint(val);
+    setSelectedFixedPoint(null);
+    setMapCenter(null);
+  };
+  const handleFixedPointSelect = val => {
+    var _val$address, _val$address2;
+    setSelectedFixedPoint(val);
+    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) {
+      setMapCenter([parseFloat(val.address.latitude), parseFloat(val.address.longitude)]);
+      setMapZoom(16);
+    }
+  };
+  const fixedPointOptions = useMemo(() => {
+    return relatedFixedPoints.map(fx => {
+      var _fx$applicantDetail;
+      return {
+        ...fx,
+        displayName: (fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail = fx.applicantDetail) === null || _fx$applicantDetail === void 0 ? void 0 : _fx$applicantDetail.name) || (fx === null || fx === void 0 ? void 0 : fx.name) || "NA"
+      };
+    });
+  }, [relatedFixedPoints]);
+  const handleClear = () => {
+    setSelectedFillingPoint(null);
+    setSelectedFixedPoint(null);
+    setMapCenter(null);
+    setMapZoom(11);
+  };
+  if (isLoading || isRelatedLoading) return /*#__PURE__*/React.createElement(Loader, null);
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      flexDirection: window.innerWidth < 768 ? "column" : "row",
+      height: "700px",
+      width: "100%",
+      borderRadius: "12px",
+      overflow: "hidden",
+      border: "1px solid #ddd",
+      marginTop: "20px",
+      boxShadow: "0 8px 24px rgba(0,0,0,0.12)",
+      background: "#fff"
+    }
+  }, /*#__PURE__*/React.createElement("style", null, bounceStyles), /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: window.innerWidth < 768 ? "100%" : "320px",
+      padding: "24px",
+      borderRight: "1px solid #eee",
+      display: "flex",
+      flexDirection: "column",
+      gap: "20px",
+      background: "#f9f9f9",
+      zIndex: 10
+    }
+  }, /*#__PURE__*/React.createElement("h3", {
+    style: {
+      margin: "0 0 8px 0",
+      color: "#1D4E7F",
+      fontSize: "20px",
+      fontWeight: "600"
+    }
+  }, t("WT_MAP_FILTERS")), /*#__PURE__*/React.createElement("div", {
+    className: "filter-item"
+  }, /*#__PURE__*/React.createElement("label", {
+    style: {
+      display: "block",
+      marginBottom: "8px",
+      fontSize: "14px",
+      fontWeight: "500",
+      color: "#666"
+    }
+  }, t("WT_FILLING_POINT")), /*#__PURE__*/React.createElement(Dropdown, {
+    option: _fillingPoints,
+    optionKey: "fillingPointName",
+    selected: selectedFillingPoint,
+    select: handleFillingPointSelect,
+    t: t,
+    placeholder: t("WT_SELECT_FILLING_POINT")
+  })), selectedFillingPoint && /*#__PURE__*/React.createElement("div", {
+    className: "filter-item",
+    style: {
+      flex: 1,
+      display: "flex",
+      flexDirection: "column"
+    }
+  }, /*#__PURE__*/React.createElement("label", {
+    style: {
+      display: "block",
+      marginBottom: "12px",
+      fontSize: "14px",
+      fontWeight: "600",
+      color: "#1D4E7F"
+    }
+  }, t("WT_MAPPED_FIXED_POINTS"), " (", relatedFixedPoints.length, ")"), /*#__PURE__*/React.createElement("div", {
+    style: {
+      maxHeight: "350px",
+      overflowY: "auto",
+      paddingRight: "8px",
+      display: "flex",
+      flexDirection: "column",
+      gap: "8px"
+    }
+  }, relatedFixedPoints.length > 0 ? relatedFixedPoints.map((fx, idx) => {
+    var _fx$applicantDetail2, _selectedFixedPoint$a, _fx$applicantDetail3, _fx$applicantDetail5, _fx$applicantDetail6, _fx$applicantDetail7, _fx$applicantDetail8;
+    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);
+    return /*#__PURE__*/React.createElement("div", {
+      key: idx,
+      onClick: () => handleFixedPointSelect(fx),
+      onMouseEnter: () => {
+        var _fx$applicantDetail4, _fx$address5, _fx$address6;
+        setHoveredFixedPointId(fx.id || ((_fx$applicantDetail4 = fx.applicantDetail) === null || _fx$applicantDetail4 === void 0 ? void 0 : _fx$applicantDetail4.applicantId) || idx);
+        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) {
+          setMapCenter([parseFloat(fx.address.latitude), parseFloat(fx.address.longitude)]);
+          setMapZoom(16);
+        }
+      },
+      onMouseLeave: () => setHoveredFixedPointId(null),
+      style: {
+        padding: "12px",
+        background: isSelected ? "#E6EEF5" : "#fff",
+        border: isSelected ? "1.5px solid #1D4E7F" : "1px solid #e0e0e0",
+        borderRadius: "8px",
+        cursor: "pointer",
+        transition: "all 0.2s ease",
+        fontSize: "13px",
+        color: isSelected ? "#1D4E7F" : "#333",
+        fontWeight: isSelected ? "600" : "400",
+        display: "flex",
+        alignItems: "center",
+        gap: "10px",
+        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",
+        transform: hoveredFixedPointId === (fx.id || ((_fx$applicantDetail6 = fx.applicantDetail) === null || _fx$applicantDetail6 === void 0 ? void 0 : _fx$applicantDetail6.applicantId) || idx) ? "translateX(4px)" : "none"
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: "10px",
+        height: "10px",
+        borderRadius: "50%",
+        background: "#417505",
+        boxShadow: "0 0 4px rgba(65, 117, 5, 0.4)"
+      }
+    }), /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: "flex",
+        flexDirection: "column"
+      }
+    }, /*#__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", {
+      style: {
+        fontSize: "11px",
+        color: "#888",
+        fontWeight: "400"
+      }
+    }, fx === null || fx === void 0 ? void 0 : (_fx$applicantDetail8 = fx.applicantDetail) === null || _fx$applicantDetail8 === void 0 ? void 0 : _fx$applicantDetail8.fixedPointId)));
+  }) : /*#__PURE__*/React.createElement("div", {
+    style: {
+      textAlign: "center",
+      padding: "20px",
+      color: "#999",
+      fontSize: "13px",
+      border: "1px dashed #ccc",
+      borderRadius: "8px"
+    }
+  }, t("WT_NO_MAPPED_POINTS")))), /*#__PURE__*/React.createElement("button", {
+    onClick: handleClear,
+    style: {
+      marginTop: "auto",
+      padding: "12px",
+      background: "#fff",
+      border: "1px solid #1D4E7F",
+      color: "#1D4E7F",
+      borderRadius: "6px",
+      cursor: "pointer",
+      fontWeight: "600",
+      transition: "all 0.2s"
+    },
+    onMouseOver: e => {
+      e.target.style.background = "#1D4E7F";
+      e.target.style.color = "#fff";
+    },
+    onMouseOut: e => {
+      e.target.style.background = "#fff";
+      e.target.style.color = "#1D4E7F";
+    }
+  }, t("ES_COMMON_CLEAR_ALL")), selectedFillingPoint && /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: "20px",
+      padding: "16px",
+      background: "#fff",
+      borderRadius: "8px",
+      border: "1px solid #e0e0e0"
+    }
+  }, /*#__PURE__*/React.createElement("h4", {
+    style: {
+      margin: "0 0 12px 0",
+      fontSize: "14px",
+      color: "#333",
+      borderBottom: "1px solid #f0f0f0",
+      paddingBottom: "8px"
+    }
+  }, t("WT_SUMMARY")), /*#__PURE__*/React.createElement("div", {
+    style: {
+      fontSize: "13px",
+      display: "flex",
+      flexDirection: "column",
+      gap: "8px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      justifyContent: "space-between"
+    }
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: "#777"
+    }
+  }, t("WT_FIXED_POINTS"), ":"), /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontWeight: "600"
+    }
+  }, relatedFixedPoints.length)), /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: "flex",
+      justifyContent: "space-between"
+    }
+  }, /*#__PURE__*/React.createElement("span", {
+    style: {
+      color: "#777"
+    }
+  }, t("WT_LOCALITY"), ":"), /*#__PURE__*/React.createElement("span", {
+    style: {
+      fontWeight: "600"
+    }
+  }, ((_selectedFillingPoint = selectedFillingPoint.address) === null || _selectedFillingPoint === void 0 ? void 0 : _selectedFillingPoint.locality) || "NA"))))), /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1,
+      position: "relative"
+    }
+  }, /*#__PURE__*/React.createElement(MapContainer, {
+    center: defaultCenter,
+    zoom: 11,
+    style: {
+      height: "100%",
+      width: "100%"
+    },
+    scrollWheelZoom: true
+  }, /*#__PURE__*/React.createElement(TileLayer, {
+    attribution: "\xA9 <a href=\"https://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors",
+    url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
+  }), /*#__PURE__*/React.createElement(ChangeView, {
+    bounds: bounds,
+    center: mapCenter,
+    zoom: mapZoom
+  }), displayFillingPoints.map((fp, index) => {
+    var _fp$address5;
+    return /*#__PURE__*/React.createElement(React.Fragment, {
+      key: `fp-group-${fp.id || index}`
+    }, /*#__PURE__*/React.createElement(Circle, {
+      center: [parseFloat(fp.address.latitude), parseFloat(fp.address.longitude)],
+      radius: 5000,
+      pathOptions: {
+        color: "#0d2745ff",
+        fillColor: "#041a34ff",
+        fillOpacity: 0.1,
+        weight: 1,
+        dashArray: "5, 5"
+      }
+    }), /*#__PURE__*/React.createElement(Marker, {
+      key: `fp-${fp.id || index}`,
+      position: [parseFloat(fp.address.latitude), parseFloat(fp.address.longitude)],
+      icon: fillingPointIcon
+    }, /*#__PURE__*/React.createElement(Popup, null, /*#__PURE__*/React.createElement("div", {
+      style: {
+        padding: "8px",
+        minWidth: "200px"
+      }
+    }, /*#__PURE__*/React.createElement("h4", {
+      style: {
+        margin: "0 0 8px 0",
+        color: "#1F5FA8",
+        fontSize: "16px",
+        borderBottom: "1px solid #eee",
+        paddingBottom: "4px"
+      }
+    }, fp.fillingPointName, " (Filling Point)"), /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: "flex",
+        flexDirection: "column",
+        gap: "4px"
+      }
+    }, /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__PURE__*/React.createElement("strong", null, t("WT_FILLING_POINT_CODE"), ":"), " ", fp.fillingPointId), /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__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", {
+      style: {
+        margin: 0,
+        fontSize: "12px",
+        color: "#1F5FA8"
+      }
+    }, /*#__PURE__*/React.createElement("strong", null, "Coverage:"), " 5 KM Radius"))))));
+  }), displayFixedPoints.map((fx, index) => {
+    var _fx$applicantDetail9, _fx$applicantDetail0, _fx$applicantDetail1, _fx$applicantDetail10, _fx$address7;
+    const fxId = fx.id || ((_fx$applicantDetail9 = fx.applicantDetail) === null || _fx$applicantDetail9 === void 0 ? void 0 : _fx$applicantDetail9.applicantId) || index;
+    const isHovered = hoveredFixedPointId === fxId;
+    return /*#__PURE__*/React.createElement(Marker, {
+      key: `fx-${fxId}`,
+      position: [parseFloat(fx.address.latitude), parseFloat(fx.address.longitude)],
+      icon: isHovered ? enlargedFixedPointIcon : fixedPointIcon,
+      zIndexOffset: isHovered ? 1000 : 0
+    }, /*#__PURE__*/React.createElement(Popup, null, /*#__PURE__*/React.createElement("div", {
+      style: {
+        padding: "8px",
+        minWidth: "200px"
+      }
+    }, /*#__PURE__*/React.createElement("h4", {
+      style: {
+        margin: "0 0 8px 0",
+        color: "#417505",
+        fontSize: "16px",
+        borderBottom: "1px solid #eee",
+        paddingBottom: "4px"
+      }
+    }, (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", {
+      style: {
+        display: "flex",
+        flexDirection: "column",
+        gap: "4px"
+      }
+    }, /*#__PURE__*/React.createElement("p", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__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", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__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", {
+      style: {
+        margin: 0,
+        fontSize: "12px"
+      }
+    }, /*#__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")))));
+  }))));
+};
+
 const SearchFillingPointAddress = () => {
   const {
     t
@@ -7350,6 +7905,18 @@ const SearchFillingPointAddress = () => {
     enabled: true
   });
   const allFillingPoints = (allFillingPointsData === null || allFillingPointsData === void 0 ? void 0 : allFillingPointsData.fillingPoints) || [];
+  const {
+    isLoading: isAllFixedPointsLoading,
+    data: allFixedPointsData
+  } = Digit.Hooks.wt.useFixedPointSearchAPI({
+    tenantId,
+    filters: {
+      limit: 1000
+    }
+  }, {
+    enabled: true
+  });
+  const allFixedPoints = (allFixedPointsData === null || allFixedPointsData === void 0 ? void 0 : allFixedPointsData.waterTankerBookingDetail) || [];
   const {
     mutate: mapFixedFilling
   } = Digit.Hooks.wt.useVendorFillingMapping(tenantId);
@@ -7375,6 +7942,10 @@ const SearchFillingPointAddress = () => {
     FILLING_POINT: {
       label: "WT_FILLING_POINT_NAME",
       placeholder: "WT_ENTER_FILLING_POINT_NAME"
+    },
+    VIEW_ON_MAP: {
+      label: "WT_VIEW_ON_MAP",
+      placeholder: ""
     }
   };
   const statusOptions = [{
@@ -7801,7 +8372,13 @@ const SearchFillingPointAddress = () => {
     style: {
       width: isMobile ? "50%" : "auto"
     }
-  }, t("WT_FILLING_POINT"))), /*#__PURE__*/React.createElement("div", {
+  }, t("WT_FILLING_POINT")), /*#__PURE__*/React.createElement("button", {
+    className: selectedTab === "VIEW_ON_MAP" ? "search-tab-head-selected" : "search-tab-head",
+    onClick: () => onTabChange("VIEW_ON_MAP"),
+    style: {
+      width: isMobile ? "50%" : "auto"
+    }
+  }, t("WT_VIEW_ON_MAP"))), /*#__PURE__*/React.createElement("div", {
     className: "action-bar-wrap-registry",
     style: {
       alignSelf: isMobile ? "flex-end" : "auto"
@@ -7816,7 +8393,7 @@ const SearchFillingPointAddress = () => {
     options: ["FIXED_POINT", "FILLING_POINT"],
     t: t,
     onSelect: onActionSelect
-  }))), /*#__PURE__*/React.createElement("div", {
+  }))), selectedTab !== "VIEW_ON_MAP" && /*#__PURE__*/React.createElement("div", {
     className: "finance-mainlayout"
   }, /*#__PURE__*/React.createElement("div", {
     className: "finance-mainlayout-col1"
@@ -7872,7 +8449,12 @@ const SearchFillingPointAddress = () => {
   }, /*#__PURE__*/React.createElement(Label, null, "\xA0"), /*#__PURE__*/React.createElement(SubmitBar, {
     label: t("ES_COMMON_SEARCH"),
     onSubmit: onSearch
-  })))), /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(ApplicationTable, {
+  })))), selectedTab === "VIEW_ON_MAP" ? /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(PointAddressMap, {
+    fillingPoints: allFillingPoints,
+    fixedPoints: allFixedPoints,
+    isLoading: isAllFillingPointsLoading || isAllFixedPointsLoading,
+    t: t
+  })) : /*#__PURE__*/React.createElement(Card, null, /*#__PURE__*/React.createElement(ApplicationTable, {
     key: (allFillingPoints === null || allFillingPoints === void 0 ? void 0 : allFillingPoints.length) > 0 ? "loaded" : "loading",
     data: tableData,
     columns: columns,
@@ -24978,10 +25560,10 @@ const ApplicationDetails$1 = () => {
     applicationData: appDetailsToShow === null || appDetailsToShow === void 0 ? void 0 : (_appDetailsToShow$app = appDetailsToShow.applicationData) === null || _appDetailsToShow$app === void 0 ? void 0 : _appDetailsToShow$app.applicationData,
     closeModal: () => setShowEditModal(false)
   }), /*#__PURE__*/React.createElement("div", {
-    className: `workflow-timeline-wrapper ${hideTimeline ? "hide-workflow" : ""}`,
+    className: `workflow-timeline-wrapper no-scrollbar ${hideTimeline ? "hide-workflow" : ""}`,
     style: {
       flex: "1 1 300px",
-      maxWidth: hideTimeline ? "0px" : "400px",
+      maxWidth: hideTimeline ? "fit-content" : "400px",
       transition: "max-width 0.3s"
     }
   }, /*#__PURE__*/React.createElement(WorkflowTimeline, {
@@ -28114,16 +28696,6 @@ const WTModule = ({
     path,
     url
   } = useRouteMatch();
-  const moduleCode = "WT";
-  const language = Digit.StoreData.getCurrentLanguage();
-  const {
-    isLoading,
-    data: store
-  } = Digit.Services.useStore({
-    stateCode,
-    moduleCode,
-    language
-  });
   Digit.SessionStorage.set("WT_TENANTS", tenants);
   useEffect(() => userType === "employee" && Digit.LocalizationService.getLocale({
     modules: [`rainmaker-${Digit.ULBService.getCurrentTenantId()}`],
@@ -28145,7 +28717,7 @@ const WTLinks = ({
   const {
     t
   } = useTranslation();
-  const [params, setParams, clearParams] = Digit.Hooks.useSessionStorage("WT", {});
+  const [,, clearParams] = Digit.Hooks.useSessionStorage("WT", {});
   useEffect(() => {
     clearParams();
   }, []);