More progress on timesheets.

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index a8276b55a923a0e8b13cfa2cb57b0fc82ed94ce5..f7cae6765ac2d3aee14e9ad294d2cbf22c1b15c8 100644 (file)
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -78,4 +78,36 @@ class ttTimesheetHelper {
 
     return $last_id;
   }
 
     return $last_id;
   }

+
+  // The getTimesheets obtains timesheets for user.
+  static function getTimesheets($user_id)
+  {
+    global $user;
+    $mdb2 = getConnection();
+
+    $group_id = $user->getGroup();
+    $org_id = $user->org_id;
+
+    // $addPaidStatus = $user->isPluginEnabled('ps');
+    $result = array();
+
+    if ($user->isClient())
+      $client_part = "and ts.client_id = $user->client_id";
+
+    $sql = "select ts.id, ts.name, ts.client_id, c.name as client_name from tt_timesheets ts".
+      " left join tt_clients c on (c.id = ts.client_id)".
+      " where ts.status = 1 and ts.group_id = $group_id and ts.org_id = $org_id and ts.user_id = $user_id".
+      " $client_part order by ts.name";
+    $res = $mdb2->query($sql);
+    $result = array();
+    if (!is_a($res, 'PEAR_Error')) {
+      $dt = new DateAndTime(DB_DATEFORMAT);
+      while ($val = $res->fetchRow()) {
+        //if ($addPaidStatus)
+        //  $val['paid'] = ttTimesheetHelper::isPaid($val['id']);
+        $result[] = $val;
+      }
+    }
+    return $result;
+  }

 }
 }

diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php
index 5309dd8ad255a5b328650d887955520e115be5be..36f9163f1639ace56d80e9afbf4e6ed18bc8f92a 100644 (file)
--- a/WEB-INF/lib/ttUser.class.php
+++ b/WEB-INF/lib/ttUser.class.php
@@ -886,9 +886,4 @@ class ttUser {
 
     return false;
   }
 
     return false;
   }

-
-  // getTimesheets obtains timesheets for user.
-  function getTimesheets() {
-    return null; // Not implemented.
-  }

 }
 }

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index f129c9b3b2cc3b82349101dde28cb2fdc35aaa10..2faa0a1057f98f7d11bf77011e27dbf4f87a4885 100644 (file)
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -461,6 +461,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index d722cb92af31873334e778ace34cb6cfa304d3ee..b5a5cdc2de4c6aa1233a661a17945135b9eec7db 100644 (file)
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -471,6 +471,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index 976d9f3fca8d573153da8ddb672e3c35a31c070f..ba43617cb428dfdf48f18c933c64f903bb5e45a9 100644 (file)
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -434,6 +434,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 6ac1c0345ecd1d290961a8b62b31c979cbd843b1..fc8f262d0663928e3c0ab4249287e6f0c69b704d 100644 (file)
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -412,6 +412,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 5da77cb2181a4b7b4d20164208a7b9db69172034..f65f9323886a5bb006394caf10bfe2f89b18db23 100644 (file)
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -408,6 +408,8 @@ $i18n_key_words = array(
 
  // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 'form.timesheets.hint' => 'Use reports to add new timesheets.',
 
  // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 'form.timesheets.hint' => 'Use reports to add new timesheets.',

+'form.timesheets.active_timesheets' => 'Active Timesheets',
+'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 124bfed7bb17d8949a8c76381b2ea752207d8c38..3cb20b86abfd8c1a96545541d5bf6f201eed77c4 100644 (file)
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -474,6 +474,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 864fb91eb5d5f744d43db4c5c95dcd9a196c15be..c489a56a1cb8d6e717d50134e80baf15dda67577 100644 (file)
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -437,6 +437,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 501d9572a1d496748acfd63e44685237b10aad28..8c3907cea028adf531931967835462b872f77169 100644 (file)
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -454,6 +454,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index e400a94187fbf817e41c46b727254714dec40f42..647b8f58307bdb28b76d01e048beb0474503f779 100644 (file)
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -439,6 +439,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 3f411e9fd7abb6d7c40235be753e8600c2892ba6..d6ee165efeb536e3be807165f4836e5086f0a90e 100644 (file)
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -431,6 +431,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 60b312a027e16d0df6714ffa445dad414d03cde4..1d048d2baffe0cc8b81a3e9a820dd32519169be3 100644 (file)
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -421,6 +421,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index 5cfe3f2022eac7d8f0284772f7f62d496ef6add0..291425ef89dd2b8ed7bb519c0c47df697a7b27e1 100644 (file)
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -461,6 +461,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 46d0bd6c48895d36afe6bbb7857b5ff49ca904a6..ea0d73630edd75b3b44a3ef11ff3391a301549f4 100644 (file)
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -464,6 +464,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 5215f7f6b621a4079e6b2d267f510cbfe30b2500..b5faa5a8c55b427cbd581ddcf66fee87940882c1 100644 (file)
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -434,6 +434,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index 9c01727b091334412861d50c43f745719026da86..5b4aad614096ca7ece3353812f417df0259ee5c8 100644 (file)
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -469,6 +469,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 8d5aa443aabb5145f5fce43bd4a1988761f5aadf..74d3a8dd722bea43fb9c996708a211b908eac8ec 100644 (file)
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -467,6 +467,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 1e7146f6aea6f58f850cad463a0ba0f1a46104a7..e4b77504757041f55199fb65e9d0d388cf98138a 100644 (file)
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -408,6 +408,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 6a38cb2a67623bcc4df833c55866df11e759b5c4..b1c315e9942802b1b10f5485311640a39fc22f9c 100644 (file)
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -466,6 +466,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 40167912e4e2514f2b7dcd2a83b79ed56181ac8a..a41c703beae385a4645775428d837002825472c3 100644 (file)
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -442,6 +442,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index 61f06f35afeae05a0dfd6e01ce7f815bf72ee3cb..62676f99c3874551ad0aad5539c08057fc215db5 100644 (file)
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -437,6 +437,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 09aa8b52eba0d2fa7fccaf48b64fde558fe4f2d0..f305c28c3a0485e3cc52f02d5e684cbbac03a925 100644 (file)
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -445,6 +445,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index f8d711f3576daa305adde1ff8a1ea27366d95697..1cbc409111fd5dc4bd7c385716813b66f1bbd792 100644 (file)
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -469,6 +469,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 6c172c3380b41528f18e8d3ace715322f25fa3d1..02042912b97b9e6a6eba68a0ef299d1dc6003f8d 100644 (file)
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -400,6 +400,8 @@ $i18n_key_words = array(
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 'form.timesheets.hint' => 'Используйте отчёты для добавления новых табелей.',
 
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 'form.timesheets.hint' => 'Используйте отчёты для добавления новых табелей.',

+'form.timesheets.active_timesheets' => 'Активные табели',
+'form.timesheets.inactive_timesheets' => 'Неактивные табели',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index d79db8431f6d9cb4f804aa1696613a82eacad3c3..1ae854c2e602673a791590c97131a3daa1ed87c9 100644 (file)
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -452,6 +452,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index d720907db77c07cb7a7efeaa5c2a301d40057c11..5e92e716452e563ec3edf048251200a1c03b548c 100644 (file)
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -443,6 +443,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index e5be1d81604fe0437c817a08677c93433e477636..c2b9033bb43a60df7adc82192d83fc5eac20c88f 100644 (file)
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -440,6 +440,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Forma izveštaja. Pogledajte primer na https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Forma izveštaja. Pogledajte primer na https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 75a258dddb95dd764d63d6f1a0604929103c888d..bce576ae627dd6777db516cd71f0b92bd0de37d4 100644 (file)
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -438,6 +438,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index b6b3aeb6a497db77a0616fa3b75c4a2b03f468eb..4c8c2ad81384541f25118fc1593109b17c9e5d33 100644 (file)
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -480,6 +480,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index 5eb65a7fe4b3a9e9ba34127f25940c559f28ee17..1840f7b309fba5dae84f12d43afa06223f879479 100644 (file)
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -452,6 +452,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 68e505620696e746f285a3c1f6513671ed599252..f78a36fd8525d920339b03493d51f550ff6814c9 100644 (file)
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -460,6 +460,8 @@ $i18n_key_words = array(
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',
 // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php
 // TODO: translate the following.
 // form.timesheets.hint' => 'Use reports to add new timesheets.',

+// 'form.timesheets.active_timesheets' => 'Active Timesheets',
+// 'form.timesheets.inactive_timesheets' => 'Inactive Timesheets',

 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).
 
 // Invoice form. See example at https://timetracker.anuko.com/invoice.php
 // (you can get to this form after generating a report).

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 8e33a487423ba039a0584e718541117765bfe277..a91fdab4a9c6c4ee6e279d80ff22a12324a77223 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.18.37.4734 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.37.4735 | 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/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 626065846423b0d7d5f225326eff6028ca292f5d..796f2720796ab125ac5cc898de42355d793c709f 100644 (file)
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -19,8 +19,8 @@
         </tr>
         {foreach $timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
         </tr>
         {foreach $timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">

-          <td>{$invoice.name|escape}</td>
-          <td>{$invoice.client_name|escape}</td>
+          <td>{$timesheet.name|escape}</td>
+          <td>{$timesheet.client_name|escape}</td>

           <td>{$invoice.date}</td>
   {if $user->isPluginEnabled('ps')}
           <td>{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
           <td>{$invoice.date}</td>
   {if $user->isPluginEnabled('ps')}
           <td>{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>

diff --git a/timesheets.php b/timesheets.php
index b2c64e636a0c9c57da6fde58c572a8a6b5a8f93b..4a4eb66fef20ca9802d3039dcd892aa45f792099 100644 (file)
--- a/timesheets.php
+++ b/timesheets.php
@@ -28,7 +28,7 @@
 
 require_once('initialize.php');
 import('form.Form');
 
 require_once('initialize.php');
 import('form.Form');

-import('ttGroupHelper');
+import('ttTimesheetHelper');

 
 // Access checks.
 if (!(ttAccessAllowed('view_own_timesheets') ||
 
 // Access checks.
 if (!(ttAccessAllowed('view_own_timesheets') ||


@@ -46,7 +46,7 @@ if (!$user->isPluginEnabled('ts')) {
 }
 // End of access checks.
 
 }
 // End of access checks.
 

-$timesheets = $user->getTimesheets();
+$timesheets = ttTimesheetHelper::getTimesheets($user->getUser());

 
 $smarty->assign('timesheets', $timesheets);
 $smarty->assign('title', $i18n->get('title.timesheets'));
 
 $smarty->assign('timesheets', $timesheets);
 $smarty->assign('title', $i18n->get('title.timesheets'));