X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=mobile%2Fusers.php;h=d51cafcab8bb21ce5dbc23c2de75ccd355f988d3;hb=2a2bb2cc8f9551d1e93de2d34e27b21201f9e44a;hp=b531d7a49c42c9aa998abbbd2851b96764a617fb;hpb=2df50105b46a5cbd6493271b137a136ccfe2ea5a;p=timetracker.git

diff --git a/mobile/users.php b/mobile/users.php
index b531d7a4..d51cafca 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -29,6 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttGroupHelper');
 import('ttTimeHelper');
 
 // Access checks.
@@ -38,19 +39,27 @@ if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
 }
 // End of access checks.
 
-// Get users.
-$active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
+// Prepare a list of active users.
+$rank = $user->getMaxRankForGroup($user->getGroup());
+if ($user->can('view_users'))
+  $options = array('status'=>ACTIVE,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
+else /* if ($user->can('manage_users')) */
+  $options = array('status'=>ACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_self'=>true,'include_login'=>true,'include_role'=>true);
+$active_users = $user->getUsers($options);
+
+// Prepare a list of inactive users.
 if($user->can('manage_users')) {
-  $can_delete_manager = (1 == count($active_users));
-  $inactive_users = ttTeamHelper::getInactiveUsers($user->group_id, true);
+  $options = array('status'=>INACTIVE,'max_rank'=>$rank,'include_clients'=>true,'include_login'=>true,'include_role'=>true);
+  $inactive_users = $user->getUsers($options);
 }
 
-// Check if the team is set to show indicators for uncompleted time entries.
-if ($user->uncompleted_indicators) {
+$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
+if ($uncompleted_indicators) {
   // Check each active user if they have an uncompleted time entry.
-  foreach ($active_users as $key => $user) {
-    $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
+  foreach ($active_users as $key => $active_user) {
+    $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($active_user['id']);
   }
+  $smarty->assign('uncompleted_indicators', true);
 }
 
 $smarty->assign('active_users', $active_users);