diff --git a/src/app/creator-room/creator-room.component.ts b/src/app/creator-room/creator-room.component.ts index c8fa21df3009b4af5b3e03a5d23995b48489c99d..3d813df3736ac71367978cb30ae5454b106055ec 100644 --- a/src/app/creator-room/creator-room.component.ts +++ b/src/app/creator-room/creator-room.component.ts @@ -78,9 +78,20 @@ export class CreatorRoomComponent extends RoomComponent implements OnInit { this.delete(room); } + confirmDeletion(dialogAnswer: string): void { + if (dialogAnswer === 'delete') { + this.deleteRoom(this.room); + } + } + openDeletionRoomDialog(): void { - this.dialog.open(RoomDeletionComponent, { - width: '350px' + const dialogRef = this.dialog.open(RoomDeletionComponent, { + width: '400px' }); + dialogRef.componentInstance.room = this.room; + dialogRef.afterClosed() + .subscribe(result => { + this.confirmDeletion(result); + }); } } diff --git a/src/app/room-deletion/room-deletion.component.html b/src/app/room-deletion/room-deletion.component.html index 425f4445011fc7cc08cde0d00471f2cf66d219b0..21b4e47034cc19428ebcd23a01e8c48af490b973 100644 --- a/src/app/room-deletion/room-deletion.component.html +++ b/src/app/room-deletion/room-deletion.component.html @@ -1,8 +1,8 @@ <mat-card> - <mat-card-header><h3>Do you really want to delete this room?<br>This action can not be undone.</h3> + <mat-card-header><h3>Do you really want to delete room<br>' {{room.name}} ' ?<br>This action can not be undone.</h3> </mat-card-header> <mat-card-content> - <button mat-raised-button color="warn"> + <button mat-raised-button color="warn" (click)="dialogRef.close('delete')"> Delete room </button> <button mat-raised-button color="primary" (click)="onNoClick()"> diff --git a/src/app/room-deletion/room-deletion.component.ts b/src/app/room-deletion/room-deletion.component.ts index 2efbbf0591af9d539c23186f0e001d0dc7233595..55b5a1cf196492027b38e95b8b12e37f21c581a7 100644 --- a/src/app/room-deletion/room-deletion.component.ts +++ b/src/app/room-deletion/room-deletion.component.ts @@ -4,6 +4,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; import { NotificationService } from '../notification.service'; import { RoomCreationComponent } from '../room-creation/room-creation.component'; import { RoomService } from '../room.service'; +import { Room } from '../room'; @Component({ selector: 'app-room-deletion', @@ -11,6 +12,7 @@ import { RoomService } from '../room.service'; styleUrls: ['./room-deletion.component.scss'] }) export class RoomDeletionComponent implements OnInit { + room: Room; constructor(private roomService: RoomService, private router: Router, @@ -22,7 +24,7 @@ export class RoomDeletionComponent implements OnInit { onNoClick(): void { this.dialogRef.close(); } + ngOnInit() { } - }