A bit more refactoring ttProjectHelper class for subgroups.

[timetracker.git] / mobile / users.php

diff --git a/mobile/users.php b/mobile/users.php
index b531d7a49c42c9aa998abbbd2851b96764a617fb..594fa5bf123b32d092f2e3ec3d30cebb2d045ffb 100644 (file)
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -29,6 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttTeamHelper');
 require_once('../initialize.php');
 import('form.Form');
 import('ttTeamHelper');

+import('ttGroupHelper');

 import('ttTimeHelper');
 
 // Access checks.
 import('ttTimeHelper');
 
 // Access checks.


@@ -38,19 +39,21 @@ if (!(ttAccessAllowed('view_users') || ttAccessAllowed('manage_users'))) {
 }
 // End of access checks.
 
 }
 // End of access checks.
 

+$uncompleted_indicators = $user->getConfigOption('uncompleted_indicators');
+

 // Get users.
 // Get users.

-$active_users = ttTeamHelper::getActiveUsers(array('getAllFields'=>true));
+$active_users = ttGroupHelper::getActiveUsers(array('getAllFields'=>true));

 if($user->can('manage_users')) {
   $can_delete_manager = (1 == count($active_users));
   $inactive_users = ttTeamHelper::getInactiveUsers($user->group_id, true);
 }
 
 if($user->can('manage_users')) {
   $can_delete_manager = (1 == count($active_users));
   $inactive_users = ttTeamHelper::getInactiveUsers($user->group_id, true);
 }
 

-// Check if the team is set to show indicators for uncompleted time entries.
-if ($user->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']);
   }
   // 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']);
   }

+  $smarty->assign('uncompleted_indicators', true);

 }
 
 $smarty->assign('active_users', $active_users);
 }
 
 $smarty->assign('active_users', $active_users);