FIX #15259 TIME 0:10 fix css modal

src/frontend/app/administration/entity/entities-administration.component.ts

@@ -782,7 +782,7 @@ export class EntitiesAdministrationComponent implements OnInit {
     }
 
     openExportModal() {
-        this.dialog.open(EntitiesExportComponent, { panelClass: 'maarch-modal', width: '800px', autoFocus: false });
+        this.dialog.open(EntitiesExportComponent, { panelClass: 'maarch-modal', width: '400px', autoFocus: false });
 
     }
 }

src/frontend/app/administration/entity/export/entities-export.component.html

@@ -5,7 +5,7 @@
             <mat-spinner></mat-spinner>
         </div>
         <div class="row">
-            <div [class.col-md-12]="exportModel.format != 'csv'" [class.col-md-3]="exportModel.format == 'csv'">
+            <div class="col-md-6">
                 <mat-form-field appearance="outline">
                     <mat-label>{{'lang.format' | translate}}</mat-label>
                     <mat-select placeholder="{{'lang.format' | translate}}" [(ngModel)]="exportModel.format">
@@ -15,7 +15,7 @@
                     </mat-select>
                 </mat-form-field>
             </div>
-            <div class="col-md-9" *ngIf="exportModel.format == 'csv'">
+            <div class="col-md-6" *ngIf="exportModel.format == 'csv'">
                 <mat-form-field appearance="outline">
                     <mat-label>{{'lang.delimiter' | translate}}</mat-label>
                     <mat-select placeholder="{{'lang.delimiter' | translate}}" [(ngModel)]="exportModel.delimiter"

src/frontend/app/administration/entity/export/entities-export.component.ts

 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { NotificationService } from '@service/notification/notification.service';
-import { MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { catchError, tap, finalize } from 'rxjs/operators';
 import { of } from 'rxjs';
 import { LocalStorageService } from '@service/local-storage.service';
@@ -14,7 +14,6 @@ import { TranslateService } from '@ngx-translate/core';
 })
 export class EntitiesExportComponent implements OnInit {
 
-    
     loading: boolean = false;
     loadingExport: boolean = false;
 
@@ -28,12 +27,11 @@ export class EntitiesExportComponent implements OnInit {
 
     exportModelList: any;
 
-    @ViewChild('listFilter', { static: true }) private listFilter: any;
-
     constructor(
         public translate: TranslateService,
         public http: HttpClient,
         private notify: NotificationService,
+        public dialogRef: MatDialogRef<EntitiesExportComponent>,
         @Inject(MAT_DIALOG_DATA) public data: any,
         private localStorage: LocalStorageService,
         private headerService: HeaderService
@@ -71,6 +69,7 @@ export class EntitiesExportComponent implements OnInit {
                     downloadLink.setAttribute('download', 'export_entities_maarch_' + today + '.' + this.exportModel.format.toLowerCase());
                     document.body.appendChild(downloadLink);
                     downloadLink.click();
+                    this.dialogRef.close();
                 } else {
                     alert(this.translate.instant('lang.tooMuchDatas'));
                 }

src/frontend/app/administration/user/export/users-export.component.html

@@ -5,7 +5,7 @@
             <mat-spinner></mat-spinner>
         </div>
         <div class="row">
-            <div [class.col-md-12]="exportModel.format != 'csv'" [class.col-md-3]="exportModel.format == 'csv'">
+            <div class="col-md-6">
                 <mat-form-field appearance="outline">
                     <mat-label>{{'lang.format' | translate}}</mat-label>
                     <mat-select placeholder="{{'lang.format' | translate}}" [(ngModel)]="exportModel.format">
@@ -15,7 +15,7 @@
                     </mat-select>
                 </mat-form-field>
             </div>
-            <div class="col-md-9" *ngIf="exportModel.format == 'csv'">
+            <div class="col-md-6">
                 <mat-form-field appearance="outline">
                     <mat-label>{{'lang.delimiter' | translate}}</mat-label>
                     <mat-select placeholder="{{'lang.delimiter' | translate}}" [(ngModel)]="exportModel.delimiter"

src/frontend/app/administration/user/export/users-export.component.ts

-import { Component, OnInit, ViewChild, Inject } from '@angular/core';
+import { Component, OnInit, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { TranslateService } from '@ngx-translate/core';
 import { NotificationService } from '@service/notification/notification.service';
-import { MAT_DIALOG_DATA } from '@angular/material/dialog';
-import { catchError, map, tap, finalize, exhaustMap } from 'rxjs/operators';
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { catchError, tap, finalize } from 'rxjs/operators';
 import { of } from 'rxjs';
 import { LocalStorageService } from '@service/local-storage.service';
 import { HeaderService } from '@service/header.service';
 
-declare var $: any;
-
 @Component({
     templateUrl: 'users-export.component.html',
     styleUrls: ['users-export.component.scss'],
 })
 export class UsersExportComponent implements OnInit {
 
-    
     loading: boolean = false;
     loadingExport: boolean = false;
 
@@ -30,12 +27,11 @@ export class UsersExportComponent implements OnInit {
 
     exportModelList: any;
 
-    @ViewChild('listFilter', { static: true }) private listFilter: any;
-
     constructor(
         public translate: TranslateService,
         public http: HttpClient,
         private notify: NotificationService,
+        public dialogRef: MatDialogRef<UsersExportComponent>,
         @Inject(MAT_DIALOG_DATA) public data: any,
         private localStorage: LocalStorageService,
         private headerService: HeaderService
@@ -73,6 +69,7 @@ export class UsersExportComponent implements OnInit {
                     downloadLink.setAttribute('download', 'export_users_maarch_' + today + '.' + this.exportModel.format.toLowerCase());
                     document.body.appendChild(downloadLink);
                     downloadLink.click();
+                    this.dialogRef.close();
                 } else {
                     alert(this.translate.instant('lang.tooMuchDatas'));
                 }

src/frontend/app/administration/user/users-administration.component.ts

@@ -425,7 +425,7 @@ export class UsersAdministrationComponent implements OnInit {
     }
 
     openUsersExportModal() {
-        this.dialog.open(UsersExportComponent, { panelClass: 'maarch-modal', width: '800px', autoFocus: false });
+        this.dialog.open(UsersExportComponent, { panelClass: 'maarch-modal', width: '400px', autoFocus: false });
 
     }