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

editoast: fix train arrival_time when adding a margin #6899

Merged
merged 2 commits into from
Mar 15, 2024
Merged

editoast: fix train arrival_time when adding a margin #6899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9dc518
editoast: fix train arrival_time
younesschrifi Mar 14, 2024
19d75e8
front: set eco in the train card when there is a margin
younesschrifi Mar 14, 2024
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
16 changes: 10 additions & 6 deletions editoast/src/models/timetable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,23 @@ impl Timetable {

let result_train = &simulation_output.base_simulation.0;
let result_train_eco = &simulation_output.eco_simulation;
let arrival_time = result_train
.head_positions
.last()
.expect("Train should have at least one position")
.time
+ train_schedule.departure_time;
let eco = result_train_eco
.as_ref()
.map(|eco| eco.0.mechanical_energy_consumed);
let mechanical_energy_consumed = MechanicalEnergyConsumedBaseEco {
base: result_train.mechanical_energy_consumed,
eco,
};

let arrival_time = if let Some(eco) = result_train_eco {
eco.0.head_positions.last()
} else {
result_train.head_positions.last()
}
.expect("Train should have at least one position")
.time
+ train_schedule.departure_time;

let path_length = result_train.stops.last().unwrap().position;
let stops_count = result_train
.stops
Expand Down
10 changes: 8 additions & 2 deletions front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainSchedule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,16 @@ export default function DriverTrainSchedule({
train: Train;
rollingStock: LightRollingStock;
}) {
const [baseOrEco, setBaseOrEco] = useState<BaseOrEcoType>(BaseOrEco.base);
const [baseOrEco, setBaseOrEco] = useState<BaseOrEcoType>(
train.eco ? BaseOrEco.eco : BaseOrEco.base
);

useEffect(() => {
if (baseOrEco === BaseOrEco.eco && !train[baseOrEco]) setBaseOrEco(BaseOrEco.base);
if (baseOrEco === BaseOrEco.eco && !train[baseOrEco]) {
setBaseOrEco(BaseOrEco.base);
} else {
setBaseOrEco(BaseOrEco.eco);
}
}, [train]);

return (
Expand Down
Loading