feat: added punctuality display (#122) #473

tobe-official · 2024-12-20T11:43:57Z

No description provided.

…rain journey (#82).

# 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

rawi-coding · 2024-12-20T12:08:44Z

das_client/lib/app/pages/journey/train_journey/widgets/header/time_container.dart

+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  Text(
+                    '05:43:00',


Das ist nicht in deiner Story drin, aber du könntest hier noch die aktuelle Systemzeit anzeigen.

rawi-coding · 2024-12-20T12:43:39Z

das_client/lib/app/pages/journey/train_journey/widgets/header/time_container.dart

-              style: SBBTextStyles.largeBold.copyWith(fontSize: 24.0),
+    final bloc = context.trainJourneyCubit;
+
+    return StreamBuilder<Journey?>(


Der StreamBuilder sollte weiter unten im Widget-Tree verwendet werden. Die Journey brauchst du nur im _punctualityDisplay, deshalb sollte der StreamBuilder auch auf dieser Stufe sein.

Das sollte zwar nicht vorkommen, aber prüfe trotzdem wie das UI aussieht, wenn die Journey nicht oder noch geladen wird. Da du den StreamBuilder verschiebst, musst du das evtl. anders lösen.

rawi-coding · 2024-12-20T12:46:37Z

das_client/lib/sfera/src/mapper/sfera_model_mapper.dart

@@ -150,6 +159,20 @@ class SferaModelMapper {
    );
  }

+  static Duration _stringToDuration(String stringToChange) {


Ich würde diese Logik gleich im "Domain-Model" Delay führen, z.B. eine toDuration() Methode.

rawi-coding · 2024-12-20T12:49:04Z

das_client/lib/sfera/src/mapper/sfera_model_mapper.dart

+
+    if (delay == null) {
+      //Todo change the error-code
+      throw FormatException('Invalid ISO 8601 duration format');


Ich würde hier eine Warnung loggen und null zurückgeben. Besser wir zeigen die Pünktlichkeit nicht an, statt ein Fehler zu werfen.

rawi-coding · 2024-12-20T12:50:57Z

das_client/lib/sfera/src/mapper/sfera_model_mapper.dart

    return Journey(
      metadata: Metadata(
        nextStop: servicePoints.length > 1 ? servicePoints[1] as ServicePoint : null,
        currentPosition: journeyData.first,
        additionalSpeedRestrictions: additionalSpeedRestrictions,
        routeStart: journeyData.firstOrNull,
        routeEnd: journeyData.lastOrNull,
+        delay: _stringToDuration(relatedTrainInformation == null
+            ? '+PT0M0S' //Base Value for when the information is Null


In diesem Fall wäre es sinnvoller, einfach null den Metadaten zu übergeben.

rawi-coding · 2024-12-20T12:51:52Z

das_client/lib/sfera/src/model/train_location_information.dart

+
+class TrainLocationInformation extends SferaXmlElement {
+  static const String elementType = 'TrainLocationInformation';
+


nitpick: new Line zu viel.

rawi-coding · 2024-12-20T12:52:53Z

das_client/pubspec.yaml

@@ -60,6 +60,7 @@ dependencies:
  synchronized: ^3.3.0
  # https://pub.dev/packages/flutter_svg
  flutter_svg: ^2.0.14
+  iso_duration: ^0.1.1


nitpick: Damits einheitlich bleibt, noch die URL darüber kopieren wie bei den anderen.

Sind wir uns sicher dass wir dieses Package verwenden wollen?

Last Version 16 Month ago

Unverified Publisher

1 Like only

Then again, worst case einfach forken und was fixen? was denkst du @rawi-coding

@Grodien Ich habe das vor den Ferien mit Raphael besprochen. Wir nehmen die Library aber decken unsere Cases mit Unit-Tests ab. Nicht ganz glücklich die Library, sie hat aber zumindest keine Abhänigkeiten. Solang es funktioniert, würde ich sie verwenden.

…ngIndicator does not work currently.

Grodien · 2025-01-06T09:53:31Z

das_client/ios/Podfile.lock

@@ -68,4 +68,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: d9dad56c0cd0b4fd8b4fe3034a53fd42a0b990f6

-COCOAPODS: 1.16.1
+COCOAPODS: 1.15.2


cocoapods bei dir noch updaten, dieser change reverten

Grodien · 2025-01-06T09:54:52Z

das_client/lib/app/pages/journey/train_journey/widgets/header/time_container.dart

+      builder: (context, snapshot) {
+        if (!snapshot.hasData ||
+            snapshot.data == null ||
+            snapshot.data!.metadata.delay == null) {


wenn delay null ist würde ich eher einfach nichts anzeigen statt ein ProgressIndicator

Grodien · 2025-01-06T10:09:32Z

das_client/lib/app/pages/journey/train_journey/widgets/header/time_container.dart

+        final String minutes = (delay.inMinutes.abs() % 60).toString();
+        final String seconds = (delay.inSeconds.abs() % 60).toString();
+        final String hours = delay.inHours.abs().toString();
+        final String formattedDuration = '${delay.isNegative ? '-' : '+'}$hours:$minutes:${seconds.padLeft(2, '0')}';


wenn stunden gesetzt sind sollte minuten wohl auch immer zweistellig dargestellt werden? würde sonst komisch aussehen "1:4:53"

Ich habe nachgefragt, es ist gewollt, dass das Format mm:ss bleibt und nicht hh:mm:ss wird. Ich fixe aber noch dass es immer zweistellig ist. 👍

Grodien

paar kleine anmerkungen

rawi-coding and others added 25 commits December 4, 2024 17:20

feat: added CAB start and end signaling

1c6cc8d

feat: handled track equipment segments that start or end outside of t…

f4dc23a

…rain journey (#82).

chore: fixed some issues after merge.

0f2d05b

chore: added UI integration test for CAB signaling.

7babb87

chore: changes from review and fixed ordering of CABSignaling.

3313065

chore: fixed integration test.

d707eca

chore: added train journey to test non standard track equipment.

d868b47

Merge branch 'main' into 82-streckenausruestung

6a6428a

chore: updated integration test for track equipment to T1 train journey

638c975

fix ui tests

2fe61ea

fix tests for real

924ea83

feat: added visualization of non standard track equipment (#82).

8987de9

chore: add integration tests for track equipment

7698872

fix rendering issue

351dd8e

merge main

2046c2f

quick fix for not throwing exception on event message

aef8aa8

fix something I broke :)

dbf1762

feat: implement basic sfera event handling

fc76192

chore: fix test

5bb0c58

merge main

58c4347

fix lint

0d9a432

remove unused file

b1ec409

feat: Fixed the delay model and added all the needed Sfera models. Al…

3bb680b

…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

tobe-official changed the title ~~122 puenktlichkeit anzeige~~ feat: Added punctuality display (#122) Dec 20, 2024

Merge branch 'main' into 122-puenktlichkeit-anzeige

6dd34d7

# Conflicts: # das_client/test/sfera/mapper/sfera_mapper_test.dart

tobe-official changed the title ~~feat: Added punctuality display (#122)~~ feat: added punctuality display (#122) Dec 20, 2024

rawi-coding requested changes Dec 20, 2024

View reviewed changes

fix: fixed the mentioned points. Still need to do the tests. SBBLoadi…

a999728

…ngIndicator does not work currently.

Grodien reviewed Jan 6, 2025

View reviewed changes

Grodien requested changes Jan 6, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: added punctuality display (#122) #473

feat: added punctuality display (#122) #473

tobe-official commented Dec 20, 2024

rawi-coding Dec 20, 2024

rawi-coding Dec 20, 2024

rawi-coding Dec 20, 2024

rawi-coding Dec 20, 2024

rawi-coding Dec 20, 2024

rawi-coding Dec 20, 2024

rawi-coding Dec 20, 2024

Grodien Jan 6, 2025 •

edited

Loading

rawi-coding Jan 6, 2025

Grodien Jan 6, 2025

Grodien Jan 6, 2025

Grodien Jan 6, 2025 •

edited

Loading

tobe-official Jan 10, 2025

Grodien left a comment


		class TrainLocationInformation extends SferaXmlElement {
		static const String elementType = 'TrainLocationInformation';

feat: added punctuality display (#122) #473

Are you sure you want to change the base?

feat: added punctuality display (#122) #473

Conversation

tobe-official commented Dec 20, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Grodien Jan 6, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Grodien Jan 6, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Grodien left a comment

Choose a reason for hiding this comment

Grodien Jan 6, 2025 •

edited

Loading

Grodien Jan 6, 2025 •

edited

Loading