From 5273e4c8c3df9d19d21d6146a704acd1781b9fa5 Mon Sep 17 00:00:00 2001 From: Alex Orluc <alex.orluc@maarch.org> Date: Tue, 27 Mar 2018 11:22:55 +0200 Subject: [PATCH] FEAT #254 add msg if limit data reached --- .../Views/batchHistory-administration.component.html | 1 + .../Views/history-administration.component.html | 2 ++ apps/maarch_entreprise/js/angular/lang/lang-en.ts | 1 + apps/maarch_entreprise/js/angular/lang/lang-fr.ts | 1 + 4 files changed, 5 insertions(+) diff --git a/apps/maarch_entreprise/Views/batchHistory-administration.component.html b/apps/maarch_entreprise/Views/batchHistory-administration.component.html index 0f507cc91e1..0d943a78fab 100644 --- a/apps/maarch_entreprise/Views/batchHistory-administration.component.html +++ b/apps/maarch_entreprise/Views/batchHistory-administration.component.html @@ -21,6 +21,7 @@ <mat-spinner style="margin:auto;"></mat-spinner> </div> <mat-card *ngIf="!loading" class="card-app-content"> + <div class="alert alert-warning" role="alert" [innerHTML]="lang.limitDataReached" *ngIf="data.length == 50000"></div> <div class="row"> <div class="col-md-6 col-xs-6"> <mat-form-field> diff --git a/apps/maarch_entreprise/Views/history-administration.component.html b/apps/maarch_entreprise/Views/history-administration.component.html index 5eb92c30fab..483fc1e7f4b 100644 --- a/apps/maarch_entreprise/Views/history-administration.component.html +++ b/apps/maarch_entreprise/Views/history-administration.component.html @@ -21,6 +21,8 @@ <mat-spinner style="margin:auto;"></mat-spinner> </div> <mat-card *ngIf="!loading" class="card-app-content"> + <div class="alert alert-warning" role="alert" [innerHTML]="lang.limitDataReached" *ngIf="data.length == 50000"> + </div> <div class="row"> <div class="col-md-6 col-xs-6"> <mat-form-field> diff --git a/apps/maarch_entreprise/js/angular/lang/lang-en.ts b/apps/maarch_entreprise/js/angular/lang/lang-en.ts index 149cd3f1aa5..c6ff17a098b 100755 --- a/apps/maarch_entreprise/js/angular/lang/lang-en.ts +++ b/apps/maarch_entreprise/js/angular/lang/lang-en.ts @@ -170,6 +170,7 @@ export const LANG_EN = { "label" : "Label", "lastname" : "Lastname", "life_cycle" : "Life cycle", + "limitDataReached" : "You have reached max display datas (<b>50000 datas</b>), refine your <b>date range</b>", "linkGroup" : "Link a group", "listTemplatesRolesUpdated" : "Roles updated", "logout" : "Logout", diff --git a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts index abf5a3cdb9e..ebeab9b1e15 100755 --- a/apps/maarch_entreprise/js/angular/lang/lang-fr.ts +++ b/apps/maarch_entreprise/js/angular/lang/lang-fr.ts @@ -184,6 +184,7 @@ export const LANG_FR = { "last" : "dernier", "lastname" : "Nom", "life_cycle" : "Cycle de vie", + "limitDataReached" : "Vous avez atteint la limite d'affichage (<b>50000 entrées</b>), veuillez affiner votre <b>plage de dates</b>", "linkGroup" : "Associer un groupe", "listTemplatesRolesUpdated" : "Rôles modifiés", "logout" : "Se déconnecter", -- GitLab