From: Andréas Lundgren <Adevade@users.noreply.github.com>
Date: Sun, 16 Oct 2016 19:06:56 +0000 (+0200)
Subject: Add indicator for uncompleted time entry in users.php (#20)
X-Git-Tag: timetracker_1.19-1~1632
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=278a83090d6bf9d6351a449ba045323088f678aa;p=timetracker.git

Add indicator for uncompleted time entry in users.php (#20)

* Add indicator for uncompleted time entry in users.php


Roles that can manage team now see if a user has an uncompleted time entry from the Users screen.

* Fix - White space
---

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 1062b2be..0a83a1ba 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -352,6 +352,7 @@ $i18n_key_words = array(
 // Users form. See example at https://timetracker.anuko.com/users.php
 'form.users.active_users' => 'Active Users',
 'form.users.inactive_users' => 'Inactive Users',
+'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Role',
 'form.users.manager' => 'Manager',
 'form.users.comanager' => 'Co-manager',
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 363cbd90..2094860c 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -351,6 +351,7 @@ $i18n_key_words = array(
 // Users form. See example at https://timetracker.anuko.com/users.php
 'form.users.active_users' => 'Aktiva användare',
 'form.users.inactive_users' => 'Inaktiva användare',
+'form.users.uncompleted_entry' => 'Användaren har en oavslutad tidsregistrering',
 'form.users.role' => 'Roll',
 'form.users.manager' => 'Ansvarig',
 'form.users.comanager' => 'Delansvarig',
diff --git a/WEB-INF/templates/mobile/users.tpl b/WEB-INF/templates/mobile/users.tpl
index 38c96ae9..fedfa804 100644
--- a/WEB-INF/templates/mobile/users.tpl
+++ b/WEB-INF/templates/mobile/users.tpl
@@ -19,6 +19,7 @@
     {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
           <td>
+            <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
             {if $user->isManager()}
               <a href="user_edit.php?id={$u.id}">{$u.name|escape:'html'}</a>
             {else}
diff --git a/WEB-INF/templates/users.tpl b/WEB-INF/templates/users.tpl
index 0b64b73c..0eaa1496 100644
--- a/WEB-INF/templates/users.tpl
+++ b/WEB-INF/templates/users.tpl
@@ -20,7 +20,10 @@
   {if $active_users}
     {foreach $active_users as $u}
         <tr bgcolor="{cycle values="#f5f5f5,#dedee5"}">
-          <td>{$u.name|escape:'html'}</td>
+          <td>
+            <span class="uncompleted-entry{if $u.has_uncompleted_entry} active{/if}"{if $u.has_uncompleted_entry} title="{$i18n.form.users.uncompleted_entry}"{/if}></span>
+            {$u.name|escape:'html'}
+          </td>
           <td>{$u.login|escape:'html'}</td>
       {if $smarty.const.ROLE_MANAGER == $u.role}
             <td>{$i18n.form.users.manager}</td>
diff --git a/default.css b/default.css
index 7b305dab..611d4255 100644
--- a/default.css
+++ b/default.css
@@ -144,6 +144,16 @@ table.divider {
 
 div#LoginAboutText { width:400px; }
 
+.uncompleted-entry {
+  display: inline-block;
+  height: 8px;
+  width: 8px;
+  border: 1px solid rgba(0, 0, 0, .1);
+  border-radius: 50%;
+  background-color: rgba(0, 0, 0, .1);
+}
+.uncompleted-entry.active { background-color: red; }
+
 /* Mobile styles */
 .mobile-table {
   border: 0;
diff --git a/mobile/users.php b/mobile/users.php
index 71caa6ea..c3c6a982 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -29,6 +29,7 @@
 require_once('../initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttTimeHelper');
 
 // Access check.
 if (!ttAccessCheck(right_data_entry)) {
@@ -43,6 +44,14 @@ if($user->canManageTeam()) {
   $inactive_users = ttTeamHelper::getInactiveUsers($user->team_id, true);
 }
 
+// Check each active user if they have an uncompleted time entry.
+foreach ($active_users as $key => $user) {
+  // Turn value from database into boolean.
+  $has_uncompleted_entry = boolval(ttTimeHelper::getUncompleted($user['id']));
+  // Add to current user in $active_users array.
+  $active_users[$key]['has_uncompleted_entry'] = $has_uncompleted_entry;
+}
+
 $smarty->assign('active_users', $active_users);
 $smarty->assign('inactive_users', $inactive_users);
 $smarty->assign('can_delete_manager', $can_delete_manager);
diff --git a/users.php b/users.php
index 3a3b146f..a841818d 100644
--- a/users.php
+++ b/users.php
@@ -29,6 +29,7 @@
 require_once('initialize.php');
 import('form.Form');
 import('ttTeamHelper');
+import('ttTimeHelper');
 
 // Access check.
 if (!ttAccessCheck(right_data_entry)) {
@@ -43,6 +44,14 @@ if($user->canManageTeam()) {
   $inactive_users = ttTeamHelper::getInactiveUsers($user->team_id, true);
 }
 
+// Check each active user if they have an uncompleted time entry.
+foreach ($active_users as $key => $user) {
+  // Turn value from database into boolean.
+  $has_uncompleted_entry = boolval(ttTimeHelper::getUncompleted($user['id']));
+  // Add to current user in $active_users array.
+  $active_users[$key]['has_uncompleted_entry'] = $has_uncompleted_entry;
+}
+
 $smarty->assign('active_users', $active_users);
 $smarty->assign('inactive_users', $inactive_users);
 $smarty->assign('can_delete_manager', $can_delete_manager);