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

Jump to bottom

front: display conflicts on the space time chart #9247

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

front: display conflicts on the space time chart #9247

wants to merge 2 commits into from
+116 −35

Conversation

emersion
Copy link
Member

@emersion emersion commented Oct 8, 2024 •
edited
Loading

Closes: #8683
Depends on: #9205

@github-actions github-actions bot added the area:editoast Work on Editoast Service label Oct 8, 2024
@emersion emersion force-pushed the emr/conflicts branch 2 times, most recently from 8ad85bd to 5f7a88d Compare October 9, 2024 08:53
@github-actions github-actions bot added the area:front Work on Standard OSRD Interface modules label Oct 9, 2024
@emersion emersion marked this pull request as ready for review October 9, 2024 08:53
@emersion emersion requested review from a team as code owners October 9, 2024 08:53
@emersion emersion requested a review from eckter October 9, 2024 08:53
@emersion emersion marked this pull request as draft October 9, 2024 08:54
@emersion emersion requested review from clarani and theocrsb and removed request for eckter October 9, 2024 08:54
clarani
clarani reviewed Oct 9, 2024
View reviewed changes
Copy link
Contributor

@clarani clarani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM except the hook :)

front/src/applications/operationalStudies/views/SimulationResults.tsx Outdated Show resolved Hide resolved
theocrsb
theocrsb approved these changes Oct 9, 2024
View reviewed changes
Copy link
Contributor

@theocrsb theocrsb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and tested

@emersion emersion removed request for a team October 10, 2024 07:45
@github-actions github-actions bot removed the area:editoast Work on Editoast Service label Oct 10, 2024
@emersion emersion marked this pull request as ready for review October 10, 2024 07:45
@emersion emersion requested a review from clarani October 10, 2024 07:58
flomonster
flomonster approved these changes Oct 11, 2024
View reviewed changes
Copy link
Contributor

@flomonster flomonster left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested

@clarani
Copy link
Contributor

clarani commented Oct 11, 2024

LGTM, but we have to wait for this PR

@emersion
Copy link
Member Author

Do we? Why?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@flomonster flomonster flomonster approved these changes

@theocrsb theocrsb theocrsb approved these changes

@clarani clarani Awaiting requested review from clarani

At least 0 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
area:front Work on Standard OSRD Interface modules
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

front: wire up conflicts layer in space time chart
4 participants
@emersion @clarani @flomonster @theocrsb