Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

front: drop trainsDurationsIntervals #9863

Merged
merged 1 commit into from
Nov 27, 2024
Merged

front: drop trainsDurationsIntervals #9863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 23 additions & 36 deletions front/src/modules/trainschedule/components/Timetable/Timetable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { useMemo, useState } from 'react';

import cx from 'classnames';
import dayjs from 'dayjs';
import { compact } from 'lodash';
import { useTranslation } from 'react-i18next';
import { useSelector } from 'react-redux';

Expand All @@ -13,7 +12,6 @@ import ConflictsList from 'modules/conflict/components/ConflictsList';
import { updateSelectedTrainId } from 'reducers/simulationResults';
import { getTrainIdUsedForProjection } from 'reducers/simulationResults/selectors';
import { useAppDispatch } from 'store';
import { distributedIntervalsFromArrayOfValues } from 'utils/numbers';

import TimetableToolbar from './TimetableToolbar';
import TimetableTrainCard from './TimetableTrainCard';
Expand Down Expand Up @@ -57,16 +55,6 @@ const Timetable = ({
const trainIdUsedForProjection = useSelector(getTrainIdUsedForProjection);
const dispatch = useAppDispatch();

const trainsDurationsIntervals = useMemo(
() =>
displayedTrainSchedules.length > 0
? distributedIntervalsFromArrayOfValues(
compact(displayedTrainSchedules.map((train) => train.duration))
)
: [],
[displayedTrainSchedules]
);

const toggleShowTrainDetails = () => {
setShowTrainDetails(!showTrainDetails);
};
Expand Down Expand Up @@ -152,30 +140,29 @@ const Timetable = ({
trainSchedules={trainSchedules}
isInSelection={selectedTrainIds.length > 0}
/>
{trainsDurationsIntervals &&
displayedTrainSchedules.map((train: TrainScheduleWithDetails, index) => (
<div key={`timetable-train-card-${train.id}-${train.trainName}`}>
{showDepartureDates[index] && (
<div className="scenario-timetable-departure-date">
{currentDepartureDates[index]}
</div>
)}
<TimetableTrainCard
isInSelection={selectedTrainIds.includes(train.id)}
handleSelectTrain={handleSelectTrain}
train={train}
isSelected={infraState === 'CACHED' && selectedTrainId === train.id}
isModified={train.id === trainIdToEdit}
setDisplayTrainScheduleManagement={setDisplayTrainScheduleManagement}
upsertTrainSchedules={upsertTrainSchedules}
setTrainIdToEdit={setTrainIdToEdit}
removeTrains={removeAndUnselectTrains}
projectionPathIsUsed={
infraState === 'CACHED' && trainIdUsedForProjection === train.id
}
/>
</div>
))}
{displayedTrainSchedules.map((train: TrainScheduleWithDetails, index) => (
<div key={`timetable-train-card-${train.id}-${train.trainName}`}>
{showDepartureDates[index] && (
<div className="scenario-timetable-departure-date">
{currentDepartureDates[index]}
</div>
)}
<TimetableTrainCard
isInSelection={selectedTrainIds.includes(train.id)}
handleSelectTrain={handleSelectTrain}
train={train}
isSelected={infraState === 'CACHED' && selectedTrainId === train.id}
isModified={train.id === trainIdToEdit}
setDisplayTrainScheduleManagement={setDisplayTrainScheduleManagement}
upsertTrainSchedules={upsertTrainSchedules}
setTrainIdToEdit={setTrainIdToEdit}
removeTrains={removeAndUnselectTrains}
projectionPathIsUsed={
infraState === 'CACHED' && trainIdUsedForProjection === train.id
}
/>
</div>
))}
<div
className={cx('bottom-timetables-trains', {
'empty-list': trainSchedulesWithDetails.length === 0,
Expand Down
15 changes: 0 additions & 15 deletions front/src/utils/numbers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,6 @@ export function valueToInterval(value?: number, intervals?: number[]) {
return undefined;
}

/**
* This helper takes an array of numbers an determinate 3 distributed intervals based upon the numbers from the array
*/
export function distributedIntervalsFromArrayOfValues(values: number[]) {
values.sort((a, b) => a - b);
const valuesCount = values.length;
const indices = [Math.floor(valuesCount / 3), Math.floor((2 * valuesCount) / 3)];
const intervals = [
values[0],
...indices.map((i) => (valuesCount % 2 === 0 ? (values[i] + values[i - 1]) / 2 : values[i])),
values[valuesCount - 1],
];
return intervals;
}

export function isFloat(n: number) {
return Number(n) === n && n % 1 !== 0;
}
Expand Down
Loading