From fbb60cb0b67b661e565edecc309851d7df24abaa Mon Sep 17 00:00:00 2001
From: Sean <sean.f.t.engelhardt@gmail.com>
Date: Tue, 25 May 2021 15:15:08 +0200
Subject: [PATCH] Enhance point-of-order dialog

Escape and enter do what they should
---
 .../list-of-speakers-content.component.ts     |  3 ++-
 .../point-of-order-dialog.component.html      | 24 +++++++++----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/client/src/app/shared/components/list-of-speakers-content/list-of-speakers-content.component.ts b/client/src/app/shared/components/list-of-speakers-content/list-of-speakers-content.component.ts
index 09b89d9c4..444c0070c 100644
--- a/client/src/app/shared/components/list-of-speakers-content/list-of-speakers-content.component.ts
+++ b/client/src/app/shared/components/list-of-speakers-content/list-of-speakers-content.component.ts
@@ -230,7 +230,8 @@ export class ListOfSpeakersContentComponent extends BaseViewComponentDirective i
             PointOfOrderDialogComponent,
             {
                 data: this.viewListOfSpeakers,
-                ...infoDialogSettings
+                ...infoDialogSettings,
+                disableClose: false
             }
         );
 
diff --git a/client/src/app/shared/components/point-of-order-dialog/point-of-order-dialog.component.html b/client/src/app/shared/components/point-of-order-dialog/point-of-order-dialog.component.html
index 66996e46d..1b88356a7 100644
--- a/client/src/app/shared/components/point-of-order-dialog/point-of-order-dialog.component.html
+++ b/client/src/app/shared/components/point-of-order-dialog/point-of-order-dialog.component.html
@@ -2,18 +2,18 @@
     <span>{{ 'Are you sure you want to submit a point of order?' | translate }}</span>
 </h2>
 
-<mat-dialog-content>
-    {{ 'Request' | translate }}:
-    <form class="edit-form" [formGroup]="editForm">
+<form class="edit-form" [formGroup]="editForm" (ngSubmit)="onOk()">
+    <mat-dialog-content>
+        {{ 'Request' | translate }}:
         <mat-form-field>
             <input matInput osAutofocus [maxLength]="MAX_LENGTH" formControlName="note" />
         </mat-form-field>
-    </form>
-    {{ editForm.value.note.length }} / {{ MAX_LENGTH }}
-</mat-dialog-content>
-<mat-dialog-actions>
-    <button mat-button osAutofocus (click)="onOk()" color="accent" [disabled]="!this.editForm.valid">
-        {{ 'OK' | translate }}
-    </button>
-    <button mat-button (click)="onCancel()">{{ 'Cancel' | translate }}</button>
-</mat-dialog-actions>
+        {{ editForm.value.note.length }} / {{ MAX_LENGTH }}
+    </mat-dialog-content>
+    <mat-dialog-actions>
+        <button type="submit" mat-button osAutofocus color="accent" [disabled]="!this.editForm.valid">
+            {{ 'OK' | translate }}
+        </button>
+        <button type="button" mat-button (click)="onCancel()">{{ 'Cancel' | translate }}</button>
+    </mat-dialog-actions>
+</form>