yangli/worldshine-redesign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix
All checks were successful
Build And Deploy Main / build-and-deploy (push) Successful in 35s
Details

Browse Source
This commit is contained in:
Lixian Zhou
2026-03-12 11:25:36 -04:00
parent e39f1c8fa1
commit 4fffdf1b8c
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/src/components/trans-routes/RoutesDashboard.js
View File

@@ -90,7 +90,6 @@ const RoutesDashboard = () => {
const [customerTypeFixing, setCustomerTypeFixing] = useState({}); const [customerTypeFixing, setCustomerTypeFixing] = useState({});
const [customerSpecialNeedsFixing, setCustomerSpecialNeedsFixing] = useState({}); const [customerSpecialNeedsFixing, setCustomerSpecialNeedsFixing] = useState({});
const [customerNoteFixing, setCustomerNoteFixing] = useState({}); const [customerNoteFixing, setCustomerNoteFixing] = useState({});
const [isFutureScheduleEditMode, setIsFutureScheduleEditMode] = useState(false);
const scheduleImportProgressTimerRef = useRef(null); const scheduleImportProgressTimerRef = useRef(null);
@@ -706,12 +705,6 @@ const RoutesDashboard = () => {
const yesterday = new Date(); const yesterday = new Date();
const tomorrow = new Date(); const tomorrow = new Date();
const isFutureScheduleSelected = moment(dateSelected).startOf('day').isAfter(moment().startOf('day')); const isFutureScheduleSelected = moment(dateSelected).startOf('day').isAfter(moment().startOf('day'));
const shouldShowFutureEditView = isFutureScheduleSelected && isFutureScheduleEditMode;
const shouldShowReadOnlyOverview = !isFutureScheduleSelected || !isFutureScheduleEditMode;
useEffect(() => {
setIsFutureScheduleEditMode(false);
}, [dateSelected]);
const startScheduleImportProgress = (label) => { const startScheduleImportProgress = (label) => {
if (scheduleImportProgressTimerRef.current) { if (scheduleImportProgressTimerRef.current) {
@@ -1771,7 +1764,7 @@ const RoutesDashboard = () => {
{isFutureScheduleSelected && <div className="app-main-content-fields-section with-function"> {isFutureScheduleSelected && <div className="app-main-content-fields-section with-function">
{/* <button type="button" className="btn btn-primary btn-sm me-2" onClick={()=> validateSchedule()}><Check size={16} className="me-2"></Check> Validate and Finish Planning</button> */} {/* <button type="button" className="btn btn-primary btn-sm me-2" onClick={()=> validateSchedule()}><Check size={16} className="me-2"></Check> Validate and Finish Planning</button> */}
</div>} </div>}
{shouldShowReadOnlyOverview && <div className="list row"> { (dateSelected <= new Date() || !dateSelected) && <div className="list row">
{ {
showCopyDateTargetLoading ? <><Spinner></Spinner></> : <> showCopyDateTargetLoading ? <><Spinner></Spinner></> : <>
<div className="col-md-12 mb-4"> <div className="col-md-12 mb-4">
@@ -1821,7 +1814,7 @@ const RoutesDashboard = () => {
</div>} </div>}
{ {
shouldShowFutureEditView && <> dateSelected > new Date() && <>
{errorMessage && <div className="alert alert-danger alert-dismissible fade show" role="alert"> {errorMessage && <div className="alert alert-danger alert-dismissible fade show" role="alert">
{errorMessage} {errorMessage}
<button onClick={() => setErrorMessage(undefined)} type="button" className="btn-close" data-bs-dismiss="alert" aria-label="Close"></button> <button onClick={() => setErrorMessage(undefined)} type="button" className="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
@@ -1940,7 +1933,7 @@ const RoutesDashboard = () => {
</Dropdown.Toggle> </Dropdown.Toggle>
<Dropdown.Menu as={customMenuOriginDate}/> <Dropdown.Menu as={customMenuOriginDate}/>
</Dropdown> </Dropdown>
{isFutureScheduleSelected && isFutureScheduleEditMode && <> {isFutureScheduleSelected && <>
<Dropdown <Dropdown
key={'import-from-date'} key={'import-from-date'}
id="import-from-date" id="import-from-date"
@@ -1976,11 +1969,6 @@ const RoutesDashboard = () => {
</>} </>}
</> </>
} }
{isFutureScheduleSelected && !isFutureScheduleEditMode && AuthService.canAddOrEditRoutes() && (
<button className="btn btn-primary me-2" onClick={() => setIsFutureScheduleEditMode(true)}>
Edit Schedule
</button>
)}
{!isFutureScheduleSelected && <button className="btn btn-primary me-2" onClick={() => goToCreateRoute()}><Plus size={16}></Plus>Add New Route</button>} {!isFutureScheduleSelected && <button className="btn btn-primary me-2" onClick={() => goToCreateRoute()}><Plus size={16}></Plus>Add New Route</button>}
</> </>
} }