From: anuko <support@anuko.com>
Date: Sun, 16 Oct 2016 20:02:16 +0000 (+0000)
Subject: Some refactoring and version change for PR#20.
X-Git-Tag: timetracker_1.19-1~1630
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=170717b62207bd2da1628959d55b691a2d6f95a3;p=timetracker.git

Some refactoring and version change for PR#20.
---

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 39b42eea..17ccda93 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -364,6 +364,8 @@ $i18n_key_words = array(
 // Users form. See example at https://timetracker.anuko.com/users.php
 'form.users.active_users' => 'Aktive Nutzer',
 'form.users.inactive_users' => 'Inaktive Nutzer',
+ // TODO: translate the following.
+ // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rolle',
 'form.users.manager' => 'Manager',
 'form.users.comanager' => 'Co-Manager',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 182d9a0e..693c9c0a 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -415,6 +415,7 @@ $i18n_key_words = array(
 // TODO: translate the following strings.
 // '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' => 'Rol',
 'form.users.manager' => 'Manejador',
 'form.users.comanager' => 'Auxiliar del manejador',
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 0e3b6161..af3ff549 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -377,6 +377,8 @@ $i18n_key_words = array(
 // Users form. See example at https://timetracker.anuko.com/users.php
 'form.users.active_users' => 'کاربران فعال',
 'form.users.inactive_users' => 'کاربران غیرفعال',
+ // TODO: translate the following.
+ // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'سمت',
 'form.users.manager' => 'مدیر',
 'form.users.comanager' => 'دستیار مدیر',
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 885bb84e..293885fb 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -350,6 +350,8 @@ $i18n_key_words = array(
 // Users form. See example at https://timetracker.anuko.com/users.php
 'form.users.active_users' => 'Aktiiviset käyttäjät',
 'form.users.inactive_users' => 'Ei-aktiiviset käyttäjät',
+ // TODO: translate the following.
+ // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rooli',
 'form.users.manager' => 'Esimies',
 'form.users.comanager' => 'Apuesimies',
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 88c366fa..9c61f292 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -393,6 +393,7 @@ $i18n_key_words = array(
 // TODO: translate the following strings.
 // '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' => 'Rôle',
 'form.users.manager' => 'Responsable',
 'form.users.comanager' => 'Co-responsable',
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 6862b0c9..14e5a538 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -380,6 +380,8 @@ $i18n_key_words = array(
 // Users form. See example at https://timetracker.anuko.com/users.php
 'form.users.active_users' => 'משתמשים פעילים',
 'form.users.inactive_users' => 'משתמשים לא פעילים',
+// TODO: translate the following.
+// 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'תפקיד',
 'form.users.manager' => 'מנהל',
 'form.users.comanager' => 'מנהל משנה',
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 2fe6874c..69248ffb 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -348,6 +348,8 @@ $i18n_key_words = array(
 // Users form. See example at https://timetracker.anuko.com/users.php
 'form.users.active_users' => 'Actieve medewerkers',
 'form.users.inactive_users' => 'Inactieve medewerkers',
+// TODO: translate the following.
+// 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rol',
 'form.users.manager' => 'Manager',
 'form.users.comanager' => 'Co-manager',
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 176a14de..9d18c210 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -360,6 +360,8 @@ $i18n_key_words = array(
 // Users form. See example at https://timetracker.anuko.com/users.php
 'form.users.active_users' => 'Aktywni użytkownicy',
 'form.users.inactive_users' => 'Nieaktywni użytkownicy',
+ // TODO: translate the following.
+ // 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rola',
 'form.users.manager' => 'Manager',
 'form.users.comanager' => 'Co-manager',
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 15612ba3..926b86b1 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -351,6 +351,8 @@ $i18n_key_words = array(
 // Users form. See example at https://timetracker.anuko.com/users.php
 'form.users.active_users' => 'Usuários ativos',
 'form.users.inactive_users' => 'Usuários inativos',
+// TODO: translate the following.
+// 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Papel',
 'form.users.manager' => 'Gerente',
 'form.users.comanager' => 'Coordenador',
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 31cc87b1..10ff6e79 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -349,6 +349,7 @@ $i18n_key_words = array(
 // Users form. See example at https://timetracker.anuko.com/users.php
 'form.users.active_users' => 'Активные пользователи',
 'form.users.inactive_users' => 'Неактивные пользователи',
+'form.users.uncompleted_entry' => 'Пользователь имеет неоконченную запись',
 'form.users.role' => 'Роль',
 'form.users.manager' => 'Менеджер',
 'form.users.comanager' => 'Ассистент менеджера',
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index b9090ff8..18d6db9c 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -378,6 +378,8 @@ $i18n_key_words = array(
 // Users form. See example at https://timetracker.anuko.com/users.php
 'form.users.active_users' => 'Aktívny používatelia',
 'form.users.inactive_users' => 'Neaktívny používatelia',
+// TODO: translate the following.
+// 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Rola',
 'form.users.manager' => 'Manažér',
 'form.users.comanager' => 'Spolumanažér',
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 957f4355..84dfa803 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -355,6 +355,8 @@ $i18n_key_words = array(
 // Korisnička forma. Pogledajte primer na https://timetracker.anuko.com/users.php
 'form.users.active_users' => 'Aktivni korisnik',
 'form.users.inactive_users' => 'Neaktivni korisnik',
+// TODO: translate the following.
+// 'form.users.uncompleted_entry' => 'User has an uncompleted time entry',
 'form.users.role' => 'Funkcija',
 'form.users.manager' => 'Menadžer',
 'form.users.comanager' => 'Saradnik',
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0ffe5734..e5c7e2ba 100644
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
-          <td align="center">&nbsp;Anuko Time Tracker 1.9.31.3541 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.9.32.3542 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
diff --git a/mobile/users.php b/mobile/users.php
index 2c6bf6eb..b3d8ae7e 100644
--- a/mobile/users.php
+++ b/mobile/users.php
@@ -46,10 +46,7 @@ if($user->canManageTeam()) {
 
 // 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 = (bool) ttTimeHelper::getUncompleted($user['id']);
-  // Add to current user in $active_users array.
-  $active_users[$key]['has_uncompleted_entry'] = $has_uncompleted_entry;
+  $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
 }
 
 $smarty->assign('active_users', $active_users);
diff --git a/users.php b/users.php
index cd60b893..1233f114 100644
--- a/users.php
+++ b/users.php
@@ -46,10 +46,7 @@ if($user->canManageTeam()) {
 
 // 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 = (bool) ttTimeHelper::getUncompleted($user['id']);
-  // Add to current user in $active_users array.
-  $active_users[$key]['has_uncompleted_entry'] = $has_uncompleted_entry;
+  $active_users[$key]['has_uncompleted_entry'] = (bool) ttTimeHelper::getUncompleted($user['id']);
 }
 
 $smarty->assign('active_users', $active_users);