diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss b/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss index 819f075a70a96cf2ff7069c58a0ae8797dee6bff..bdafe22ec32a597d87fed7c611e2445a5e63e28f 100644 --- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss +++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.scss @@ -6,6 +6,7 @@ margin-bottom: 20px; min-width: 220px; background-color: var(--red); + color: var(--on-secondary); } .export { diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts index 9cd34a95ced26eb2e435f5488df09c70d8a8eb52..d6a5d65b7b47f1bd48558066f1b7014501b6e504 100644 --- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts +++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts @@ -91,6 +91,10 @@ export class RoomEditComponent implements OnInit { } exportCsv(delimiter: string, date: string): void { + this.commentService.getComments(this.editRoom.id) + .subscribe(comments => { + this.comments = comments; + }); const exportComments = JSON.parse(JSON.stringify(this.comments)); let csv: string; let keyFields = ''; diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.ts b/src/app/components/creator/room-creator-page/room-creator-page.component.ts index bce41b02b82d0f67a1a93a6488e294ff93f1fe11..9437f1d71c9a70674ebd301340f7ced77c806d8f 100644 --- a/src/app/components/creator/room-creator-page/room-creator-page.component.ts +++ b/src/app/components/creator/room-creator-page/room-creator-page.component.ts @@ -10,7 +10,6 @@ import { RoomEditComponent } from '../_dialogs/room-edit/room-edit.component'; import { TranslateService } from '@ngx-translate/core'; import { LanguageService } from '../../../services/util/language.service'; import { TSMap } from 'typescript-map'; -import { CommentService } from '../../../services/http/comment.service'; @Component({ selector: 'app-room-creator-page', @@ -30,8 +29,7 @@ export class RoomCreatorPageComponent extends RoomPageComponent implements OnIni protected location: Location, public dialog: MatDialog, private translateService: TranslateService, - protected langService: LanguageService, - public commentService: CommentService) { + protected langService: LanguageService) { super(roomService, route, location); langService.langEmitter.subscribe(lang => translateService.use(lang)); } @@ -68,10 +66,6 @@ export class RoomCreatorPageComponent extends RoomPageComponent implements OnIni }); dialogRef.componentInstance.editRoom = this.updRoom; dialogRef.componentInstance.commentThreshold = this.updCommentThreshold; - this.commentService.getComments(this.room.id) - .subscribe(comments => { - dialogRef.componentInstance.comments = comments; - }); dialogRef.afterClosed() .subscribe(result => { if (result === 'abort') {