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 39b42eea094ae4fdead507952cbce928ad39d9f9..17ccda93d91f36e5b790988618fe1cdd9a30284b 100644 (file)
--- 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',
 // 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',
 '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 182d9a0eb3bdae80c7ad234d356f9243610e2790..693c9c0a7341116e87704578a1c8f2358acbc5b4 100644 (file)
--- 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',
 // 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',
 '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 0e3b6161e5211ee4490d55b7f784ad2bf78ffc4e..af3ff54988e3f33d7bfe33fee760311594024165 100644 (file)
--- 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' => 'کاربران غیرفعال',
 // 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' => 'دستیار مدیر',
 '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 885bb84eef9b84dfb8ce2923090eef44a7170e4b..293885fb7889811623b10f61ab560df35f1e82a3 100644 (file)
--- 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',
 // 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',
 '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 88c366fa0581b2990512a89eecaa1ad5d2ca0dca..9c61f2927605ec5baf558c944359b7f69ade26fe 100644 (file)
--- 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',
 // 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',
 '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 6862b0c9438a132cb87a959fd0fc6d6df72cb9cb..14e5a538c723cbc4dcc761cabf51c369d1c2765f 100644 (file)
--- 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' => 'משתמשים לא פעילים',
 // 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' => 'מנהל משנה',
 '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 2fe6874c725eecf2fbb2b39c3e38e53bd6ce7576..69248ffbf425aaed98b87000c8b9671efdd04110 100644 (file)
--- 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',
 // 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',
 '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 176a14dedae391be109c2a721a063a1d3b120790..9d18c2100ddfed828411a63759403d34ac85cd6e 100644 (file)
--- 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',
 // 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',
 '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 15612ba3b37e061d954c7b3e81bef09a998af8e2..926b86b1b1e669147a97141846e4c619ad38244f 100644 (file)
--- 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',
 // 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',
 '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 31cc87b1ec8fe1da93ff7514f96c531f3c520544..10ff6e79eb2c295c26502076f338b7f887775c3f 100644 (file)
--- 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' => 'Неактивные пользователи',
 // 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' => 'Ассистент менеджера',
 '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 b9090ff899760aba2f309b3d211a3b7bc727a25a..18d6db9c9a2892e7f6ca9a5801e37c9c50b6dd52 100644 (file)
--- 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',
 // 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',
 '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 957f43553ac9c63913ba50e0a73a309afd2f071d..84dfa80306822de4313ef1373de8a88b43e0913b 100644 (file)
--- 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',
 // 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',
 '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 0ffe573410f463e08b1ce90948b7d61878456ab4..e5c7e2bacb21caa934a01d5a8341f3d55df960d3 100644 (file)
--- 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>
       <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>
             <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 2c6bf6eb99031da563c440a14f07cd77ad1758ec..b3d8ae7e8cab7f1749afe46234b22a3abc166f29 100644 (file)
--- 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) {
 
 // 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);
 }
 
 $smarty->assign('active_users', $active_users);

diff --git a/users.php b/users.php
index cd60b893b4c3e76781d3facb6046926ba872516b..1233f114aad20a1e763247c8a43cada94f40132d 100644 (file)
--- 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) {
 
 // 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);
 }
 
 $smarty->assign('active_users', $active_users);