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

package/dist/index.modern.js

@@ -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(),
@@ -3714,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,
@@ -3740,7 +3742,6 @@ const AddTripModal = ({
     departureFixedPoint: currentTime,
     returnFpl: currentTime,
     volume: "",
-    active: null,
     remarks: "",
     frequencyNo: 1
   };
@@ -3751,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 = [{
@@ -3802,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",
@@ -3832,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", {
@@ -3932,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",
@@ -3943,7 +4031,8 @@ const AddTripModal = ({
         name: "WT_NAME",
         mobileNumber: "WT_MOBILE_NUMBER",
         locality: "WT_LOCALITY"
-      }
+      },
+      onSearch: handleSearch
     })
   }), selectedFixedPoint && /*#__PURE__*/React.createElement("div", {
     style: {
@@ -3962,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",
@@ -3975,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"
@@ -4078,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: {
@@ -4135,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")))));
 };
@@ -4260,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,
@@ -4602,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"
@@ -4632,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);
@@ -4658,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
@@ -4676,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, {