From 7b78d9ebe4ef22ccfaf561fcb58f2a1c31e85f1a Mon Sep 17 00:00:00 2001
From: Nabil Adouani <nabil.adouani@gmail.com>
Date: Wed, 22 Jul 2020 14:00:05 +0200
Subject: [PATCH] #1332 Add pagination widgets to user list

---
 frontend/app/views/components/org/user.list.html    | 13 +++++++++++++
 .../views/partials/admin/organisation/details.html  |  8 +++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/frontend/app/views/components/org/user.list.html b/frontend/app/views/components/org/user.list.html
index 1339b507ff..fa2727fb8b 100644
--- a/frontend/app/views/components/org/user.list.html
+++ b/frontend/app/views/components/org/user.list.html
@@ -10,6 +10,8 @@
 
 <div class="row" ng-if="$ctrl.users.total > 0">
     <div class="col-md-12">
+        <psearch control="$ctrl.users"></psearch>
+
         <table class="table table-striped case-list valigned">
             <thead>
                 <tr>
@@ -34,6 +36,14 @@
                     <th>Password</th>
                     <th>API Key</th>
                     <th class="text-center" style="width: 100px" ng-if="$ctrl.mfaEnabled">MFA</th>
+                    <th class="text-center" style="width: 120px">
+                        <a href class="text-default" ng-click="$ctrl.sortByField('_updatedAt')">
+                            Updated At
+                            <i ng-show="$ctrl.sort.indexOf('+_updatedAt') === -1 && $ctrl.sort.indexOf('-_updatedAt') === -1" class="fa fa-sort"></i>
+                            <i ng-show="$ctrl.sort.indexOf('+_updatedAt') !== -1" class="fa fa-caret-up"></i>
+                            <i ng-show="$ctrl.sort.indexOf('-_updatedAt') !== -1" class="fa fa-caret-down"></i>
+                        </a>
+                    </th>
                     <th style="width: 100px"></th>
                 </tr>
             </thead>
@@ -95,6 +105,7 @@
                             <button type="button" class="btn btn-danger btn-sm" ng-click="$ctrl.resetMfa(user)">Reset</button>
                         </span>
                     </td>
+                    <td>{{user._updatedAt | shortDate}}</td>
                     <td>
                         <span class="clickable mr-xxs text-primary" ng-click="$ctrl.editUser(user)" uib-tooltip="Edit User">
                             <i class="text-20 fa fa-edit"></i>
@@ -115,6 +126,8 @@
                 </tr>
             </tbody>
         </table>
+
+        <psearch control="$ctrl.users"></psearch>
     </div>
 </div>
 <script type="text/ng-template" id="permissionsPopoverTemplate.html">
diff --git a/frontend/app/views/partials/admin/organisation/details.html b/frontend/app/views/partials/admin/organisation/details.html
index e5504fc555..a019828945 100644
--- a/frontend/app/views/partials/admin/organisation/details.html
+++ b/frontend/app/views/partials/admin/organisation/details.html
@@ -50,7 +50,7 @@ <h3 class="box-title">
                             </span>
                         </uib-tab-heading>
                         <div if-permission="manageUser">
-                            <div class="row mb-xs">
+                            <div class="row">
                                 <div class="col-md-12">
                                     <div class="btn-toolbar" role="toolbar">
                                         <button class="btn btn-sm btn-primary" type="button" ng-click="$vm.showUserDialog()">
@@ -88,8 +88,14 @@ <h3 class="box-title">
                                 <div class="col-md-12">
                                     <div class="mt-s filter-panel" ng-include="'views/partials/admin/organisation/list/filters.html'" ng-show="$vm.filtering.context.showFilters"></div>
 
+
                                     <div class="row mt-s">
                                         <div class="col-md-12 clearfix">
+                                            <div class="pull-left">
+                                                <h4>
+                                                    User List ({{$vm.users.values.length || 0}} of {{$vm.users.total}})
+                                                </h4>
+                                            </div>
 
                                             <filters-preview filters="$vm.filtering.context.filters"
                                                 on-clear-item="$vm.removeFilter(field)"