From: Nik Okuntseff <support@anuko.com>
Date: Fri, 15 Feb 2019 21:58:24 +0000 (+0000)
Subject: A bit more work in progress on timesheets.
X-Git-Tag: timetracker_1.19-1~328
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=e447782c5838a9715a7443a028d403aadf52a479;p=timetracker.git

A bit more work in progress on timesheets.
---

diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php
index c4822d38..2ecfb0b0 100644
--- a/WEB-INF/resources/ca.lang.php
+++ b/WEB-INF/resources/ca.lang.php
@@ -263,6 +263,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Només totals',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php
index 3ec87f3c..8e8f3c02 100644
--- a/WEB-INF/resources/cs.lang.php
+++ b/WEB-INF/resources/cs.lang.php
@@ -273,6 +273,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Pouze součty',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php
index d5087b8d..bde6d33d 100644
--- a/WEB-INF/resources/da.lang.php
+++ b/WEB-INF/resources/da.lang.php
@@ -249,6 +249,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Kun Total',
 'label.quota' => 'Kvota',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php
index 076bfae1..0ef54dca 100644
--- a/WEB-INF/resources/de.lang.php
+++ b/WEB-INF/resources/de.lang.php
@@ -237,6 +237,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Nur Gesamtstunden',
 'label.quota' => 'Quote',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php
index 7797a8d8..a6be4864 100644
--- a/WEB-INF/resources/en.lang.php
+++ b/WEB-INF/resources/en.lang.php
@@ -229,6 +229,7 @@ $i18n_key_words = array(
 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Totals only',
 'label.quota' => 'Quota',
+'label.timesheet' => 'Timesheet',
 'label.submitted' => 'Submitted',
 'label.approved' => 'Approved',
 
@@ -383,6 +384,8 @@ $i18n_key_words = array(
 'form.reports.include_not_billable' => 'not billable',
 'form.reports.include_invoiced' => 'invoiced',
 'form.reports.include_not_invoiced' => 'not invoiced',
+'form.reports.include_assigned' => 'assigned',
+'form.reports.include_not_assigned' => 'not assigned',
 'form.reports.select_period' => 'Select time period',
 'form.reports.set_period' => 'or set dates',
 'form.reports.show_fields' => 'Show fields',
diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php
index 1b307300..bd559412 100644
--- a/WEB-INF/resources/es.lang.php
+++ b/WEB-INF/resources/es.lang.php
@@ -266,6 +266,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Solo totales',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php
index 10beccf8..4410d9c4 100644
--- a/WEB-INF/resources/et.lang.php
+++ b/WEB-INF/resources/et.lang.php
@@ -251,6 +251,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Ainult summad',
 'label.quota' => 'Kvoot',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php
index 9c6ef591..2637158b 100644
--- a/WEB-INF/resources/fa.lang.php
+++ b/WEB-INF/resources/fa.lang.php
@@ -259,6 +259,7 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php
index 71515dff..1e8c7df4 100644
--- a/WEB-INF/resources/fi.lang.php
+++ b/WEB-INF/resources/fi.lang.php
@@ -253,6 +253,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Vain yhteissummat',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php
index 5132326f..4dc045c9 100644
--- a/WEB-INF/resources/fr.lang.php
+++ b/WEB-INF/resources/fr.lang.php
@@ -247,6 +247,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Totaux uniquement',
 'label.quota' => 'Quota',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php
index 77a7833a..5dbac616 100644
--- a/WEB-INF/resources/gr.lang.php
+++ b/WEB-INF/resources/gr.lang.php
@@ -240,6 +240,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Σύνολα μόνο',
 'label.quota' => 'Ποσοστό',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php
index ac4bbfd2..a9f45b3b 100644
--- a/WEB-INF/resources/he.lang.php
+++ b/WEB-INF/resources/he.lang.php
@@ -270,6 +270,7 @@ $i18n_key_words = array(
 'labl.totals_only' => 'סיכומים בלבד',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php
index 8549700d..ee04db57 100644
--- a/WEB-INF/resources/hu.lang.php
+++ b/WEB-INF/resources/hu.lang.php
@@ -267,6 +267,7 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php
index 87f899ff..b64c7d5e 100644
--- a/WEB-INF/resources/it.lang.php
+++ b/WEB-INF/resources/it.lang.php
@@ -244,6 +244,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Solo i totali',
 'label.quota' => 'Quota',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php
index a54f25f7..c4da31e8 100644
--- a/WEB-INF/resources/ja.lang.php
+++ b/WEB-INF/resources/ja.lang.php
@@ -273,6 +273,7 @@ $i18n_key_words = array(
 'label.totals_only' => '全体だけ',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php
index 4d0e0f29..f954100c 100644
--- a/WEB-INF/resources/ko.lang.php
+++ b/WEB-INF/resources/ko.lang.php
@@ -273,6 +273,7 @@ $i18n_key_words = array(
 'label.totals_only' => '오직 전체만',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php
index 336bed5a..621db3b3 100644
--- a/WEB-INF/resources/nl.lang.php
+++ b/WEB-INF/resources/nl.lang.php
@@ -230,6 +230,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Alleen totalen',
 'label.quota' => 'Maanddoel',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 5cb49d34..40d22954 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -270,6 +270,7 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota'
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php
index 3e2e97c5..c4218e4b 100644
--- a/WEB-INF/resources/pl.lang.php
+++ b/WEB-INF/resources/pl.lang.php
@@ -254,6 +254,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Tylko sumy',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php
index db9ef805..1f1d6ccf 100644
--- a/WEB-INF/resources/pt-br.lang.php
+++ b/WEB-INF/resources/pt-br.lang.php
@@ -251,6 +251,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Somente totais',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php
index 1d7a9956..e325d805 100644
--- a/WEB-INF/resources/pt.lang.php
+++ b/WEB-INF/resources/pt.lang.php
@@ -258,6 +258,7 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php
index 3fa54ace..09c220e8 100644
--- a/WEB-INF/resources/ro.lang.php
+++ b/WEB-INF/resources/ro.lang.php
@@ -270,6 +270,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Numai totaluri',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php
index 1c046857..a2a9009c 100644
--- a/WEB-INF/resources/ru.lang.php
+++ b/WEB-INF/resources/ru.lang.php
@@ -228,6 +228,7 @@ $i18n_key_words = array(
 'label.work_units_short' => 'Единицы',
 'label.totals_only' => 'Только итоги',
 'label.quota' => 'Квота',
+'label.timesheet' => 'Табель учёта',
 'label.submitted' => 'Подано',
 'label.approved' => 'Одобрено',
 
diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php
index c8eede8a..8e847d73 100644
--- a/WEB-INF/resources/sk.lang.php
+++ b/WEB-INF/resources/sk.lang.php
@@ -259,6 +259,7 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 'label.totals_only' => 'Iba celkové',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.quota' => 'Quota',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php
index 3adbda81..6e353c28 100644
--- a/WEB-INF/resources/sl.lang.php
+++ b/WEB-INF/resources/sl.lang.php
@@ -253,6 +253,7 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php
index 3dae77ab..bd2415dd 100644
--- a/WEB-INF/resources/sr.lang.php
+++ b/WEB-INF/resources/sr.lang.php
@@ -252,6 +252,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Samo zbirno',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php
index 0f4faac3..2634c684 100644
--- a/WEB-INF/resources/sv.lang.php
+++ b/WEB-INF/resources/sv.lang.php
@@ -248,6 +248,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Visa endast summeringar',
 'label.quota' => 'Kvot',
 // TODO: translate the following.
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php
index 8c6f2154..cfdadbba 100644
--- a/WEB-INF/resources/tr.lang.php
+++ b/WEB-INF/resources/tr.lang.php
@@ -277,6 +277,7 @@ $i18n_key_words = array(
 'label.totals_only' => 'Sadece toplamlar',
 // TODO: translate the following.
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php
index f4912f1d..c4efbbf9 100644
--- a/WEB-INF/resources/zh-cn.lang.php
+++ b/WEB-INF/resources/zh-cn.lang.php
@@ -261,6 +261,7 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php
index 5b04d348..2b6357fb 100644
--- a/WEB-INF/resources/zh-tw.lang.php
+++ b/WEB-INF/resources/zh-tw.lang.php
@@ -268,6 +268,7 @@ $i18n_key_words = array(
 // 'label.work_units_short' => 'Units',
 // 'label.totals_only' => 'Totals only',
 // 'label.quota' => 'Quota',
+// 'label.timesheet' => 'Timesheet',
 // 'label.submitted' => 'Submitted',
 // 'label.approved' => 'Approved',
 
diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 0594b17b..fc40cb20 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.18.37.4725 | 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.4726 | 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/WEB-INF/templates/reports.tpl b/WEB-INF/templates/reports.tpl
index 95b4a436..08cc2edb 100644
--- a/WEB-INF/templates/reports.tpl
+++ b/WEB-INF/templates/reports.tpl
@@ -229,9 +229,17 @@ function handleCheckboxes() {
 {if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))}
         <tr>
           <td><b>{$i18n.label.paid_status}</b></td>
+          <td>&nbsp;</td>
+  {if $user->isPluginEnabled('ts')}
+          <td><b>{$i18n.label.timesheet}</b></td>
+  {/if}
         </tr>
         <tr>
           <td>{$forms.reportForm.paid_status.control}</td>
+          <td>&nbsp;</td>
+  {if $user->isPluginEnabled('ts')}
+          <td>{$forms.reportForm.timesheet.control}</td>
+  {/if}
         </tr>
 {/if}
 {if $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()}
diff --git a/reports.php b/reports.php
index ee82a64f..1e7b4b99 100644
--- a/reports.php
+++ b/reports.php
@@ -151,6 +151,16 @@ if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) {
  ));
 }
 
+// TODO: check rights.
+if ($user->isPluginEnabled('ts')) {
+  $form->addInput(array('type'=>'combobox',
+   'name'=>'timesheet',
+   'style'=>'width: 250px;',
+   'data'=>array('1'=>$i18n->get('form.reports.include_assigned'),'2'=>$i18n->get('form.reports.include_not_assigned')),
+   'empty'=>array(''=>$i18n->get('dropdown.all'))
+ ));
+}
+
 $user_list = array();
 if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
   // Prepare user and assigned projects arrays.