From 14b0b614326a32b71981df469f187dea2c37511b Mon Sep 17 00:00:00 2001
From: Sebastian Wittek <sebastian.wittek@mni.thm.de>
Date: Tue, 19 Mar 2019 14:53:39 +0100
Subject: [PATCH] Add abort-button to comment-create-dialog
---
.../submit-comment.component.html | 2 ++
.../submit-comment.component.ts | 20 +++++++++----------
.../comment-page/comment-page.component.ts | 3 +--
src/assets/i18n/creator/de.json | 2 +-
src/assets/i18n/creator/en.json | 2 +-
src/assets/i18n/participant/de.json | 2 +-
src/assets/i18n/participant/en.json | 2 +-
7 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.html b/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.html
index 0f9f90b06..ac95224c0 100644
--- a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.html
+++ b/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.html
@@ -12,6 +12,8 @@
matAutosizeMinRows=2 matAutosizeMaxRows=5 maxlength="255" [formControl]="bodyForm"></textarea>
<mat-hint align="end">{{commentBody.value.length}} / 255</mat-hint>
</mat-form-field>
+ <button mat-raised-button color="warn"
+ (click)="onNoClick()">{{ 'comment-page.abort' | translate}}</button>
<button mat-raised-button color="accent"
(click)="closeDialog(commentSubject.value, commentBody.value)">{{ 'comment-page.send' | translate}}</button>
</form>
diff --git a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.ts b/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.ts
index 30f15e785..6e2f2fb70 100644
--- a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.ts
+++ b/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.ts
@@ -41,7 +41,7 @@ export class SubmitCommentComponent implements OnInit {
}
onNoClick(): void {
- this.dialogRef.close('abort');
+ this.dialogRef.close();
}
checkInputData(subject: string, body: string): boolean {
@@ -69,15 +69,13 @@ export class SubmitCommentComponent implements OnInit {
}
closeDialog(subject: string, body: string) {
- this.checkInputData(subject, body);
- const comment = new Comment();
- /* this.route.params.subscribe(params => {
- comment.roomId = params['roomId'];
- }); */
- comment.roomId = localStorage.getItem(`roomId`);
- comment.subject = subject;
- comment.body = body;
- comment.userId = this.user.id;
- this.dialogRef.close(comment);
+ if (this.checkInputData(subject, body) === true) {
+ const comment = new Comment();
+ comment.roomId = localStorage.getItem(`roomId`);
+ comment.subject = subject;
+ comment.body = body;
+ comment.userId = this.user.id;
+ this.dialogRef.close(comment);
+ }
}
}
diff --git a/src/app/components/shared/comment-page/comment-page.component.ts b/src/app/components/shared/comment-page/comment-page.component.ts
index cb91f65b5..bb09927e1 100644
--- a/src/app/components/shared/comment-page/comment-page.component.ts
+++ b/src/app/components/shared/comment-page/comment-page.component.ts
@@ -29,8 +29,7 @@ export class CommentPageComponent implements OnInit {
});
dialogRef.afterClosed()
.subscribe(result => {
- if (result !== null) {
- console.log(result);
+ if (result) {
this.send(result);
} else {
return;
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index 78570c210..cb98ca172 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -79,7 +79,7 @@
"enter-title": "Titel",
"enter-comment": "Kommentar",
"send": "Senden",
- "back": "Zurück",
+ "abort": "Abbrechen",
"error-comment": "Bitte geben Sie ein Kommentar ein!",
"error-title": "Bitte geben Sie einen Titel ein!",
"error-both-fields": "Bitte füllen Sie alle Felder aus!"
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 6662ed073..8305ffed4 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -79,7 +79,7 @@
"enter-title": "Title",
"enter-comment": "Comment",
"send": "Send",
- "back": "Back",
+ "abort": "Cancel",
"error-title": "Please enter a title!",
"error-comment": "Please enter a comment!",
"error-both-fields": "Please fill in all fields!"
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index 358c5f19f..3fcb7955f 100644
--- a/src/assets/i18n/participant/de.json
+++ b/src/assets/i18n/participant/de.json
@@ -18,7 +18,7 @@
"enter-title": "Titel",
"enter-comment": "Kommentar",
"send": "Senden",
- "back": "Zurück",
+ "abort": "Abbrechen",
"error-comment": "Bitte geben Sie ein Kommentar ein!",
"error-title": "Bitte geben Sie einen Titel ein!",
"error-both-fields": "Bitte füllen Sie alle Felder aus!"
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index d08c60772..09757456a 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -18,7 +18,7 @@
"enter-title": "Title",
"enter-comment": "Comment",
"send": "Send",
- "back": "Back",
+ "abort": "Cancel",
"error-title": "Please enter a title!",
"error-comment": "Please enter a comment!",
"error-both-fields": "Please fill in all fields!"
--
GitLab