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.

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

Adjustment of STDCM interface (Part 1) #8804

Merged
merged 3 commits into from
Sep 10, 2024
Merged

Adjustment of STDCM interface (Part 1) #8804

merged 3 commits into from
Sep 10, 2024

Conversation

kmer2016
Copy link
Contributor

@kmer2016 kmer2016 commented Sep 9, 2024

There are some differences between mockup and the STDCM interface implementation. This PR fix three of them

@kmer2016 kmer2016 requested a review from a team as a code owner September 9, 2024 13:12
@codecov-commenter
Copy link

codecov-commenter commented Sep 9, 2024

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

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 37.01%. Comparing base (ef82519) to head (7e6d45a).
Report is 33 commits behind head on dev.

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

Additional details and impacted files
@@             Coverage Diff              @@
##                dev    #8804      +/-   ##
============================================
+ Coverage     36.97%   37.01%   +0.04%     
- Complexity     2208     2212       +4     
============================================
  Files          1255     1253       -2     
  Lines        113846   113882      +36     
  Branches       3188     3188              
============================================
+ Hits          42099    42158      +59     
+ Misses        69852    69828      -24     
- Partials       1895     1896       +1     
Flag Coverage Δ
core 74.79% <ø> (+0.06%) ⬆️
editoast 72.35% <ø> (+0.28%) ⬆️
front 14.95% <ø> (-0.02%) ⬇️
gateway 2.20% <ø> (ø)
osrdyne 2.71% <ø> (ø)
railjson_generator 87.49% <ø> (ø)
tests 86.37% <ø> (ø)

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.

@kmer2016 kmer2016 changed the title Cnh/fix stdcm ux fix STDCM UI Sep 9, 2024
@kmer2016 kmer2016 changed the title fix STDCM UI Adjustment of STDCM interface Sep 9, 2024
In the mockup, the consist and itinerary forms have fixed widths, while the map is responsive.

Signed-off-by: nncluzu <[email protected]>
The Select component from ui-core defines a custom-select CSS class, which conflicts with Bootstrap's class of the same name. For now, we override the Bootstrap class with the ui-core version, pending a rename in ui-core.

Signed-off-by: nncluzu <[email protected]>
Copy link
Contributor

@SharglutDev SharglutDev left a comment

Choose a reason for hiding this comment

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

Thank you for the PR ! Consist/itinerary and blue>black label fixes are good for me but still have some issues with the select one.

@Caracol3
Copy link
Contributor

Caracol3 commented Sep 10, 2024

image image

If the width should be fixed, are we sure to want to keep the icon ? When french langage is on, it prevents to put 'code de composition on one line'. Or maybe we should put it under the icon ?

If we keep it like that, i think it would be good to at least add a padding between the icon and the text. For me, the two are too close.

EDIT: in the sketch its called 'code compo.' , this solves the problem.

Copy link
Contributor

@SharglutDev SharglutDev 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

@Caracol3
Copy link
Contributor

In consist component, like 'tracion engine', 'speed limits' and 'composition code' should be bold.

@kmer2016
Copy link
Contributor Author

Thank you for your review, @Caracol3. I will address your feedback in a separate PR where I will directly implement the Code Compo. component.

@kmer2016 kmer2016 changed the title Adjustment of STDCM interface Adjustment of STDCM interface (Part 1) Sep 10, 2024
Copy link
Contributor

@Caracol3 Caracol3 left a comment

Choose a reason for hiding this comment

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

lgtm

@kmer2016 kmer2016 added this pull request to the merge queue Sep 10, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 10, 2024
@kmer2016 kmer2016 added this pull request to the merge queue Sep 10, 2024
Merged via the queue into dev with commit fb97192 Sep 10, 2024
24 checks passed
@kmer2016 kmer2016 deleted the cnh/fix-stdcm-ux branch September 10, 2024 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants