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

fix: fixed the padding in the punctuality display (#122) #501

Merged
merged 38 commits into from
Jan 17, 2025

Conversation

tobe-official
Copy link
Collaborator

No description provided.

rawi-coding and others added 30 commits December 4, 2024 17:20
# Conflicts:
#	das_client/lib/app/pages/journey/train_journey/widgets/train_journey.dart
#	das_client/lib/model/journey/base_data.dart
#	das_client/lib/model/journey/datatype.dart
#	das_client/lib/model/journey/metadata.dart
#	das_client/lib/sfera/src/mapper/sfera_model_mapper.dart
#	das_client/lib/sfera/src/model/network_specific_parameter.dart
#	das_client/test/sfera/mapper/sfera_mapper_test.dart
#	das_client/test_resources/sp/SFERA_SP_9999_2.xml
#	das_client/test_resources/sp/SFERA_SP_9999_3.xml
#	das_client/test_resources/sp/SFERA_SP_9999_4.xml
# Conflicts:
#	das_client/integration_test/test/train_journey_table_test.dart
#	das_client/lib/app/pages/journey/train_journey/widgets/table/additional_speed_restriction_row.dart
#	das_client/lib/app/pages/journey/train_journey/widgets/table/base_row_builder.dart
#	das_client/lib/app/pages/journey/train_journey/widgets/table/cab_signaling_row.dart
#	das_client/lib/app/pages/journey/train_journey/widgets/table/cells/bracket_station_cell_body.dart
#	das_client/lib/app/pages/journey/train_journey/widgets/table/cells/route_cell_body.dart
#	das_client/lib/app/pages/journey/train_journey/widgets/table/protection_section_row.dart
#	das_client/lib/app/pages/journey/train_journey/widgets/table/service_point_row.dart
#	das_client/lib/app/pages/journey/train_journey/widgets/train_journey.dart
#	das_client/lib/model/journey/cab_signaling.dart
#	das_client/lib/model/journey/track_equipment.dart
…so added Duration into Metadata and changed the UI so that it only shows the delay from the metadata. Still have to check if it is needed to add hours
# Conflicts:
#	das_client/test/sfera/mapper/sfera_mapper_test.dart
Copy link
Collaborator

@Grodien Grodien left a comment

Choose a reason for hiding this comment

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

lgtm

@Grodien Grodien merged commit 17511ff into main Jan 17, 2025
11 checks passed
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.

3 participants