From 91212ab75915b58809694db63f2cff9abde2cce7 Mon Sep 17 00:00:00 2001 From: Lixian Zhou Date: Mon, 9 Mar 2026 16:07:06 -0400 Subject: [PATCH] fix --- .../trans-routes/RoutesDashboard.js | 66 +------------------ 1 file changed, 2 insertions(+), 64 deletions(-) diff --git a/client/src/components/trans-routes/RoutesDashboard.js b/client/src/components/trans-routes/RoutesDashboard.js index 82e3b1a..8f14802 100644 --- a/client/src/components/trans-routes/RoutesDashboard.js +++ b/client/src/components/trans-routes/RoutesDashboard.js @@ -4,11 +4,11 @@ import { useNavigate, useSearchParams } from "react-router-dom"; import { selectInboundRoutes, selectTomorrowAllRoutes, selectTomorrowInboundRoutes, selectTomorrowOutboundRoutes, selectHistoryInboundRoutes, selectHistoryRoutes, selectHistoryOutboundRoutes, selectOutboundRoutes, selectAllRoutes, selectAllActiveVehicles, selectAllActiveDrivers, transRoutesSlice } from "./../../store"; import RoutesSection from "./RoutesSection"; import PersonnelSection from "./PersonnelSection"; -import { AuthService, CustomerService, TransRoutesService, DriverService, EventsService, SignatureRequestService, DailyRoutesTemplateService } from "../../services"; +import { AuthService, CustomerService, TransRoutesService, DriverService, EventsService, DailyRoutesTemplateService } from "../../services"; import { PERSONAL_ROUTE_STATUS, ROUTE_STATUS, reportRootUrl, CUSTOMER_TYPE_TEXT, PERSONAL_ROUTE_STATUS_TEXT, PICKUP_STATUS, PICKUP_STATUS_TEXT, REPORT_TYPE } from "../../shared"; import moment from 'moment'; import DatePicker from "react-datepicker"; -import { CalendarWeek, ClockHistory, Copy, Download, Eraser, Plus, Clock, Send, Filter, CalendarCheck, Check } from "react-bootstrap-icons"; +import { CalendarWeek, ClockHistory, Copy, Download, Eraser, Plus, Clock, Filter, CalendarCheck, Check } from "react-bootstrap-icons"; import { Breadcrumb, Tabs, Tab, Dropdown, Spinner, Modal, Button, ProgressBar } from "react-bootstrap"; import RouteCustomerTable from "./RouteCustomerTable"; @@ -40,10 +40,8 @@ const RoutesDashboard = () => { const [routesForSignature, setRoutesForSignature] = useState(allRoutes); const [currentTab, setCurrentTab] = useState('allRoutesOverview'); const [sorting, setSorting] = useState({key: '', order: ''}); - const [selectedItems, setSelectedItems] = useState([]); const [showFilterDropdown, setShowFilterDropdown] = useState(false); const [showDateDropdown, setShowDateDropdown] = useState(false); - const [showSignatureRequestLoading, setShowSignatureRequestLoading] = useState(false); const [routesForShowing, setRoutesForShowing] = useState(allRoutes); const [routesInboundForShowing, setRoutesInboundForShowing] = useState(inboundRoutes); const [routesOutboundForShowing, setRoutesOutboundForShowing] = useState(outboundRoutes); @@ -750,7 +748,6 @@ const RoutesDashboard = () => { setCurrentTab(k); setKeyword(''); setSorting({key: '', order: ''}); - setSelectedItems([]); setDateSelected(new Date()); setOriginDateSelected(undefined); setTargetedDateSelected(undefined); @@ -1141,43 +1138,6 @@ const RoutesDashboard = () => { setSorting(newSorting); } - const toggleSelectedAllItems = () => { - const filteredSignatures = routesForSignature && routesForSignature.filter((route) => { - if (!selectedDriver) { - return route; - } else { - return route?.driver === selectedDriver; - } - }).filter(((route) => route.name?.toLowerCase().includes(keyword?.toLowerCase()) || drivers.find((d) => d.id === route?.driver)?.name?.toLowerCase().includes(keyword?.toLowerCase()))); - if (selectedItems.length !== filteredSignatures.length || selectedItems.length === 0) { - const newSelectedItems = [...filteredSignatures].map((sig) => sig.id); - setSelectedItems(newSelectedItems); - } else { - setSelectedItems([]); - } - } - - const toggleItem = (id) => { - if (selectedItems.includes(id)) { - const newSelectedItems = [...selectedItems].filter((item) => item !== id); - setSelectedItems(newSelectedItems); - } else { - const newSelectedItems = [...selectedItems, id]; - setSelectedItems(newSelectedItems); - } - } - - const checkSelectAll = () => { - const filteredSignatures = routesForSignature && routesForSignature.filter((route) => { - if (!selectedDriver) { - return route; - } else { - return route?.driver === selectedDriver; - } - }).filter((route) => route.name?.toLowerCase().includes(keyword?.toLowerCase()) || drivers.find((d) => d.id === route?.driver)?.name?.toLowerCase().includes(keyword?.toLowerCase())); - return selectedItems.length === filteredSignatures.length && selectedItems.length > 0; - } - const pickOriginDateSelected = (v) => { setOriginDateSelected(v); setDateSelected(v); @@ -1452,24 +1412,6 @@ const RoutesDashboard = () => { - const generateSignatureRequest = async () => { - setShowSignatureRequestLoading(true); - for (const id of selectedItems) { - const currentRoute = routesForSignature.find(route => route?.id === id); - const currentDriver = drivers.find(driver => driver?.id === currentRoute?.driver); - await SignatureRequestService.createNewSignatureRequest({ - driver_id: currentRoute?.id, - driver_name: currentDriver?.name, - route_id: currentRoute?.id, - route_date: currentRoute?.schedule_date, - route_name: currentRoute?.name, - status: 'active', - }) - } - setShowSignatureRequestLoading(false); - } - - // Save template modal handlers const openSaveTemplateModal = () => { setShowSaveTemplateModal(true); @@ -1786,7 +1728,6 @@ const RoutesDashboard = () => { - { columns.map((column, index) => - @@ -1925,8 +1865,6 @@ const RoutesDashboard = () => { - - } { currentTab === 'allRoutesStatus' && <>
toggleSelectedAllItems()}> No. @@ -1806,7 +1747,6 @@ const RoutesDashboard = () => { } }).filter((route) => route.name?.toLowerCase().includes(keyword?.toLowerCase()) || drivers.find((d) => d.id === route?.driver)?.name?.toLowerCase().includes(keyword?.toLowerCase()))?.map(({id, name, end_time, driver, type, signature}, index) => { return (
toggleItem(id)}/> {index + 1} {name} {drivers.find((d) => d.id === driver)?.name}