@djb25/digit-ui-module-wt 1.0.60 → 1.0.61

package/dist/index.modern.js

@@ -3319,7 +3319,7 @@ const WTDesktopInbox = ({
   const [clearSearchCalled, setClearSearchCalled] = useState(false);
   const columns = React.useMemo(() => props.isSearch ? tableConfig.searchColumns(props) : tableConfig.inboxColumns(props) || [], []);
   const inboxCsvColumns = React.useMemo(() => {
-    var _columns$, _columns$2, _columns$3, _columns$4, _columns$find2;
+    var _columns$, _columns$2, _columns$3, _columns$4, _columns$find3;
     const csvColumns = [{
       Header: (columns === null || columns === void 0 ? void 0 : (_columns$ = columns[0]) === null || _columns$ === void 0 ? void 0 : _columns$.Header) || t("WT_BOOKING_NO"),
       exportAccessor: row => {
@@ -3348,20 +3348,67 @@ const WTDesktopInbox = ({
         return t(`${prefix}_REVENUE_${row.searchData.localityCode}`);
       }
     }];
-    if (columns !== null && columns !== void 0 && columns.some(column => (column === null || column === void 0 ? void 0 : column.id) === "createdTime")) {
+    if (columns !== null && columns !== void 0 && columns.some(column => (column === null || column === void 0 ? void 0 : column.id) === "fillingPoint")) {
       var _columns$find;
       csvColumns.push({
-        Header: (columns === null || columns === void 0 ? void 0 : (_columns$find = columns.find(column => (column === null || column === void 0 ? void 0 : column.id) === "createdTime")) === null || _columns$find === void 0 ? void 0 : _columns$find.Header) || t("CREATED_AT"),
+        Header: (columns === null || columns === void 0 ? void 0 : (_columns$find = columns.find(column => (column === null || column === void 0 ? void 0 : column.id) === "fillingPoint")) === null || _columns$find === void 0 ? void 0 : _columns$find.Header) || t("Filling Point"),
+        exportAccessor: row => {
+          var _row$searchData7, _row$searchData7$fill, _row$searchData8;
+          return (row === null || row === void 0 ? void 0 : (_row$searchData7 = row.searchData) === null || _row$searchData7 === void 0 ? void 0 : (_row$searchData7$fill = _row$searchData7.fillingPointMetadata) === null || _row$searchData7$fill === void 0 ? void 0 : _row$searchData7$fill.name) || (row === null || row === void 0 ? void 0 : (_row$searchData8 = row.searchData) === null || _row$searchData8 === void 0 ? void 0 : _row$searchData8.fillingPointName) || "-";
+        }
+      });
+    }
+    if (columns !== null && columns !== void 0 && columns.some(column => (column === null || column === void 0 ? void 0 : column.id) === "createdTime")) {
+      var _columns$find2;
+      csvColumns.push({
+        Header: (columns === null || columns === void 0 ? void 0 : (_columns$find2 = columns.find(column => (column === null || column === void 0 ? void 0 : column.id) === "createdTime")) === null || _columns$find2 === void 0 ? void 0 : _columns$find2.Header) || t("CREATED_AT"),
         exportAccessor: row => getCreatedAtValue(row)
       });
     }
     csvColumns.push({
-      Header: (columns === null || columns === void 0 ? void 0 : (_columns$find2 = columns.find(column => (column === null || column === void 0 ? void 0 : column.id) === "applicationStatus")) === null || _columns$find2 === void 0 ? void 0 : _columns$find2.Header) || t("WT_STATUS"),
+      Header: (columns === null || columns === void 0 ? void 0 : (_columns$find3 = columns.find(column => (column === null || column === void 0 ? void 0 : column.id) === "applicationStatus")) === null || _columns$find3 === void 0 ? void 0 : _columns$find3.Header) || t("WT_STATUS"),
       exportAccessor: row => {
         var _row$workflowData2, _row$workflowData2$st;
         return row !== null && row !== void 0 && (_row$workflowData2 = row.workflowData) !== null && _row$workflowData2 !== void 0 && (_row$workflowData2$st = _row$workflowData2.state) !== null && _row$workflowData2$st !== void 0 && _row$workflowData2$st.applicationStatus ? t(row.workflowData.state.applicationStatus) : "";
       }
     });
+    if (columns !== null && columns !== void 0 && columns.some(column => (column === null || column === void 0 ? void 0 : column.id) === "vendorName")) {
+      var _columns$find4;
+      csvColumns.push({
+        Header: (columns === null || columns === void 0 ? void 0 : (_columns$find4 = columns.find(column => (column === null || column === void 0 ? void 0 : column.id) === "vendorName")) === null || _columns$find4 === void 0 ? void 0 : _columns$find4.Header) || t("WT_VENDOR_NAME"),
+        exportAccessor: row => {
+          var _row$searchData9, _row$searchData9$vend, _row$searchData0;
+          return (row === null || row === void 0 ? void 0 : (_row$searchData9 = row.searchData) === null || _row$searchData9 === void 0 ? void 0 : (_row$searchData9$vend = _row$searchData9.vendor) === null || _row$searchData9$vend === void 0 ? void 0 : _row$searchData9$vend.name) || (row === null || row === void 0 ? void 0 : (_row$searchData0 = row.searchData) === null || _row$searchData0 === void 0 ? void 0 : _row$searchData0.vendorName) || "-";
+        }
+      });
+    }
+    if (columns !== null && columns !== void 0 && columns.some(column => (column === null || column === void 0 ? void 0 : column.id) === "vehicleNumber")) {
+      var _columns$find5;
+      csvColumns.push({
+        Header: (columns === null || columns === void 0 ? void 0 : (_columns$find5 = columns.find(column => (column === null || column === void 0 ? void 0 : column.id) === "vehicleNumber")) === null || _columns$find5 === void 0 ? void 0 : _columns$find5.Header) || t("WT_VEHICLE_NO"),
+        exportAccessor: row => {
+          var _searchData$vendor, _searchData$vendor$ve;
+          const searchData = row === null || row === void 0 ? void 0 : row.searchData;
+          const mappedVehicle = (searchData === null || searchData === void 0 ? void 0 : searchData.vehicle) || (searchData === null || searchData === void 0 ? void 0 : (_searchData$vendor = searchData.vendor) === null || _searchData$vendor === void 0 ? void 0 : (_searchData$vendor$ve = _searchData$vendor.vehicles) === null || _searchData$vendor$ve === void 0 ? void 0 : _searchData$vendor$ve.find(vehicle => (vehicle === null || vehicle === void 0 ? void 0 : vehicle.id) === (searchData === null || searchData === void 0 ? void 0 : searchData.vehicleId)));
+          return (mappedVehicle === null || mappedVehicle === void 0 ? void 0 : mappedVehicle.registrationNumber) || (mappedVehicle === null || mappedVehicle === void 0 ? void 0 : mappedVehicle.name) || (mappedVehicle === null || mappedVehicle === void 0 ? void 0 : mappedVehicle.type) || (searchData === null || searchData === void 0 ? void 0 : searchData.vehicleName) || (searchData === null || searchData === void 0 ? void 0 : searchData.vehicleRegistrationNo) || "-";
+        }
+      });
+    }
+    if (columns !== null && columns !== void 0 && columns.some(column => (column === null || column === void 0 ? void 0 : column.id) === "driverName")) {
+      var _columns$find6;
+      csvColumns.push({
+        Header: (columns === null || columns === void 0 ? void 0 : (_columns$find6 = columns.find(column => (column === null || column === void 0 ? void 0 : column.id) === "driverName")) === null || _columns$find6 === void 0 ? void 0 : _columns$find6.Header) || t("WT_DRIVER_NAME"),
+        exportAccessor: row => {
+          var _searchData$vendor2, _searchData$vendor2$d, _mappedDriver$owner;
+          const searchData = row === null || row === void 0 ? void 0 : row.searchData;
+          const mappedDriver = (searchData === null || searchData === void 0 ? void 0 : searchData.driver) || (searchData === null || searchData === void 0 ? void 0 : (_searchData$vendor2 = searchData.vendor) === null || _searchData$vendor2 === void 0 ? void 0 : (_searchData$vendor2$d = _searchData$vendor2.drivers) === null || _searchData$vendor2$d === void 0 ? void 0 : _searchData$vendor2$d.find(driver => {
+            var _driver$owner;
+            return (driver === null || driver === void 0 ? void 0 : driver.id) === (searchData === null || searchData === void 0 ? void 0 : searchData.driverId) || (driver === null || driver === void 0 ? void 0 : driver.ownerId) === (searchData === null || searchData === void 0 ? void 0 : searchData.driverId) || (driver === null || driver === void 0 ? void 0 : (_driver$owner = driver.owner) === null || _driver$owner === void 0 ? void 0 : _driver$owner.uuid) === (searchData === null || searchData === void 0 ? void 0 : searchData.driverId);
+          }));
+          return (mappedDriver === null || mappedDriver === void 0 ? void 0 : mappedDriver.name) || (mappedDriver === null || mappedDriver === void 0 ? void 0 : (_mappedDriver$owner = mappedDriver.owner) === null || _mappedDriver$owner === void 0 ? void 0 : _mappedDriver$owner.name) || (searchData === null || searchData === void 0 ? void 0 : searchData.driverName) || "-";
+        }
+      });
+    }
     return csvColumns;
   }, [columns, getCreatedAtValue, t]);
   let result;
@@ -10143,7 +10190,7 @@ const EmployeeApp = ({
   }), /*#__PURE__*/React.createElement(PrivateRoute, {
     path: `${path}/booking-details/:id`,
     component: props => /*#__PURE__*/React.createElement(LayoutWrapper, {
-      layoutClass: "normal"
+      layoutClass: "action"
     }, /*#__PURE__*/React.createElement(ApplicationDetails, Object.assign({}, props, {
       parentRoute: path
     })))
@@ -17661,6 +17708,7 @@ const Filter = ({
       status: null,
       applicationStatus: null,
       fromDate: "",
+      toDate: "",
       fillingPointId: null,
       fillingPoint: null
     };
@@ -17745,11 +17793,56 @@ const Filter = ({
     style: {
       marginTop: "16px"
     }
-  }, /*#__PURE__*/React.createElement("label", null, t("DATE")), /*#__PURE__*/React.createElement(DatePicker, {
-    date: _searchParams === null || _searchParams === void 0 ? void 0 : _searchParams.fromDate,
-    onChange: date => localParamChange({
-      fromDate: date
-    }),
+  }, /*#__PURE__*/React.createElement("label", null, t("FROM_DATE")), /*#__PURE__*/React.createElement(DatePicker, {
+    date: typeof (_searchParams === null || _searchParams === void 0 ? void 0 : _searchParams.fromDate) === "number" ? (() => {
+      const d = new Date(_searchParams.fromDate);
+      const y = d.getFullYear();
+      const m = String(d.getMonth() + 1).padStart(2, "0");
+      const day = String(d.getDate()).padStart(2, "0");
+      return `${y}-${m}-${day}`;
+    })() : _searchParams === null || _searchParams === void 0 ? void 0 : _searchParams.fromDate,
+    onChange: date => {
+      if (date) {
+        const dateParts = date.split("-");
+        const fromDateObj = new Date(dateParts[0], dateParts[1] - 1, dateParts[2]);
+        fromDateObj.setHours(0, 0, 0, 0);
+        localParamChange({
+          fromDate: fromDateObj.getTime()
+        });
+      } else {
+        localParamChange({
+          fromDate: ""
+        });
+      }
+    },
+    max: new Date().toISOString().split("T")[0]
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "search-field-wrapper",
+    style: {
+      marginTop: "16px"
+    }
+  }, /*#__PURE__*/React.createElement("label", null, t("TO_DATE")), /*#__PURE__*/React.createElement(DatePicker, {
+    date: typeof (_searchParams === null || _searchParams === void 0 ? void 0 : _searchParams.toDate) === "number" ? (() => {
+      const d = new Date(_searchParams.toDate);
+      const y = d.getFullYear();
+      const m = String(d.getMonth() + 1).padStart(2, "0");
+      const day = String(d.getDate()).padStart(2, "0");
+      return `${y}-${m}-${day}`;
+    })() : _searchParams === null || _searchParams === void 0 ? void 0 : _searchParams.toDate,
+    onChange: date => {
+      if (date) {
+        const dateParts = date.split("-");
+        const toDateObj = new Date(dateParts[0], dateParts[1] - 1, dateParts[2]);
+        toDateObj.setHours(23, 59, 59, 999);
+        localParamChange({
+          toDate: toDateObj.getTime()
+        });
+      } else {
+        localParamChange({
+          toDate: ""
+        });
+      }
+    },
     max: new Date().toISOString().split("T")[0]
   })), /*#__PURE__*/React.createElement("div", {
     className: "tag-container hide-x-scrollbar"