From c375e7ae121117c0f2a141f9fdeb99a608cc92b2 Mon Sep 17 00:00:00 2001
From: osarrat <olivier.sarrat@laposte.net>
Date: Wed, 26 Apr 2017 16:16:00 +0200
Subject: [PATCH] Add active users count in Users Admin

Refs issue #879
Work-In-Progress: the count is fixed to 0 and doesn't changed in this early version.
---
 .../presenter/admin/users/UsersAdminPresenter.java |  4 ++++
 .../client/ui/view/admin/users/UsersAdminView.java | 14 +++++++++++++-
 .../org/sigmah/client/i18n/UIConstants.properties  |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/sigmah/client/ui/presenter/admin/users/UsersAdminPresenter.java b/src/main/java/org/sigmah/client/ui/presenter/admin/users/UsersAdminPresenter.java
index 39518a45a..22585e642 100644
--- a/src/main/java/org/sigmah/client/ui/presenter/admin/users/UsersAdminPresenter.java
+++ b/src/main/java/org/sigmah/client/ui/presenter/admin/users/UsersAdminPresenter.java
@@ -154,6 +154,8 @@ public static interface View extends AbstractAdminPresenter.View {
 		// --
 
 		void setGridEditHandler(GridEditHandler handler);
+        
+        void updateUsersPanelTitle();
 
 	}
 
@@ -430,6 +432,8 @@ public void onCommandSuccess(final ListResult<UserDTO> result) {
 				view.getUsersStore().commitChanges();
 			}
 		}, view.getUsersLoadable());
+        
+        view.updateUsersPanelTitle();
 	}
 
 	/**
diff --git a/src/main/java/org/sigmah/client/ui/view/admin/users/UsersAdminView.java b/src/main/java/org/sigmah/client/ui/view/admin/users/UsersAdminView.java
index 80f20dd70..132a221fd 100644
--- a/src/main/java/org/sigmah/client/ui/view/admin/users/UsersAdminView.java
+++ b/src/main/java/org/sigmah/client/ui/view/admin/users/UsersAdminView.java
@@ -77,7 +77,6 @@
 import com.extjs.gxt.ui.client.widget.layout.FitLayout;
 import com.extjs.gxt.ui.client.widget.toolbar.LabelToolItem;
 import com.google.gwt.i18n.client.DateTimeFormat;
-import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.inject.Singleton;
 
 /**
@@ -187,6 +186,19 @@ public void initialize() {
 
 		add(mainContainer);
 	}
+    
+    /**
+     * Update users panel title with latest active users count
+     */
+    public void updateUsersPanelTitle() {
+        int activeUsersCount = 0;
+        for(int i=0; i<usersGrid.getStore().getCount(); i++ ) {            
+            if (usersGrid.getStore().getAt(i).getActive())
+                activeUsersCount++;
+        }
+        this.usersListPanel.setHeadingText(I18N.CONSTANTS.adminUsersPanel()
+                + " (" + activeUsersCount + " " + I18N.CONSTANTS.adminUsersActiveUsers() + ")");
+    }
 
 	/**
 	 * {@inheritDoc}
diff --git a/src/main/resources/org/sigmah/client/i18n/UIConstants.properties b/src/main/resources/org/sigmah/client/i18n/UIConstants.properties
index 603a1a054..41d7cbbbd 100644
--- a/src/main/resources/org/sigmah/client/i18n/UIConstants.properties
+++ b/src/main/resources/org/sigmah/client/i18n/UIConstants.properties
@@ -387,6 +387,8 @@ adminUsersActive=Status
 adminUsersDatePasswordChange=Last password change
 adminUsersEmail=Email
 adminUsersFirstName=First name
+#To display the number of "active users"
+adminUsersActiveUsers=active users
 adminUsersIsActive=Active
 adminUsersLocale=Invitation language
 adminUsersName=Surname