Add AppComponent inputs/outputs

Author: emersion

src/app/app.component.ts

@@ -1,9 +1,13 @@
-import {Component} from "@angular/core";
+import {Component, Input, Output} from "@angular/core";
 import {AuthService} from "./services/auth/auth.service";
+import {TrainrunService} from "./services/data/trainrun.service";
+import {TrainrunSectionService} from "./services/data/trainrunsection.service";
+import {DataService} from "./services/data/data.service";
 import {environment} from "../environments/environment";
 import packageJson from "../../package.json";
 import {Observable} from "rxjs";
 import {ProjectDto} from "./api/generated";
+import {NetzgrafikDto} from "./data-structures/business.data.structures";
 
 @Component({
   selector: "sbb-root",
@@ -33,7 +37,7 @@ export class AppComponent {
     return this.authService.claims?.email;
   }
 
-  constructor(private authService: AuthService) {
+  constructor(private authService: AuthService, private dataService: DataService, private trainrunService: TrainrunService, private trainrunSectionService: TrainrunSectionService) {
     if (!this.disableBackend) {
       this.authenticated = authService.initialized;
     }
@@ -44,4 +48,18 @@ export class AppComponent {
       this.authService.logOut();
     }
   }
+
+  @Input()
+  get netzgrafikDto() {
+    return this.dataService.getNetzgrafikDto();
+  }
+  set netzgrafikDto(netzgrafikDto: NetzgrafikDto) {
+    this.dataService.loadNetzgrafikDto(netzgrafikDto);
+  }
+
+  @Output()
+  trainrunOperation = this.trainrunService.operation;
+
+  @Output()
+  trainrunSectionOperation = this.trainrunSectionService.operation;
 }

src/app/models/operation.model.ts

@@ -0,0 +1,42 @@
+import {Trainrun} from "./trainrun.model";
+import {TrainrunSection} from "./trainrunsection.model";
+
+enum OperationType {
+    create = "create",
+    update = "update",
+    delete = "delete"
+}
+
+export abstract class Operation{
+    type: string;
+}
+
+export class CreateTrainrunOperation extends Operation {
+    readonly trainrunSection: TrainrunSection;
+
+    constructor(trainrunSection: TrainrunSection){
+        super();
+        this.type = OperationType.create;
+        this.trainrunSection = trainrunSection;
+    }
+}
+
+export class UpdateTrainrunSectionsOperation extends Operation {
+    readonly trainrunSections: TrainrunSection[];
+
+    constructor(trainrunSections: TrainrunSection[]){
+        super();
+        this.type = OperationType.update;
+        this.trainrunSections = trainrunSections;
+    }
+}
+
+export class DeleteTrainrunOperation extends Operation {
+    readonly trainrun: Trainrun;
+
+    constructor(trainrun: Trainrun){
+        super();
+        this.type = OperationType.delete;
+        this.trainrun = trainrun;
+    }
+}

src/app/services/data/trainrun.service.ts

@@ -8,7 +8,7 @@ import {
   TrainrunFrequency,
   TrainrunTimeCategory,
 } from "../../data-structures/business.data.structures";
-import {Injectable} from "@angular/core";
+import {EventEmitter, Injectable} from "@angular/core";
 import {BehaviorSubject} from "rxjs";
 import {NodeService} from "./node.service";
 import {TrainrunSectionService} from "./trainrunsection.service";
@@ -23,6 +23,7 @@ import {FilterService} from "../ui/filter.service";
 import {Transition} from "../../models/transition.model";
 import {Port} from "../../models/port.model";
 import {Connection} from "../../models/connection.model";
+import {DeleteTrainrunOperation, Operation} from "../../models/operation.model";
 
 @Injectable({
   providedIn: "root",
@@ -34,6 +35,8 @@ export class TrainrunService {
 
   trainrunsStore: { trainruns: Trainrun[] } = {trainruns: []}; // store the data in memory
 
+  readonly operation = new EventEmitter<Operation>();
+
   private dataService: DataService = null;
   private nodeService: NodeService = null;
   private trainrunSectionService: TrainrunSectionService = null;
@@ -180,6 +183,7 @@ export class TrainrunService {
     if (enforceUpdate) {
       this.trainrunsUpdated();
     }
+    this.operation.emit(new DeleteTrainrunOperation(trainrun));
   }
 
   getSelectedTrainrun(): Trainrun {

src/app/services/data/trainrunsection.service.ts

@@ -5,7 +5,7 @@ import {
   TrainrunSectionDto,
 } from "../../data-structures/business.data.structures";
 import {Node} from "../../models/node.model";
-import {Injectable, OnDestroy} from "@angular/core";
+import {Injectable, OnDestroy, EventEmitter} from "@angular/core";
 import {BehaviorSubject, Subject} from "rxjs";
 import {TrainrunService} from "./trainrun.service";
 import {NodeService} from "./node.service";
@@ -22,6 +22,7 @@ import {Transition} from "../../models/transition.model";
 import {takeUntil} from "rxjs/operators";
 import {FilterService} from "../ui/filter.service";
 import {TrainrunSectionNodePair} from "../util/trainrun.iterator";
+import {CreateTrainrunOperation, Operation, UpdateTrainrunSectionsOperation} from "../../models/operation.model";
 
 interface DepartureAndArrivalTimes {
   nodeFromDepartureTime: number;
@@ -46,6 +47,8 @@ export class TrainrunSectionService implements OnDestroy {
     trainrunSections: [],
   }; // store the data in memory
 
+  readonly operation = new EventEmitter<Operation>();
+
   informSelectedTrainrunClickSubject =
     new BehaviorSubject<InformSelectedTrainrunClick>({
       trainrunSectionId: undefined,
@@ -668,6 +671,8 @@ export class TrainrunSectionService implements OnDestroy {
 
   createTrainrunSection(sourceNodeId: number, targetNodeId: number, retrieveTravelTimeFromEdge: boolean = false) {
     const trainrunSection: TrainrunSection = new TrainrunSection();
+    const initialTrainrunsLength = this.trainrunService.trainrunsStore.trainruns.length;
+
     trainrunSection.setTrainrun(
       this.trainrunService.getSelectedOrNewTrainrun(),
     );
@@ -682,11 +687,6 @@ export class TrainrunSectionService implements OnDestroy {
     const targetNode = this.nodeService.getNodeFromId(targetNodeId);
     trainrunSection.setSourceAndTargetNodeReference(sourceNode, targetNode);
     this.trainrunSectionsStore.trainrunSections.push(trainrunSection);
-    this.logger.log(
-      "create new trainrunSection between nodes",
-      sourceNode.getBetriebspunktName(),
-      targetNode.getBetriebspunktName(),
-    );
 
     this.handleNodeAndTrainrunSectionDetails(
       sourceNode,
@@ -698,6 +698,12 @@ export class TrainrunSectionService implements OnDestroy {
     this.propagateTimesForNewTrainrunSection(trainrunSection);
     //this.trainrunSectionsUpdated();
     this.trainrunService.trainrunsUpdated();
+
+    if (initialTrainrunsLength !== this.trainrunService.trainrunsStore.trainruns.length) {
+      this.operation.emit(new CreateTrainrunOperation(trainrunSection));
+    } else {
+      this.operation.emit(new UpdateTrainrunSectionsOperation(this.getAllTrainrunSectionsForTrainrun(trainrunSection.getTrainrunId())));
+    }
   }
 
   reconnectTrainrunSection(