Skip to content

Commit 293278d

Browse files
committed
view: close trainrunDialog when new Dto is set from customElement
Signed-off-by: Louis Greiner <greiner.louis@gmail.com>
1 parent b1f7601 commit 293278d

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

src/app/app.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {NodeService} from "./services/data/node.service";
1414
import {I18nService} from "./core/i18n/i18n.service";
1515
import {PositionTransformationService} from "./services/util/position.transformation.service";
1616
import {NetzgrafikDefault} from "./sample-netzgrafik/netzgrafik.default";
17+
import {UiInteractionService} from "./services/ui/ui.interaction.service";
1718

1819
@Component({
1920
selector: "sbb-root",
@@ -46,6 +47,7 @@ export class AppComponent implements OnInit {
4647

4748
constructor(private authService: AuthService,
4849
private dataService: DataService,
50+
private uiInteractionService: UiInteractionService,
4951
private trainrunService: TrainrunService,
5052
private trainrunSectionService: TrainrunSectionService,
5153
private nodeService: NodeService,
@@ -90,6 +92,7 @@ export class AppComponent implements OnInit {
9092
set netzgrafikDto(netzgrafikDto: NetzgrafikDto) {
9193
this.netzgrafikDtoIsSet = true;
9294
this.dataService.loadNetzgrafikDto(netzgrafikDto);
95+
this.uiInteractionService.closeTrainrunDialog();
9396
}
9497

9598
@Output()

src/app/services/ui/ui.interaction.service.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,10 @@ export class UiInteractionService implements OnDestroy {
394394
this.showPerlenketteSubject.next(false);
395395
}
396396

397+
closeTrainrunDialog() {
398+
this.showTrainrunDialogSubject.next(null);
399+
}
400+
397401
print() {
398402
this.printGraphikSubject.next(null);
399403
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ export class TrainrunAndSectionDialogComponent implements OnDestroy {
9090
this.uiInteractionService.trainrunDialog
9191
.pipe(takeUntil(this.destroyed))
9292
.subscribe((parameter) => {
93+
if (!parameter) {
94+
this.closeDialog();
95+
return;
96+
}
97+
9398
this.data = parameter;
9499
const selectedTrainrunSection =
95100
this.trainrunSectionService.getSelectedTrainrunSection();

0 commit comments

Comments
 (0)