Skip to content

Commit 80973c5

Browse files
committed
stdcm: increase pathfinding timeout
1 parent 3eecd56 commit 80973c5

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

front/src/modules/conflict/components/ConflictCardV2.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ const ConflictCardV2 = ({
1515
onConflictClick: (conflict: ConflictWithTrainNames) => void;
1616
}) => {
1717
const { t } = useTranslation(['operationalStudies/scenario']);
18-
18+
const start_time = formatToIsoDate(conflict.start_time, true);
19+
const end_time = formatToIsoDate(conflict.end_time, true);
1920
return (
2021
<div
2122
className="conflict-card"
@@ -35,11 +36,11 @@ const ConflictCardV2 = ({
3536
<p>{t(`${conflict.conflict_type}`)}</p>
3637
</div>
3738
<div className="conflict-times">
38-
<div className="start-time" title={formatToIsoDate(conflict.start_time, true)}>
39-
{formatToIsoDate(conflict.start_time, true)}
39+
<div className="start-time" title={start_time}>
40+
{start_time}
4041
</div>
41-
<div className="end-time" title={formatToIsoDate(conflict.end_time, true)}>
42-
{formatToIsoDate(conflict.end_time, true)}
42+
<div className="end-time" title={end_time}>
43+
{end_time}
4344
</div>
4445
</div>
4546
</div>

front/src/utils/date.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ dayjs.extend(utc);
1212
dayjs.extend(timezone);
1313
dayjs.extend(customParseFormat);
1414

15+
const userTimeZone = dayjs.tz.guess(); // Format : 'Europe/Paris'
16+
1517
/**
1618
* @param dateTimeString date string in ISO format
1719
* @returns string "HH:MM:SS"
@@ -59,8 +61,7 @@ export function dateTimeFormatting(
5961
// Force interpreting the date in UTC
6062
const dateToUTC = dayjs(date).utc(isUTC);
6163
const dateFormat = withoutTime ? 'D MMM YYYY' : 'D MMM YYYY HH:mm';
62-
const tz = dayjs.tz.guess();
63-
return dateToUTC.locale(locale).tz(tz).format(dateFormat).replace(/\./gi, '');
64+
return dateToUTC.locale(locale).tz(userTimeZone).format(dateFormat).replace(/\./gi, '');
6465
}
6566

6667
/**
@@ -73,7 +74,6 @@ export const dateTimeToIso = (inputDateTime: string) => {
7374
// Regex to check format 1234-56-78T12:00:00(:00)
7475
const inputDateTimeRegex = /^\d{4}-\d{2}-\d{2}[T\s]\d{2}:\d{2}(?::\d{2}){0,1}$/;
7576
if (inputDateTimeRegex.test(inputDateTime)) {
76-
const userTimeZone = dayjs.tz.guess(); // Format : 'Europe/Paris'
7777
return dayjs.tz(inputDateTime, userTimeZone).format();
7878
}
7979
return null;
@@ -85,7 +85,6 @@ export const dateTimeToIso = (inputDateTime: string) => {
8585
* @return an ISO 8601 date (e.g. 2024-04-25T08:30:00+02:00)
8686
*/
8787
export const formatToIsoDate = (date: number | string, formatDate: boolean = false) => {
88-
const userTimeZone = dayjs.tz.guess(); // Format : 'Europe/Paris'
8988
const format = formatDate ? 'D/MM/YYYY HH:mm:ss' : '';
9089
return dayjs.tz(date, userTimeZone).format(format);
9190
};

0 commit comments

Comments
 (0)