w

AUTHORS

@@ -30,3 +30,4 @@ Authors of OpenSlides in chronological order of first contribution:
     Jochen Saalfeld <jochen.saalfeld@intevation.de>
     Fadi Abbud <fmfn13@hotmail.com>
     Gabriel Meyer <meyergabriel@live.de>
+    Joshua Sangmeister <joshua.sangmeister@gmail.com>

client/src/app/shared/components/agenda-content-object-form/agenda-content-object-form.component.html

@@ -1,9 +1,11 @@
 <ng-container *osPerms="'agenda.can_manage'">
     <ng-container *ngIf="showForm">
         <div [formGroup]="form">
-            <mat-checkbox formControlName="agenda_create">
-                <span translate>Add to agenda</span>
-            </mat-checkbox>
+            <p>
+                <mat-checkbox formControlName="agenda_create">
+                    <span translate>Add to agenda</span>
+                </mat-checkbox>
+            </p>
         </div>
 
         <ng-container *ngIf="!!checkbox.value">

client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.html

@@ -41,16 +41,14 @@
         <span>{{ "New motion block" | translate }}</span>
     </h1>
     <form [formGroup]="createBlockForm" (keydown)="onKeyDown($event)">
-        <div class="os-form-card-mobile" mat-dialog-content>
+        <div mat-dialog-content>
             <!-- Title -->
-            <p>
-                <mat-form-field>
-                    <input formControlName="title" matInput placeholder="{{ 'Title' | translate }}" required />
-                    <mat-error *ngIf="createBlockForm.get('title').hasError('required')" translate>
-                        A title is required
-                    </mat-error>
-                </mat-form-field>
-            </p>
+            <mat-form-field>
+                <input formControlName="title" matInput placeholder="{{ 'Title' | translate }}" required />
+                <mat-error *ngIf="createBlockForm.get('title').hasError('required')" translate>
+                    A title is required
+                </mat-error>
+            </mat-form-field>
 
             <!-- Internal -->
             <p>
@@ -61,9 +59,9 @@
         </div>
     </form>
     <div mat-dialog-actions>
-        <button mat-button [disabled]="!createBlockForm.valid" (click)="onSaveNewButton()">
+        <button mat-button [disabled]="!createBlockForm.valid" [mat-dialog-close]="true">
             <span translate>Save</span>
         </button>
-        <button mat-button (click)="onCancel()"><span translate>Cancel</span></button>
+        <button mat-button [mat-dialog-close]="false"><span translate>Cancel</span></button>
     </div>
 </ng-template>

client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.scss

@@ -8,6 +8,12 @@
     }
 }
 
-.mat-form-field {
-    width: 50%;
+.mat-dialog-container {
+    .mat-dialog-title {
+        margin: 0;
+    }
+
+    .mat-form-field {
+        width: 100%;
+    }
 }

client/src/app/site/motions/modules/motion-block/components/motion-block-list/motion-block-list.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { MatDialog, MatDialogRef } from '@angular/material';
+import { MatDialog } from '@angular/material';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { Title } from '@angular/platform-browser';
 
@@ -17,6 +17,7 @@ import { ViewItem } from 'app/site/agenda/models/view-item';
 import { BaseListViewComponent } from 'app/site/base/base-list-view';
 import { ViewMotionBlock } from 'app/site/motions/models/view-motion-block';
 import { MotionBlockSortService } from 'app/site/motions/services/motion-block-sort.service';
+import { infoDialogSettings } from 'app/shared/utils/dialog-settings';
 
 /**
  * Table for the motion blocks
@@ -31,8 +32,6 @@ export class MotionBlockListComponent extends BaseListViewComponent<ViewMotionBl
     @ViewChild('newMotionBlockDialog', { static: true })
     private newMotionBlockDialog: TemplateRef<string>;
 
-    private dialogRef: MatDialogRef<string, any>;
-
     /**
      * Holds the create form
      */
@@ -136,13 +135,9 @@ export class MotionBlockListComponent extends BaseListViewComponent<ViewMotionBl
     /**
      * Helper function reset the form and set the default values as well as closing the modal dialog
      */
-    public resetForm(): void {
+    private resetForm(): void {
         this.createBlockForm.reset();
         this.createBlockForm.get('agenda_type').setValue(this.defaultVisibility);
-        if (this.dialogRef) {
-            this.dialogRef.close();
-        }
-        this.dialogRef = null;
     }
 
     /**
@@ -151,19 +146,18 @@ export class MotionBlockListComponent extends BaseListViewComponent<ViewMotionBl
      */
     public onPlusButton(): void {
         this.resetForm();
-        this.dialogRef = this.dialog.open(this.newMotionBlockDialog, {
-            width: '400px',
-            maxWidth: '90vw',
-            maxHeight: '90vh',
-            disableClose: true
-        });
+        const dialogRef = this.dialog.open(this.newMotionBlockDialog, infoDialogSettings);
+        dialogRef.afterClosed().subscribe((res) => {
+            if (res) {
+                this.save();
+            }
+        })
     }
 
     /**
-     * Click handler for the save button.
      * Sends the block to create to the repository and resets the form.
      */
-    public async onSaveNewButton(): Promise<void> {
+    private save(): void {
         if (this.createBlockForm.valid) {
             const block = this.createBlockForm.value;
             if (!block.agenda_parent_id) {
@@ -171,14 +165,12 @@ export class MotionBlockListComponent extends BaseListViewComponent<ViewMotionBl
             }
 
             try {
-                await this.repo.create(block);
+                this.repo.create(block);
                 this.resetForm();
             } catch (e) {
                 this.raiseError(e);
             }
         }
-        // set a form control as "touched" to trigger potential error messages
-        this.createBlockForm.get('title').markAsTouched();
     }
 
     /**
@@ -189,17 +181,12 @@ export class MotionBlockListComponent extends BaseListViewComponent<ViewMotionBl
      */
     public onKeyDown(event: KeyboardEvent): void {
         if (event.key === 'Enter' && event.shiftKey) {
-            this.onSaveNewButton();
+            this.save();
+            this.dialog.closeAll();
         }
         if (event.key === 'Escape') {
-            this.onCancel();
+            this.resetForm();
+            this.dialog.closeAll();
         }
     }
-
-    /**
-     * Cancels the current form action
-     */
-    public onCancel(): void {
-        this.resetForm();
-    }
 }

client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.html

@@ -112,10 +112,10 @@
         </form>
     </div>
     <div mat-dialog-actions>
-        <button [disabled]="commentFieldForm.invalid" mat-button (click)="save()">
+        <button [disabled]="commentFieldForm.invalid" mat-button [mat-dialog-close]="true">
             <span translate>Save</span>
         </button>
-        <button mat-button (click)="cancel()">
+        <button mat-button [mat-dialog-close]="false">
             <span translate>Cancel</span>
         </button>
     </div>

client/src/app/site/motions/modules/motion-comment-section/components/motion-comment-section-list/motion-comment-section-list.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { MatDialog, MatDialogRef } from '@angular/material';
+import { MatDialog } from '@angular/material';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { Title } from '@angular/platform-browser';
 
@@ -14,6 +14,7 @@ import { MotionCommentSection } from 'app/shared/models/motions/motion-comment-s
 import { BaseViewComponent } from 'app/site/base/base-view';
 import { ViewMotionCommentSection } from 'app/site/motions/models/view-motion-comment-section';
 import { ViewGroup } from 'app/site/users/models/view-group';
+import { infoDialogSettings } from 'app/shared/utils/dialog-settings';
 
 /**
  * List view for the comment sections.
@@ -29,8 +30,6 @@ export class MotionCommentSectionListComponent extends BaseViewComponent impleme
 
     public currentComment: ViewMotionCommentSection | null;
 
-    public dialogRef: MatDialogRef<string, any>;
-
     /**
      * Source of the Data
      */
@@ -93,54 +92,47 @@ export class MotionCommentSectionListComponent extends BaseViewComponent impleme
     public onKeyDown(event: KeyboardEvent, viewSection?: ViewMotionCommentSection): void {
         if (event.key === 'Enter' && event.shiftKey) {
             this.save();
+            this.dialog.closeAll();
         }
         if (event.key === 'Escape') {
-            this.cancel();
+            this.dialog.closeAll();
         }
     }
 
     /**
      * Opens the create dialog.
      */
-    public openDialog(c?: ViewMotionCommentSection): void {
-        this.currentComment = c;
+    public openDialog(commentSection?: ViewMotionCommentSection): void {
+        this.currentComment = commentSection;
         this.commentFieldForm.reset({
-            name: c ? c.name : '',
-            read_groups_id: c ? c.read_groups_id : [],
-            write_groups_id: c ? c.write_groups_id : []
+            name: commentSection ? commentSection.name : '',
+            read_groups_id: commentSection ? commentSection.read_groups_id : [],
+            write_groups_id: commentSection ? commentSection.write_groups_id : []
         });
-        this.dialogRef = this.dialog.open(this.motionCommentDialog, {
-            width: '500px',
-            maxWidth: '90vw',
-            maxHeight: '90vh',
-            disableClose: true
+        const dialogRef = this.dialog.open(this.motionCommentDialog, infoDialogSettings);
+        dialogRef.afterClosed().subscribe((res) => {
+            if (res) {
+                this.save();
+            }
         });
     }
 
     /**
      * saves the current data, either updating an existing comment or creating a new one.
      */
-    public save(): void {
+    private save(): void {
         if (this.commentFieldForm.valid) {
             // eiher update or create
             if (this.currentComment) {
-                this.repo
-                    .update(this.commentFieldForm.value as Partial<MotionCommentSection>, this.currentComment)
-                    .then(() => this.dialogRef.close(), this.raiseError);
+                this.repo.update(this.commentFieldForm.value as Partial<MotionCommentSection>, this.currentComment).catch(this.raiseError);
             } else {
                 const c = new MotionCommentSection(this.commentFieldForm.value);
-                this.repo.create(c).then(() => this.dialogRef.close(), this.raiseError);
+                this.repo.create(c).catch(this.raiseError);
             }
+            this.commentFieldForm.reset();
         }
     }
 
-    /**
-     * close the dialog
-     */
-    public cancel(): void {
-        this.dialogRef.close();
-    }
-
     /**
      * is executed, when the delete button is pressed
      * @param viewSection The section to delete

client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.html

@@ -64,7 +64,7 @@
 <!-- Template for statute paragraph dialog -->
 <ng-template #statuteParagraphDialog>
     <h1 mat-dialog-title>
-        <span>{{ (currentStatuteParagraph ? "Edit statute paragraph" : "New statute paragraph") | translate }}</span>
+        <span>{{ ((currentStatuteParagraph ? "Edit" : "New") + "statute paragraph") | translate }}</span>
     </h1>
     <div class="os-form-card-mobile" mat-dialog-content>
         <form [formGroup]="statuteParagraphForm" (keydown)="onKeyDown($event)">
@@ -84,10 +84,10 @@
         </form>
     </div>
     <div mat-dialog-actions>
-        <button mat-button (click)="save()" [disabled]="!statuteParagraphForm.valid">
+        <button mat-button [mat-dialog-close]="true" [disabled]="!statuteParagraphForm.valid">
             <span translate>Save</span>
         </button>
-        <button mat-button (click)="cancel()">
+        <button mat-button [mat-dialog-close]="false">
             <span translate>Cancel</span>
         </button>
     </div>

client/src/app/site/motions/modules/statute-paragraph/components/statute-paragraph-list/statute-paragraph-list.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { MatDialog, MatDialogRef } from '@angular/material';
+import { MatDialog } from '@angular/material';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { Title } from '@angular/platform-browser';
 
@@ -12,6 +12,7 @@ import { StatuteParagraph } from 'app/shared/models/motions/statute-paragraph';
 import { BaseViewComponent } from 'app/site/base/base-view';
 import { ViewStatuteParagraph } from 'app/site/motions/models/view-statute-paragraph';
 import { StatuteCsvExportService } from 'app/site/motions/services/statute-csv-export.service';
+import { largeDialogSettings } from 'app/shared/utils/dialog-settings';
 
 /**
  * List view for the statute paragraphs.
@@ -25,8 +26,6 @@ export class StatuteParagraphListComponent extends BaseViewComponent implements
     @ViewChild('statuteParagraphDialog', { static: true })
     private statuteParagraphDialog: TemplateRef<string>;
 
-    private dialogRef: MatDialogRef<string, any>;
-
     private currentStatuteParagraph: ViewStatuteParagraph | null;
 
     /**
@@ -86,37 +85,36 @@ export class StatuteParagraphListComponent extends BaseViewComponent implements
     /**
      * Open the modal dialog
      */
-    public openDialog(p?: ViewStatuteParagraph): void {
-        this.currentStatuteParagraph = p;
+    public openDialog(paragraph?: ViewStatuteParagraph): void {
+        this.currentStatuteParagraph = paragraph;
         this.statuteParagraphForm.reset();
-        if (p) {
+        if (paragraph) {
             this.statuteParagraphForm.setValue({
-                title: p.title,
-                text: p.text
+                title: paragraph.title,
+                text: paragraph.text
             });
         }
-        this.dialogRef = this.dialog.open(this.statuteParagraphDialog, {
-            width: '1000px',
-            maxWidth: '95vw',
-            maxHeight: '90vh',
-            disableClose: true
+        const dialogRef = this.dialog.open(this.statuteParagraphDialog, largeDialogSettings);
+        dialogRef.afterClosed().subscribe((res) => {
+            if (res) {
+                this.save();
+            }
         });
     }
 
     /**
      * creates a new statute paragraph or updates the current one
      */
-    public save(): void {
+    private save(): void {
         if (this.statuteParagraphForm.valid) {
             // eiher update or create
             if (this.currentStatuteParagraph) {
-                this.repo
-                    .update(this.statuteParagraphForm.value as Partial<StatuteParagraph>, this.currentStatuteParagraph)
-                    .then(() => this.dialogRef.close(), this.raiseError);
+                this.repo.update(this.statuteParagraphForm.value as Partial<StatuteParagraph>, this.currentStatuteParagraph).catch(this.raiseError);
             } else {
                 const p = new StatuteParagraph(this.statuteParagraphForm.value);
-                this.repo.create(p).then(() => this.dialogRef.close(), this.raiseError);
+                this.repo.create(p).catch(this.raiseError);
             }
+            this.statuteParagraphForm.reset();
         }
     }
 
@@ -148,19 +146,13 @@ export class StatuteParagraphListComponent extends BaseViewComponent implements
     public onKeyDown(event: KeyboardEvent): void {
         if (event.key === 'Enter' && event.shiftKey) {
             this.save();
+            this.dialog.closeAll();
         }
         if (event.key === 'Escape') {
-            this.cancel();
+            this.dialog.closeAll();
         }
     }
 
-    /**
-     * Closes the dialog
-     */
-    public cancel(): void {
-        this.dialogRef.close();
-    }
-
     /**
      * Triggers a csv export of the statute paragraphs
      */

client/src/app/site/tags/components/tag-list/tag-list.component.html

@@ -39,20 +39,20 @@
     <h1 mat-dialog-title>
         <span>{{ (currentTag ? 'Edit tag' : 'New tag') | translate }}</span>
     </h1>
-    <form [formGroup]="tagForm" (ngSubmit)="onSubmit()">
-        <div class="os-form-card-mobile" mat-dialog-content>
+    <div class="os-form-card-mobile" mat-dialog-content>
+        <form [formGroup]="tagForm" (keydown)="onKeyDown($event)">
             <mat-form-field>
                 <input required type="text" matInput formControlName="name" placeholder="{{ 'Name' | translate }}">
             </mat-form-field>
-        </div>
+        </form>
+    </div>
 
-        <div mat-dialog-actions>
-            <button type="submit" mat-button color="primary">
-                <span translate>Save</span>
-            </button>
-            <button type="button" mat-button [mat-dialog-close]="null">
-                <span translate>Cancel</span>
-            </button>
-        </div>
-    </form>
+    <div mat-dialog-actions>
+        <button type="submit" mat-button [mat-dialog-close]="true" color="primary">
+            <span translate>Save</span>
+        </button>
+        <button type="button" mat-button [mat-dialog-close]="false">
+            <span translate>Cancel</span>
+        </button>
+    </div>
 </ng-template>

client/src/app/site/tags/components/tag-list/tag-list.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, TemplateRef, ViewChild } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { MatDialog, MatDialogRef } from '@angular/material';
+import { MatDialog } from '@angular/material';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { Title } from '@angular/platform-browser';
 
@@ -12,6 +12,7 @@ import { PromptService } from 'app/core/ui-services/prompt.service';
 import { Tag } from 'app/shared/models/core/tag';
 import { BaseListViewComponent } from 'app/site/base/base-list-view';
 import { ViewTag } from '../../models/view-tag';
+import { infoDialogSettings } from 'app/shared/utils/dialog-settings';
 
 /**
  * Listview for the complete list of available Tags
@@ -33,8 +34,6 @@ export class TagListComponent extends BaseListViewComponent<ViewTag> implements
         name: ['', [Validators.required]]
     });
 
-    private dialogRef: MatDialogRef<string, any>;
-
     /**
      * Holds the tag that's currently being edited, or null.
      */
@@ -94,28 +93,27 @@ export class TagListComponent extends BaseListViewComponent<ViewTag> implements
         this.currentTag = tag;
         this.tagForm.reset();
         this.tagForm.get('name').setValue(this.currentTag ? this.currentTag.name : '');
-        this.dialogRef = this.dialog.open(this.tagDialog, {
-            width: '400px',
-            maxWidth: '90vw',
-            maxHeight: '90vh',
-            disableClose: true
-        });
+        const dialogRef = this.dialog.open(this.tagDialog, infoDialogSettings);
+        dialogRef.afterClosed().subscribe((res) => {
+            if (res) {
+                this.save();
+            }
+        })
     }
 
     /**
      * Submit the form and create or update a tag.
      */
-    public onSubmit(): void {
+    private save(): void {
         if (!this.tagForm.value || !this.tagForm.valid) {
             return;
         }
         if (this.currentTag) {
-            this.repo
-                .update(new Tag(this.tagForm.value), this.currentTag)
-                .then(() => this.dialogRef.close(), this.raiseError);
+            this.repo.update(new Tag(this.tagForm.value), this.currentTag).catch(this.raiseError);
         } else {
-            this.repo.create(this.tagForm.value).then(() => this.dialogRef.close(), this.raiseError);
+            this.repo.create(this.tagForm.value).catch(this.raiseError);
         }
+        this.tagForm.reset();   // reset here so pressing shift+enter wont save when dialog isnt open
     }
 
     /**
@@ -128,4 +126,20 @@ export class TagListComponent extends BaseListViewComponent<ViewTag> implements
             this.repo.delete(tag).catch(this.raiseError);
         }
     }
+
+    /**
+     * clicking Shift and Enter will save automatically
+     * clicking Escape will cancel the process
+     *
+     * @param event has the code
+     */
+    public onKeyDown(event: KeyboardEvent): void {
+        if (event.key === 'Enter' && event.shiftKey) {
+            this.save();
+            this.dialog.closeAll();
+        }
+        if (event.key === 'Escape') {
+            this.dialog.closeAll();
+        }
+    }
 }