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: select op with map when add train #9790

Merged
merged 2 commits into from
Jan 13, 2025
Merged

front: select op with map when add train #9790

merged 2 commits into from
Jan 13, 2025

Conversation

theocrsb
Copy link
Contributor

@theocrsb theocrsb commented Nov 20, 2024 •
edited
Loading

-bold pr on hover (for PRs on same track)
-select pr on map and choose track

depends: #9800 and #10157
closes /~https://github.com/osrd-project/osrd-confidential/issues/777

@theocrsb theocrsb force-pushed the tce/select-op-on-map branch 2 times, most recently from 5f47a24 to 3de78a8 Compare November 25, 2024 08:02
@github-actions github-actions bot added the area:front Work on Standard OSRD Interface modules label Nov 25, 2024
@codecov-commenter
Copy link

codecov-commenter commented Nov 25, 2024 •
edited
Loading

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

Attention: Patch coverage is 91.69550% with 24 lines in your changes missing coverage. Please review.

Project coverage is 81.62%. Comparing base (62932d4) to head (f6bc36a).
Report is 8 commits behind head on dev.

Files with missing lines Patch % Lines
...src/modules/pathfinding/helpers/getStepLocation.ts 0.00% 14 Missing ⚠️
front/src/modules/pathfinding/utils.ts 0.00% 5 Missing ⚠️
front/src/reducers/osrdconf/helpers.ts 71.42% 4 Missing ⚠️
...inschedule/components/ManageTrainSchedule/types.ts 0.00% 1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files 
@@            Coverage Diff             @@
##              dev    #9790      +/-   ##
==========================================
- Coverage   81.63%   81.62%   -0.02%     
==========================================
  Files        1063     1065       +2     
  Lines      105426   105644     +218     
  Branches      722      723       +1     
==========================================
+ Hits        86062    86229     +167     
- Misses      19323    19374      +51     
  Partials       41       41
Flag Coverage Δ
editoast 73.59% <ø> (-0.11%) ⬇️
front 89.34% <91.69%> (+<0.01%) ⬆️
gateway 2.18% <ø> (ø)
osrdyne 3.28% <ø> (ø)
railjson_generator 87.50% <ø> (ø)
tests 87.05% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@theocrsb theocrsb force-pushed the tce/select-op-on-map branch 3 times, most recently from 635d7fa to b1c1b48 Compare November 29, 2024 14:59
@theocrsb theocrsb force-pushed the tce/select-op-on-map branch 8 times, most recently from c0f0025 to 8bdbaf3 Compare December 10, 2024 16:27
@theocrsb theocrsb force-pushed the tce/select-op-on-map branch 3 times, most recently from 1030168 to b4648bb Compare December 17, 2024 09:29
@theocrsb theocrsb force-pushed the tce/select-op-on-map branch 5 times, most recently from f323ca1 to 9a2eea0 Compare December 19, 2024 10:08
@theocrsb theocrsb requested a review from clarani December 19, 2024 10:08
@theocrsb theocrsb marked this pull request as ready for review December 20, 2024 08:02
@theocrsb theocrsb requested a review from a team as a code owner December 20, 2024 08:02
@theocrsb theocrsb force-pushed the tce/select-op-on-map branch from 5d252b3 to b1bbf6e Compare January 3, 2025 11:10
@theocrsb theocrsb requested a review from clarani January 6, 2025 13:03
@theocrsb theocrsb force-pushed the tce/select-op-on-map branch from 606dda3 to 56ed5de Compare January 7, 2025 06:53
clarani
clarani reviewed Jan 7, 2025
View reviewed changes
front/src/reducers/osrdconf/helpers.ts Outdated Show resolved Hide resolved
front/src/reducers/osrdconf/helpers.ts Outdated Show resolved Hide resolved
front/src/modules/pathfinding/helpers/getStepLocation.ts Outdated Show resolved Hide resolved
...edule/components/ManageTrainSchedule/ManageTrainScheduleMap/OperationalPointPopupDetails.tsx Outdated Show resolved Hide resolved
front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx Outdated Show resolved Hide resolved
front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx Outdated Show resolved Hide resolved
front/src/modules/trainschedule/components/ManageTrainSchedule/Map.tsx Outdated Show resolved Hide resolved
...les/trainschedule/components/ManageTrainSchedule/ManageTrainScheduleMap/AddPathStepPopup.tsx Outdated Show resolved Hide resolved
@theocrsb theocrsb force-pushed the tce/select-op-on-map branch from 933ebab to 0e67e7a Compare January 7, 2025 11:31
@theocrsb theocrsb force-pushed the tce/select-op-on-map branch from cc55f72 to f7aceec Compare January 7, 2025 18:17
@theocrsb theocrsb requested a review from clarani January 8, 2025 08:32
clarani
clarani approved these changes Jan 8, 2025
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 ✅

front/src/modules/pathfinding/helpers/getStepLocation.ts Outdated Show resolved Hide resolved
@theocrsb theocrsb force-pushed the tce/select-op-on-map branch 2 times, most recently from f0ac376 to 16e4ada Compare January 8, 2025 12:20
clarani
clarani approved these changes Jan 8, 2025
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, but I can't test ✅

@theocrsb theocrsb force-pushed the tce/select-op-on-map branch 2 times, most recently from 9280d28 to 324cd16 Compare January 9, 2025 08:56
clarani
clarani approved these changes Jan 9, 2025
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 ✅

@theocrsb theocrsb force-pushed the tce/select-op-on-map branch 2 times, most recently from e26ef35 to 27f0e05 Compare January 9, 2025 12:41
Uriel-Sautron
Uriel-Sautron approved these changes Jan 9, 2025
View reviewed changes
Copy link
Contributor

@Uriel-Sautron Uriel-Sautron left a comment

Choose a reason for hiding this comment

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

Good work, LGTM tested !!!

@theocrsb
front: select op with map when add train
70d8ad1 
-bold pr on hover (for PRs on same track)
-select pr on map and choose track

Signed-off-by: theocrsb <theo_crosbie@yahoo.fr>
@theocrsb
front: fix duplicate op in timestops inputs
f6bc36a 
comparing ops and pathsteps with their uic and ch code is sometimes not enough.
compare them also with position on path to differenciate them.

Signed-off-by: theocrsb <theo_crosbie@yahoo.fr>
@theocrsb theocrsb force-pushed the tce/select-op-on-map branch from bc55e15 to f6bc36a Compare January 9, 2025 17:23
@theocrsb theocrsb added this pull request to the merge queue Jan 13, 2025
Merged via the queue into dev with commit 856e5b9 Jan 13, 2025
27 checks passed
@theocrsb theocrsb deleted the tce/select-op-on-map branch January 13, 2025 08:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Uriel-Sautron Uriel-Sautron Uriel-Sautron approved these changes

@clarani clarani clarani approved these changes

@SharglutDev SharglutDev Awaiting requested review from SharglutDev

Assignees

@younesschrifi younesschrifi

@theocrsb theocrsb

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.
5 participants
@theocrsb @codecov-commenter @clarani @Uriel-Sautron @younesschrifi