From 710003ecf2838c254c075fd9898034e267915e46 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Fri, 15 Feb 2019 16:26:23 +0000 Subject: [PATCH] A bit more work in progress on timesheets. --- WEB-INF/lib/ttUser.class.php | 5 ++++ WEB-INF/resources/ca.lang.php | 4 +++ WEB-INF/resources/cs.lang.php | 4 +++ WEB-INF/resources/da.lang.php | 4 +++ WEB-INF/resources/de.lang.php | 4 +++ WEB-INF/resources/en.lang.php | 3 ++ WEB-INF/resources/es.lang.php | 4 +++ WEB-INF/resources/et.lang.php | 4 +++ WEB-INF/resources/fa.lang.php | 4 +++ WEB-INF/resources/fi.lang.php | 4 +++ WEB-INF/resources/fr.lang.php | 4 +++ WEB-INF/resources/gr.lang.php | 4 +++ WEB-INF/resources/he.lang.php | 4 +++ WEB-INF/resources/hu.lang.php | 4 +++ WEB-INF/resources/it.lang.php | 4 +++ WEB-INF/resources/ja.lang.php | 4 +++ WEB-INF/resources/ko.lang.php | 4 +++ WEB-INF/resources/nl.lang.php | 4 +++ WEB-INF/resources/no.lang.php | 4 +++ WEB-INF/resources/pl.lang.php | 4 +++ WEB-INF/resources/pt-br.lang.php | 4 +++ WEB-INF/resources/pt.lang.php | 4 +++ WEB-INF/resources/ro.lang.php | 4 +++ WEB-INF/resources/ru.lang.php | 3 ++ WEB-INF/resources/sk.lang.php | 4 +++ WEB-INF/resources/sl.lang.php | 4 +++ WEB-INF/resources/sr.lang.php | 4 +++ WEB-INF/resources/sv.lang.php | 4 +++ WEB-INF/resources/tr.lang.php | 4 +++ WEB-INF/resources/zh-cn.lang.php | 4 +++ WEB-INF/resources/zh-tw.lang.php | 4 +++ WEB-INF/templates/footer.tpl | 2 +- WEB-INF/templates/timesheets.tpl | 47 ++++++++++++++++++++++++++++++++ timesheets.php | 8 +++--- 34 files changed, 175 insertions(+), 5 deletions(-) create mode 100644 WEB-INF/templates/timesheets.tpl diff --git a/WEB-INF/lib/ttUser.class.php b/WEB-INF/lib/ttUser.class.php index 36f9163f..5309dd8a 100644 --- a/WEB-INF/lib/ttUser.class.php +++ b/WEB-INF/lib/ttUser.class.php @@ -886,4 +886,9 @@ class ttUser { 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 2ae15aa5..1e4b299e 100644 --- a/WEB-INF/resources/ca.lang.php +++ b/WEB-INF/resources/ca.lang.php @@ -448,6 +448,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Número de factura', diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php index 8a698dbe..08480f52 100644 --- a/WEB-INF/resources/cs.lang.php +++ b/WEB-INF/resources/cs.lang.php @@ -458,6 +458,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Faktura číslo', diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php index 37a33e90..56012634 100644 --- a/WEB-INF/resources/da.lang.php +++ b/WEB-INF/resources/da.lang.php @@ -418,6 +418,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Fakturanummer', diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php index fd73ad7e..8c631847 100644 --- a/WEB-INF/resources/de.lang.php +++ b/WEB-INF/resources/de.lang.php @@ -396,6 +396,10 @@ $i18n_key_words = array( 'form.report.export' => 'Exportiere', 'form.report.assign_to_invoice' => 'Zu Rechnung hinzufügen', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Rechnungsnummer', diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php index 7b2ee395..ce580485 100644 --- a/WEB-INF/resources/en.lang.php +++ b/WEB-INF/resources/en.lang.php @@ -397,6 +397,9 @@ $i18n_key_words = array( 'form.report.export' => 'Export', 'form.report.assign_to_invoice' => 'Assign to invoice', + // Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +'form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Invoice number', diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php index 6f6c82fc..53b42913 100644 --- a/WEB-INF/resources/es.lang.php +++ b/WEB-INF/resources/es.lang.php @@ -461,6 +461,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Número de factura', diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php index 3aeaef4d..70d6d441 100644 --- a/WEB-INF/resources/et.lang.php +++ b/WEB-INF/resources/et.lang.php @@ -422,6 +422,10 @@ $i18n_key_words = array( 'form.report.export' => 'Eksport', 'form.report.assign_to_invoice' => 'Lisa arvele', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Arve number', diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php index ef0f326b..75db1801 100644 --- a/WEB-INF/resources/fa.lang.php +++ b/WEB-INF/resources/fa.lang.php @@ -438,6 +438,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'شماره فاکتور', diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php index 06e61895..9aee3a26 100644 --- a/WEB-INF/resources/fi.lang.php +++ b/WEB-INF/resources/fi.lang.php @@ -425,6 +425,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Laskun numero', diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php index 53dbd941..17d43b09 100644 --- a/WEB-INF/resources/fr.lang.php +++ b/WEB-INF/resources/fr.lang.php @@ -415,6 +415,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Numéro de facture', diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php index 167bbda8..4e82d825 100644 --- a/WEB-INF/resources/gr.lang.php +++ b/WEB-INF/resources/gr.lang.php @@ -405,6 +405,10 @@ $i18n_key_words = array( 'form.report.export' => 'Εξαγωγή', 'form.report.assign_to_invoice' => 'Ανάθεση στο τιμολόγιο', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Αριθμός τιμολογίου', diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php index eb340272..2c4cbc06 100644 --- a/WEB-INF/resources/he.lang.php +++ b/WEB-INF/resources/he.lang.php @@ -448,6 +448,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'מספר חשבונית', diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php index ff1e2111..5dafe96d 100644 --- a/WEB-INF/resources/hu.lang.php +++ b/WEB-INF/resources/hu.lang.php @@ -451,6 +451,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Számla azonosító száma', diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php index 236044c0..32e3b84a 100644 --- a/WEB-INF/resources/it.lang.php +++ b/WEB-INF/resources/it.lang.php @@ -418,6 +418,10 @@ $i18n_key_words = array( 'form.report.export' => 'Esporta', 'form.report.assign_to_invoice' => 'Assegna alla fattura', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Numero fattura', diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php index 35fb7859..2574d315 100644 --- a/WEB-INF/resources/ja.lang.php +++ b/WEB-INF/resources/ja.lang.php @@ -457,6 +457,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => '送り状の番号', diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php index c74aec92..4403f9f1 100644 --- a/WEB-INF/resources/ko.lang.php +++ b/WEB-INF/resources/ko.lang.php @@ -455,6 +455,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => '송장 번호', diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php index a461192b..9c88ca06 100644 --- a/WEB-INF/resources/nl.lang.php +++ b/WEB-INF/resources/nl.lang.php @@ -392,6 +392,10 @@ $i18n_key_words = array( 'form.report.export' => 'Exporteer', 'form.report.assign_to_invoice' => 'Voeg toe aan factuur', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Factuur nummer', diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php index 45156f8e..a08aeffe 100644 --- a/WEB-INF/resources/no.lang.php +++ b/WEB-INF/resources/no.lang.php @@ -453,6 +453,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Fakturanummer', diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php index 55176d19..a1f4bfa7 100644 --- a/WEB-INF/resources/pl.lang.php +++ b/WEB-INF/resources/pl.lang.php @@ -427,6 +427,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Numer faktury', diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php index e6b56978..639092d8 100644 --- a/WEB-INF/resources/pt-br.lang.php +++ b/WEB-INF/resources/pt-br.lang.php @@ -422,6 +422,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Número da fatura', diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php index 7a794ce2..fcd31a44 100644 --- a/WEB-INF/resources/pt.lang.php +++ b/WEB-INF/resources/pt.lang.php @@ -433,6 +433,10 @@ $i18n_key_words = array( // 'form.report.export' => 'Export', // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). // TODO: translate the following. diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php index cf455659..1747b81f 100644 --- a/WEB-INF/resources/ro.lang.php +++ b/WEB-INF/resources/ro.lang.php @@ -456,6 +456,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Numar factura', diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php index 0202eb20..42dfc9c9 100644 --- a/WEB-INF/resources/ru.lang.php +++ b/WEB-INF/resources/ru.lang.php @@ -389,6 +389,9 @@ $i18n_key_words = array( 'form.report.export' => 'Экспортировать', 'form.report.assign_to_invoice' => 'Включить в счёт', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +'form.timesheets.hint' => 'Используйте отчёты для добавления новых табелей.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Номер счёта', diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php index 66695484..587575f3 100644 --- a/WEB-INF/resources/sk.lang.php +++ b/WEB-INF/resources/sk.lang.php @@ -439,6 +439,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Číslo faktúry', diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php index deba2e66..b0b23677 100644 --- a/WEB-INF/resources/sl.lang.php +++ b/WEB-INF/resources/sl.lang.php @@ -430,6 +430,10 @@ $i18n_key_words = array( // 'form.report.export' => 'Export', // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). // TODO: translate the following. diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php index 4c40077c..d5c4fff7 100644 --- a/WEB-INF/resources/sr.lang.php +++ b/WEB-INF/resources/sr.lang.php @@ -425,6 +425,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Forma izveštaja. Pogledajte primer na https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Broj računa', diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php index ed6a0ac8..b3fc0929 100644 --- a/WEB-INF/resources/sv.lang.php +++ b/WEB-INF/resources/sv.lang.php @@ -422,6 +422,10 @@ $i18n_key_words = array( // TODO: translate the following. // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Fakturanummer', diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php index df6f464a..b8577374 100644 --- a/WEB-INF/resources/tr.lang.php +++ b/WEB-INF/resources/tr.lang.php @@ -468,6 +468,10 @@ $i18n_key_words = array( // 'form.report.export' => 'Export', // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => 'Fatura numarası', diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php index 72d0ed58..5820ab3a 100644 --- a/WEB-INF/resources/zh-cn.lang.php +++ b/WEB-INF/resources/zh-cn.lang.php @@ -440,6 +440,10 @@ $i18n_key_words = array( // 'form.report.export' => 'Export', // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => '发票号码', diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php index 2be5446f..59ce3716 100644 --- a/WEB-INF/resources/zh-tw.lang.php +++ b/WEB-INF/resources/zh-tw.lang.php @@ -448,6 +448,10 @@ $i18n_key_words = array( // 'form.report.export' => 'Export', // 'form.report.assign_to_invoice' => 'Assign to invoice', +// Timesheets form. See example at https://timetracker.anuko.com/timesheets.php +// TODO: translate the following. +// form.timesheets.hint' => 'Use reports to add new timesheets.', + // Invoice form. See example at https://timetracker.anuko.com/invoice.php // (you can get to this form after generating a report). 'form.invoice.number' => '發票號碼', diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 5ac739bf..0594b17b 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.37.4724 | Copyright © Anuko | +  Anuko Time Tracker 1.18.37.4725 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl new file mode 100644 index 00000000..2b7990a8 --- /dev/null +++ b/WEB-INF/templates/timesheets.tpl @@ -0,0 +1,47 @@ + + + + + + +
+{if $user->can('manage_invoices') || $user->can('view_own_invoices')} + + + + + + + {if $user->isPluginEnabled('ps')} + + {/if} + + {if !$user->isClient()} + + {/if} + + {foreach $invoices as $invoice} + + + + + {if $user->isPluginEnabled('ps')} + + {/if} + + {if !$user->isClient()} + + {/if} + + {/foreach} +
{$i18n.form.timesheets.hint}
{$i18n.label.invoice}{$i18n.label.client}{$i18n.label.date}{$i18n.label.paid}{$i18n.label.view}{$i18n.label.delete}
{$invoice.name|escape}{$invoice.client_name|escape}{$invoice.date}{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{$i18n.label.view}{$i18n.label.delete}
+ + {if !$user->isClient()} + + +

+ {/if} +{/if} +
diff --git a/timesheets.php b/timesheets.php index fb513bee..b2c64e63 100644 --- a/timesheets.php +++ b/timesheets.php @@ -40,15 +40,15 @@ if (!(ttAccessAllowed('view_own_timesheets') || exit(); } -if (!$user->isPluginEnabled('ts_NEVER_ENABLED')) { // Work in progress... +if (!$user->isPluginEnabled('ts')) { header('Location: feature_disabled.php'); exit(); } // End of access checks. -//$invoices = ttGroupHelper::getActiveInvoices(); +$timesheets = $user->getTimesheets(); -//$smarty->assign('invoices', $invoices); +$smarty->assign('timesheets', $timesheets); $smarty->assign('title', $i18n->get('title.timesheets')); -$smarty->assign('content_page_name', 'invoices.tpl'); // TODO: fix this, too. +$smarty->assign('content_page_name', 'timesheets.tpl'); $smarty->display('index.tpl'); -- 2.20.1