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

Merged
merged 2 commits into from
Oct 21, 2024
Merged

front: display conflicts on the space time chart #9247

merged 2 commits into from
Oct 21, 2024

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?

@emersion emersion requested a review from theocrsb October 14, 2024 13:26
@github-actions github-actions bot removed the area:front Work on Standard OSRD Interface modules label Oct 14, 2024
@emersion
Copy link
Member Author

Updated with a settings panel to show/hide conflicts.

theocrsb
theocrsb approved these changes Oct 14, 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.

tested

clarani
clarani requested changes Oct 16, 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.

I'm ok with the 1st commit if you want to merge it without the second one.

3 remarks:

  • can you make the panel less transparent ? Like the one on the GEV ?
    image

  • Bug spotted
    image

  • Bug spotted
    image

front/src/modules/simulationResult/components/ManchetteWithSpaceTimeChart/Settings.tsx Outdated Show resolved Hide resolved
front/src/modules/simulationResult/components/ManchetteWithSpaceTimeChart/Settings.tsx Outdated Show resolved Hide resolved
@emersion
Copy link
Member Author

emersion commented Oct 16, 2024 •
edited
Loading

can you make the panel less transparent ? Like the one on the GEV ?

Done!

Bug spotted

Indeed, fixed.

Bug spotted

That second one is fixed here: OpenRailAssociation/osrd-ui#647

@emersion emersion requested a review from clarani October 16, 2024 10:01
@emersion
Copy link
Member Author

Rebased to resolve conflicts and updated to follow this mockup:

@clarani
Copy link
Contributor

clarani commented Oct 21, 2024

LGTM ✅

@emersion emersion added this pull request to the merge queue Oct 21, 2024
Merged via the queue into dev with commit 052b8c0 Oct 21, 2024
24 checks passed
@emersion emersion deleted the emr/conflicts branch October 21, 2024 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@theocrsb theocrsb theocrsb approved these changes

@clarani clarani clarani approved these changes

@flomonster flomonster flomonster approved these changes

Assignees
No one assigned
Labels
None yet
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