From 3a3c20db40015084e0db5233b588042e7d738dbc Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 29 Oct 2020 16:01:08 +0100
Subject: [PATCH] FIX #15259 TIME 0:10 fix css modal
---
.../entity/entities-administration.component.ts | 2 +-
.../entity/export/entities-export.component.html | 4 ++--
.../entity/export/entities-export.component.ts | 7 +++----
.../user/export/users-export.component.html | 4 ++--
.../user/export/users-export.component.ts | 13 +++++--------
.../user/users-administration.component.ts | 2 +-
6 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/frontend/app/administration/entity/entities-administration.component.ts b/src/frontend/app/administration/entity/entities-administration.component.ts
index 9b53150c6f7..86361cc667b 100755
--- a/src/frontend/app/administration/entity/entities-administration.component.ts
+++ b/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 });
}
}
diff --git a/src/frontend/app/administration/entity/export/entities-export.component.html b/src/frontend/app/administration/entity/export/entities-export.component.html
index 8162c96c78b..b75f48a6c5b 100644
--- a/src/frontend/app/administration/entity/export/entities-export.component.html
+++ b/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"
diff --git a/src/frontend/app/administration/entity/export/entities-export.component.ts b/src/frontend/app/administration/entity/export/entities-export.component.ts
index 260e8da1da1..733b915b52f 100644
--- a/src/frontend/app/administration/entity/export/entities-export.component.ts
+++ b/src/frontend/app/administration/entity/export/entities-export.component.ts
@@ -1,7 +1,7 @@
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'));
}
diff --git a/src/frontend/app/administration/user/export/users-export.component.html b/src/frontend/app/administration/user/export/users-export.component.html
index 8162c96c78b..bd85cd25158 100644
--- a/src/frontend/app/administration/user/export/users-export.component.html
+++ b/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"
diff --git a/src/frontend/app/administration/user/export/users-export.component.ts b/src/frontend/app/administration/user/export/users-export.component.ts
index db70900114f..d0f05f8083b 100644
--- a/src/frontend/app/administration/user/export/users-export.component.ts
+++ b/src/frontend/app/administration/user/export/users-export.component.ts
@@ -1,22 +1,19 @@
-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'));
}
diff --git a/src/frontend/app/administration/user/users-administration.component.ts b/src/frontend/app/administration/user/users-administration.component.ts
index 8dd71102621..ccb6167b61c 100755
--- a/src/frontend/app/administration/user/users-administration.component.ts
+++ b/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 });
}
--
GitLab