From 6631f3ea3b5d9c4970c066ceae0f4de4ac205c7a Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Fri, 18 Dec 2020 17:46:25 +0100
Subject: [PATCH] FEAT #10994 TIME 0:15 fix user filter + nb filters display

---
 lang/fr.json                                         |  4 +++-
 .../history/history-list.component.html              |  4 ++--
 .../history/history-list.component.scss              | 10 ++++++++++
 .../administration/history/history-list.component.ts | 12 ++++++------
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/lang/fr.json b/lang/fr.json
index 536fdad960..b24878bde8 100755
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -419,6 +419,8 @@
 		"manage_historyAdmin": "Consulter l'historique",
 		"manage_historyDesc": "Consulter les différents événements de l'application",
 		"loadingValidation": "Validation du document en cours ...",
-		"workflowTemplateAdded": "Modèle de circuit ajouté"
+		"workflowTemplateAdded": "Modèle de circuit ajouté",
+		"by": "par",
+		"the": "le"
 	}
 }
diff --git a/src/frontend/app/administration/history/history-list.component.html b/src/frontend/app/administration/history/history-list.component.html
index c4c35c2811..3ed3c9d37f 100644
--- a/src/frontend/app/administration/history/history-list.component.html
+++ b/src/frontend/app/administration/history/history-list.component.html
@@ -18,10 +18,10 @@
 <ion-content #mainContent>
     <ion-list *ngIf="resources.length > 0">
         <ion-virtual-scroll [items]="resources" approxItemHeight="90px">
-            <ion-item *virtualItem="let element" lines="full">
+            <ion-item *virtualItem="let element" lines="full" class="canSelect">
                 <ion-icon color="primary" slot="start" [name]="aventTypesIcon[element.type]"></ion-icon>
                 <ion-label>
-                    <p>Le <span class="primary">{{element.date | date:'dd/MM/yyyy HH:mm'}}</span> par <span
+                    <p>{{'lang.the' | translate | titlecase}} <span class="primary">{{element.date | date:'dd/MM/yyyy HH:mm'}}</span> {{'lang.by' | translate}} <span
                             class="primary">{{element.user}}</span></p>
                     <h2>{{element.message}}</h2>
                 </ion-label>
diff --git a/src/frontend/app/administration/history/history-list.component.scss b/src/frontend/app/administration/history/history-list.component.scss
index 13f92a7af6..073d49a87b 100644
--- a/src/frontend/app/administration/history/history-list.component.scss
+++ b/src/frontend/app/administration/history/history-list.component.scss
@@ -13,4 +13,14 @@
     .alert-wrapper {
         min-width: 350px;
     }
+}
+
+.canSelect {
+    * {
+        user-select: text !important;
+        -webkit-user-select: text !important;
+        -khtml-user-select: text !important;
+        -moz-user-select: text !important;
+        -ms-user-select: text !important;
+    }
 }
\ No newline at end of file
diff --git a/src/frontend/app/administration/history/history-list.component.ts b/src/frontend/app/administration/history/history-list.component.ts
index 34125a34f3..ed05606abb 100644
--- a/src/frontend/app/administration/history/history-list.component.ts
+++ b/src/frontend/app/administration/history/history-list.component.ts
@@ -5,10 +5,10 @@ import { HttpClient } from '@angular/common/http';
 import { MatDialog } from '@angular/material/dialog';
 import { MatSort, Sort } from '@angular/material/sort';
 import { TranslateService } from '@ngx-translate/core';
-import { map, finalize, tap, catchError } from 'rxjs/operators';
+import { tap, catchError } from 'rxjs/operators';
 import { LatinisePipe } from 'ngx-pipes';
 import { AuthService } from '../../service/auth.service';
-import { AlertController, IonInfiniteScroll, MenuController } from '@ionic/angular';
+import { AlertController, MenuController } from '@ionic/angular';
 import { of } from 'rxjs';
 import { SortPipe } from '../../plugins/sorting.pipe';
 
@@ -41,7 +41,7 @@ export class HistoryListComponent {
     count: number = 0;
 
     filters: any = {
-        search: '',
+        user: '',
         messageTypes: [],
         date: {
             start: null,
@@ -79,7 +79,7 @@ export class HistoryListComponent {
 
     applyFilter(filterValue: string) {
         filterValue = this.latinisePipe.transform(filterValue.toLowerCase());
-        this.filters.field = filterValue;
+        this.filters.user = filterValue;
         this.getDatas();
     }
 
@@ -159,7 +159,7 @@ export class HistoryListComponent {
 
     getNbFilters() {
         let nb = 0;
-        if (this.filters.search !== '') {
+        if (this.filters.user !== '') {
             nb++;
         }
         if (this.filters.date.start !== null) {
@@ -169,7 +169,7 @@ export class HistoryListComponent {
             nb++;
         }
         if (this.filters.messageTypes.length > 0) {
-            nb++;
+            nb += this.filters.messageTypes.length;
         }
         return nb;
     }
-- 
GitLab