fixed (OpenRailAssociation#155)

* fixed

* test fix

Author: aiAdrian

src/app/streckengrafik/services/sg-1-load-trainrun-item.service.ts

@@ -642,7 +642,6 @@ export class Sg1LoadTrainrunItemService implements OnDestroy {
   ): TrainrunItem[] {
     const trainrunItems: TrainrunItem[] = [];
     if (this.trainruns) {
-      let selectedTrainrunItem: TrainrunItem = undefined;
       this.trainruns.forEach((trainrun: Trainrun) => {
         if (this.filterService.filterTrainrun(trainrun)) {
           const trainrunItem = this.loadTrainrunItem(trainrun, false);
@@ -651,16 +650,9 @@ export class Sg1LoadTrainrunItemService implements OnDestroy {
             trainrunItem,
             templateTrainrunItem,
           );
-          if (trainrun.selected()) {
-            selectedTrainrunItem = trainrunItem;
-          } else {
-            trainrunItems.push(trainrunItem);
-          }
+          trainrunItems.push(trainrunItem);
         }
       });
-      if (selectedTrainrunItem) {
-        trainrunItems.push(selectedTrainrunItem);
-      }
     }
     return trainrunItems;
   }

src/app/streckengrafik/services/streckengrafik.services.spec.ts

@@ -382,18 +382,18 @@ describe("StreckengrafikServicesTests", () => {
         }
         expect(node.trainrunNodes[8].backward).toBe(false);
         expect(node.trainrunNodes[8].minimumHeadwayTime).toBe(2);
-        expect(node.trainrunNodes[8].isTurnaround).toBe(false);
-        expect(node.trainrunNodes[8].isEndNode()).toBe(false);
-        expect(node.trainrunNodes[8].arrivalTime).toBe(49);
+        expect(node.trainrunNodes[8].isTurnaround).toBe(true);
+        expect(node.trainrunNodes[8].isEndNode()).toBe(true);
+        expect(node.trainrunNodes[8].arrivalTime).toBe(10);
         expect(node.trainrunNodes[8].departureTime).toBe(50);
-        expect(node.trainrunNodes[8].unusedForTurnaround).toBe(false);
+        expect(node.trainrunNodes[8].unusedForTurnaround).toBe(true);
 
         expect(node.trainrunNodes[9].backward).toBe(true);
         expect(node.trainrunNodes[9].minimumHeadwayTime).toBe(2);
-        expect(node.trainrunNodes[9].isTurnaround).toBe(false);
-        expect(node.trainrunNodes[9].isEndNode()).toBe(false);
+        expect(node.trainrunNodes[9].isTurnaround).toBe(true);
+        expect(node.trainrunNodes[9].isEndNode()).toBe(true);
         expect(node.trainrunNodes[9].arrivalTime).toBe(130);
-        expect(node.trainrunNodes[9].departureTime).toBe(131);
+        expect(node.trainrunNodes[9].departureTime).toBe(170);
         expect(node.trainrunNodes[9].unusedForTurnaround).toBe(false);
       });
   });
@@ -426,9 +426,9 @@ describe("StreckengrafikServicesTests", () => {
           console.log(idx, node.trainrunNodes[idx].minimumHeadwayTime);
           expect(node.trainrunNodes[idx].minimumHeadwayTime).toBe(2);
         }
-        expect(node.trainrunNodes[7].minimumHeadwayTime).toBe(3);
-        expect(node.trainrunNodes[8].minimumHeadwayTime).toBe(2);
-        expect(node.trainrunNodes[9].minimumHeadwayTime).toBe(2);
+        expect(node.trainrunNodes[7].minimumHeadwayTime).toBe(2);
+        expect(node.trainrunNodes[8].minimumHeadwayTime).toBe(3);
+        expect(node.trainrunNodes[9].minimumHeadwayTime).toBe(3);
       });
   });