asymmetry: fix backward travel time displays

Adapted trainrun-section-tab and perlenkette for bottomTravelTime, and made backwardTravelTime displayed only if different of travelTime.

Signed-off-by: Louis Greiner <[email protected]>

Author: louisgreiner

src/app/perlenkette/perlenkette-section/perlenkette-section.component.ts

@@ -505,7 +505,9 @@ export class PerlenketteSectionComponent implements OnInit, AfterContentInit, On
       return true;
     }
     return (
-      !this.trainrunSection.isSymmetric() && this.filterService.isFilterBackwardTravelTimeEnabled()
+      this.trainrunSection.getTrainrun().isRoundTrip() &&
+      !this.trainrunSection.isSymmetric() &&
+      this.filterService.isFilterBackwardTravelTimeEnabled()
     );
   }
 

src/app/view/dialogs/trainrun-and-section-dialog/trainrunsection-tab/trainrun-section-tab.component.html

@@ -113,7 +113,7 @@
             *ngIf="TrainrunsectionHelper.isLeftSideDisplayed(selectedTrainrunSection)"
           ></div>
           <div [ngClass]="getTravelTimeScssClass() + 'TravelTime'"></div>
-          <div class="BottomTravelTime" *ngIf="!isSymmetric"></div>
+          <div class="BottomTravelTime" *ngIf="isBottomTravelTimeDisplayed"></div>
 
           <div
             class="focusguard"
@@ -387,7 +387,7 @@
             </button>
           </div>
 
-          <div class="BottomTravelTimeMinus" *ngIf="!isSymmetric">
+          <div class="BottomTravelTimeMinus" *ngIf="isBottomTravelTimeDisplayed">
             <button
               tabindex="-1"
               mode="ghost"
@@ -397,7 +397,7 @@
               -
             </button>
           </div>
-          <div class="BottomTravelTimeTime" *ngIf="!isSymmetric">
+          <div class="BottomTravelTimeTime" *ngIf="isBottomTravelTimeDisplayed">
             <ng-container>
               <input
                 tabindex="3"
@@ -420,7 +420,7 @@
               />
             </ng-container>
           </div>
-          <div class="BottomTravelTimePlus" *ngIf="!isSymmetric">
+          <div class="BottomTravelTimePlus" *ngIf="isBottomTravelTimeDisplayed">
             <button
               tabindex="-1"
               mode="ghost"

src/app/view/dialogs/trainrun-and-section-dialog/trainrunsection-tab/trainrun-section-tab.component.ts

@@ -82,7 +82,10 @@ export class TrainrunSectionTabComponent implements AfterViewInit, OnDestroy {
   public TrainrunsectionHelper = TrainrunsectionHelper;
   private destroyed = new Subject<void>();
 
-  public get isSymmetric(): boolean {
+  public get isBottomTravelTimeDisplayed(): boolean {
+    if (!this.selectedTrainrunSection.getTrainrun().isRoundTrip()) {
+      return false;
+    }
     const firstTrainrunSection = this.trainrunService.getFirstNonStopTrainrunSection(
       this.selectedTrainrunSection,
     );
@@ -93,10 +96,10 @@ export class TrainrunSectionTabComponent implements AfterViewInit, OnDestroy {
     while (iterator.hasNext()) {
       const nextPair = iterator.next();
       if (!nextPair.trainrunSection.isSymmetric()) {
-        return false;
+        return true;
       }
     }
-    return true;
+    return false;
   }
 
   constructor(
@@ -326,13 +329,13 @@ export class TrainrunSectionTabComponent implements AfterViewInit, OnDestroy {
   }
 
   getTravelTimeScssClass(): string {
-    if (this.isSymmetric) {
-      // If symmetric, travel time is displayed at the center
-      return "";
+    if (this.isBottomTravelTimeDisplayed) {
+      // Travel time is displayed at the top
+      // (and bottom travel time at the bottom)
+      return "Top";
     }
-    // If not symmetric, travel time is displayed at the top
-    // (and bottom travel time at the bottom)
-    return "Top";
+    // Travel time is displayed at the center
+    return "";
   }
 
   onLeftNodeSymmetryToggleChanged(symmetry: boolean) {

src/app/view/editor-filter-view/editor-filter-view.component.ts

@@ -240,8 +240,10 @@ export class EditorFilterViewComponent implements OnInit, OnDestroy {
   filterTravelTimeChanged() {
     if (this.filterTravelTime) {
       this.filterService.enableFilterTravelTime();
+      this.filterService.enableFilterBackwardTravelTime();
     } else {
       this.filterService.disableFilterTravelTime();
+      this.filterService.disableFilterBackwardTravelTime();
     }
   }
 

src/app/view/editor-main-view/data-views/trainrunsections.view.ts

@@ -945,7 +945,11 @@ export class TrainrunSectionsView {
           TrainrunSectionsView.isBothSideNonStop(trainrunSection)
         );
       case TrainrunSectionText.TrainrunSectionBackwardTravelTime:
-        if (!trainrunSection.getTrainrun().isRoundTrip() || trainrunSection.isSymmetric()) {
+        if (
+          !this.editorView.isFilterBackwardTravelTimeEnabled() ||
+          !trainrunSection.getTrainrun().isRoundTrip() ||
+          trainrunSection.areTravelTimesEqual()
+        ) {
           return true;
         }
         if (this.editorView.isFilterShowNonStopTimeEnabled()) {