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

package/dist/index.modern.js

@@ -3805,7 +3805,7 @@ const AddTripModal = ({
   });
   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,
+    value: (fp === null || fp === void 0 ? void 0 : fp.fillingPointId) || (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"
   }));
@@ -3847,7 +3847,7 @@ const AddTripModal = ({
     className: "custom-modal-overlay",
     style: {
       position: "fixed",
-      top: 0,
+      top: 30,
       left: 0,
       width: "100%",
       height: "100%",
@@ -4238,6 +4238,29 @@ const AddTripModal = ({
   }, initialValues ? t("WT_UPDATE") : t("CS_COMMON_SAVE")))));
 };
 
+const convertTo12Hour = time24 => {
+  if (!time24) return time24;
+  if (time24.includes("AM") || time24.includes("PM")) return time24;
+  const parts = time24.split(":");
+  if (parts.length < 2) return time24;
+  let h = parseInt(parts[0], 10);
+  const m = parts[1];
+  const ampm = h >= 12 ? "PM" : "AM";
+  h = h % 12 || 12;
+  const strHours = h < 10 ? `0${h}` : h;
+  return `${strHours}:${m} ${ampm}`;
+};
+const convertTo24Hour = time12 => {
+  if (!time12) return time12;
+  const match = time12.match(/^(\d{2}):(\d{2})\s?(AM|PM)$/i);
+  if (!match) return time12;
+  let [_, hours, minutes, ampm] = match;
+  hours = parseInt(hours, 10);
+  if (ampm.toUpperCase() === "PM" && hours < 12) hours += 12;
+  if (ampm.toUpperCase() === "AM" && hours === 12) hours = 0;
+  const strHours = hours < 10 ? `0${hours}` : hours;
+  return `${strHours}:${minutes}`;
+};
 const FixedPointScheduleManagement = ({
   ...props
 }) => {
@@ -4360,19 +4383,37 @@ const FixedPointScheduleManagement = ({
     volume: item.volumeWaterTobeDelivery,
     vehicle: item.vehicleId,
     active: item.isEnable ? "Y" : "N",
-    totalCount: item.totalCount
+    totalCount: item.totalCount,
+    fillingPointId: item.fillingPointId
   })), []);
   const data = React.useMemo(() => {
     return mapScheduleRows((scheduleData === null || scheduleData === void 0 ? void 0 : scheduleData.fixedPointTimeTableDetails) || []);
   }, [scheduleData, mapScheduleRows]);
   const fetchNextPage = () => {
-    setPageOffset(prevState => prevState + pageSize);
+    const newOffset = pageOffset + pageSize;
+    setPageOffset(newOffset);
+    setFilters(prev => ({
+      ...prev,
+      offset: newOffset
+    }));
   };
   const fetchPrevPage = () => {
-    setPageOffset(prevState => prevState - pageSize);
+    const newOffset = Math.max(0, pageOffset - pageSize);
+    setPageOffset(newOffset);
+    setFilters(prev => ({
+      ...prev,
+      offset: newOffset
+    }));
   };
   const handlePageSizeChange = e => {
-    setPageSize(Number(e.target.value));
+    const newPageSize = Number(e.target.value);
+    setPageSize(newPageSize);
+    setPageOffset(0);
+    setFilters(prev => ({
+      ...prev,
+      limit: newPageSize,
+      offset: 0
+    }));
   };
   const handleSearch = (customFilters = null, offset = null) => {
     var _day$value;
@@ -4383,17 +4424,12 @@ const FixedPointScheduleManagement = ({
     };
     const newOffset = offset !== null ? offset : 0;
     if (offset === null) setPageOffset(0);
-    setFilters({
+    setFilters(prev => ({
       ...searchFilters,
-      limit: pageSize,
+      limit: prev.limit,
       offset: newOffset
-    });
+    }));
   };
-  React.useEffect(() => {
-    if (pageOffset !== 0) {
-      handleSearch(null, pageOffset);
-    }
-  }, [pageOffset, pageSize]);
   const columns = React.useMemo(() => [{
     Header: t("WT_FIXED_POINT_CODE"),
     accessor: "fixedPoint"
@@ -4749,16 +4785,17 @@ const FixedPointScheduleManagement = ({
       scheduleId: data[editingRowIndex].scheduleId,
       fixedPointCode: data[editingRowIndex].fixedPoint,
       fixedPointId: data[editingRowIndex].fixedPointId,
+      fillingPointCode: data[editingRowIndex].fillingPointId,
       day: [{
         label: t(data[editingRowIndex].day),
         value: data[editingRowIndex].day
       }],
       frequencyNo: data[editingRowIndex].freq,
-      arrivalTimeFpl: data[editingRowIndex].arrToFpl,
-      departureTimeFpl: data[editingRowIndex].depFromFpl,
-      arrivalFixedPoint: data[editingRowIndex].arrAtFixedPoint,
-      departureFixedPoint: data[editingRowIndex].depAtFixedPoint,
-      returnFpl: data[editingRowIndex].returnToFpl,
+      arrivalTimeFpl: convertTo24Hour(data[editingRowIndex].arrToFpl),
+      departureTimeFpl: convertTo24Hour(data[editingRowIndex].depFromFpl),
+      arrivalFixedPoint: convertTo24Hour(data[editingRowIndex].arrAtFixedPoint),
+      departureFixedPoint: convertTo24Hour(data[editingRowIndex].depAtFixedPoint),
+      returnFpl: convertTo24Hour(data[editingRowIndex].returnToFpl),
       volume: data[editingRowIndex].volume,
       vehicleId: data[editingRowIndex].vehicle,
       active: {
@@ -4784,14 +4821,14 @@ const FixedPointScheduleManagement = ({
       const fixedPointDetails = {
         system_assigned_schedule_id: formData.scheduleId || existingData.scheduleId || null,
         fixed_point_code: formData.fixedPointId || formData.fixedPointCode || "",
-        fillingPointId: formData.fillingPointCode || null,
+        fillingPointId: formData.fillingPointCode || formData.fillingPointId || 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,
+        arrival_time_to_fpl: convertTo12Hour(formData.arrivalTimeFpl),
+        departure_time_from_fpl: convertTo12Hour(formData.departureTimeFpl),
+        arrival_time_delivery_point: convertTo12Hour(formData.arrivalFixedPoint),
+        departure_time_delivery_point: convertTo12Hour(formData.departureFixedPoint),
+        time_of_arriving_back_fpl_after_delivery: convertTo12Hour(formData.returnFpl),
         volume_water_tobe_delivery: formData.volume,
         active: finalActiveStatus,
         is_enable: finalActiveStatus,
@@ -4809,20 +4846,32 @@ const FixedPointScheduleManagement = ({
       };
       const mutationOptions = {
         onError: error => {
-          var _error$response, _error$response$data, _error$response$data$, _error$response$data$2;
+          var _error$response, _error$response$data, _error$response$data$, _error$response2, _error$response2$data, _error$response2$data2, _error$response2$data3;
+          const errMsg = (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.error) === null || _error$response$data$ === void 0 ? void 0 : _error$response$data$.message) || (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 === null || error === void 0 ? void 0 : error.message) || "Operation Failed";
           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"
+            label: errMsg
           });
           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]);
+        onSuccess: response => {
+          var _response$data;
+          if (response !== null && response !== void 0 && response.error || response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.error) {
+            var _response$error, _response$data2, _response$data2$error;
+            const errMsg = (response === null || response === void 0 ? void 0 : (_response$error = response.error) === null || _response$error === void 0 ? void 0 : _response$error.message) || (response === null || response === void 0 ? void 0 : (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : (_response$data2$error = _response$data2.error) === null || _response$data2$error === void 0 ? void 0 : _response$data2$error.message) || "Operation Failed";
+            setToast({
+              key: "error",
+              label: errMsg
+            });
+            setTimeout(closeToast, 5000);
+          } else {
+            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) {
@@ -4831,11 +4880,16 @@ const FixedPointScheduleManagement = ({
         createSchedule(payload, mutationOptions);
       }
     }
-  }), toast && /*#__PURE__*/React.createElement(Toast, {
+  }), toast && /*#__PURE__*/React.createElement("div", {
+    style: {
+      position: "fixed",
+      zIndex: 300000
+    }
+  }, /*#__PURE__*/React.createElement(Toast, {
     error: toast.key === "error",
     label: toast.label,
     onClose: closeToast
-  }));
+  })));
 };
 
 const locationCache = new Map();