From 070feb4b664cf84613fed378d568a9449c3780e6 Mon Sep 17 00:00:00 2001
From: guillaume <guillaume.cassou@orange.fr>
Date: Fri, 19 Apr 2019 16:17:17 +0200
Subject: Number of users

---
 client/components/settings/peopleBody.jade |  9 ++++---
 client/components/settings/peopleBody.js   | 42 ++++++++++++++++++++----------
 client/components/settings/peopleBody.styl |  4 +++
 i18n/en.i18n.json                          |  3 ++-
 i18n/fr.i18n.json                          |  5 ++--
 5 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade
index e459da6e..30b7a807 100644
--- a/client/components/settings/peopleBody.jade
+++ b/client/components/settings/peopleBody.jade
@@ -4,9 +4,12 @@ template(name="people")
       | {{_ 'error-notAuthorized'}}
     else
       .content-title.ext-box
-        span {{_ 'people'}}
-        input#searchInput(placeholder="{{_ 'search'}}")
-        button#searchButton {{_ 'enter'}}
+        .ext-box-left
+          span {{_ 'people'}}
+          input#searchInput(placeholder="{{_ 'search'}}")
+          button#searchButton {{_ 'enter'}}
+        .ext-box-right
+          span {{_ 'people-number'}} #{peopleNumber}
       .content-body
         .side-menu
           ul
diff --git a/client/components/settings/peopleBody.js b/client/components/settings/peopleBody.js
index 245c8884..db7be138 100644
--- a/client/components/settings/peopleBody.js
+++ b/client/components/settings/peopleBody.js
@@ -9,6 +9,7 @@ BlazeComponent.extendComponent({
     this.loading = new ReactiveVar(false);
     this.people = new ReactiveVar(true);
     this.findUsersOptions = new ReactiveVar({});
+    this.number = new ReactiveVar(0);
 
     this.page = new ReactiveVar(1);
     this.loadNextPageLocked = false;
@@ -30,22 +31,30 @@ BlazeComponent.extendComponent({
   events() {
     return [{
       'click #searchButton'(event) {
-        const value = $('#searchInput').first().val();
-        if (value === '') {
-          this.findUsersOptions.set({});
-        } else {
-          const regex = new RegExp(value, 'i');
-          this.findUsersOptions.set({
-            $or: [
-              { username: regex },
-              { 'profile.fullname': regex },
-              { 'emails.address': regex },
-            ]
-          });
+        this.filterPeople(event);
+      },
+      'keydown #searchInput'(event) {
+        if (event.keyCode === 13 && !event.shiftKey) {
+          this.filterPeople(event);
         }
       }
     }];
   },
+  filterPeople(event) {
+    const value = $('#searchInput').first().val();
+    if (value === '') {
+      this.findUsersOptions.set({});
+    } else {
+      const regex = new RegExp(value, 'i');
+      this.findUsersOptions.set({
+        $or: [
+          { username: regex },
+          { 'profile.fullname': regex },
+          { 'emails.address': regex },
+        ]
+      });
+    }
+  },
   loadNextPage() {
     if (this.loadNextPageLocked === false) {
       this.page.set(this.page.get() + 1);
@@ -69,11 +78,16 @@ BlazeComponent.extendComponent({
     this.loading.set(w);
   },
   peopleList() {
-    // get users in front to cache them
-    return Users.find(this.findUsersOptions.get(), {
+    const users = Users.find(this.findUsersOptions.get(), {
       fields: {_id: true},
     });
+    this.number.set(users.count());
+    return users;
   },
+  peopleNumber() {
+    return this.number.get();
+  }
+
 }).register('people');
 
 Template.peopleRow.helpers({
diff --git a/client/components/settings/peopleBody.styl b/client/components/settings/peopleBody.styl
index fb9d5c6b..b98c5340 100644
--- a/client/components/settings/peopleBody.styl
+++ b/client/components/settings/peopleBody.styl
@@ -19,6 +19,10 @@ table
   flex-direction: row;
   height: 34px;
 
+  .ext-box-left
+    display: flex;
+    width: 40%
+
   span
     vertical-align: center;
     line-height: 34px;
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 4e4af38b..22e15934 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -686,5 +686,6 @@
     "error-ldap-login": "An error occurred while trying to login",
     "display-authentication-method": "Display Authentication Method",
     "default-authentication-method": "Default Authentication Method",
-    "duplicate-board": "Duplicate Board"
+    "duplicate-board": "Duplicate Board",
+    "people-number": "The number of people is: "
 }
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index bc7614d5..1eb2a278 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -683,5 +683,6 @@
     "error-ldap-login": "Une erreur s'est produite lors de la tentative de connexion",
     "display-authentication-method": "Afficher la méthode d'authentification",
     "default-authentication-method": "Méthode d'authentification par défaut",
-    "duplicate-board": "Dupliquer le tableau"
-}
\ No newline at end of file
+    "duplicate-board": "Dupliquer le tableau",
+    "people-number": "Le nombre d'utilisateurs est de : "
+}
-- 
cgit v1.2.3-1-g7c22