From: Nik Okuntseff Date: Fri, 1 Mar 2019 18:07:36 +0000 (+0000) Subject: A bit of cleanup for timesheet redesign. X-Git-Tag: timetracker_1.19-1~245 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=30bec134aac46efe3cdd5371de46598a68138c46;p=timetracker.git A bit of cleanup for timesheet redesign. --- diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php index 34ba35f6..f2ec9cf3 100644 --- a/WEB-INF/resources/ca.lang.php +++ b/WEB-INF/resources/ca.lang.php @@ -145,8 +145,6 @@ $i18n_key_words = array( 'button.send' => 'Enviar', 'button.send_by_email' => 'Enviar per correu', 'button.create_group' => 'Crear grup', -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Exportar grup', 'button.import' => 'Importar grup', // TODO: translate the following. diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php index e43d2cc0..edc7d3ec 100644 --- a/WEB-INF/resources/cs.lang.php +++ b/WEB-INF/resources/cs.lang.php @@ -147,8 +147,6 @@ $i18n_key_words = array( 'button.send' => 'Poslat', 'button.send_by_email' => 'Poslat e-mailem', 'button.create_group' => 'Vytvořit tým', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Exportovat tým', // TODO: replace "team" with "group". 'button.import' => 'Importovat tým', // TODO: replace "team" with "group". // TODO: translate the following. diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php index 1247264e..7bb21380 100644 --- a/WEB-INF/resources/da.lang.php +++ b/WEB-INF/resources/da.lang.php @@ -140,8 +140,6 @@ $i18n_key_words = array( 'button.send' => 'Send', 'button.send_by_email' => 'Send som e-mail', 'button.create_group' => 'Lav et team', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Eksporter team', // TODO: replace "team" with "group". 'button.import' => 'Importer team', // TODO: replace "team" with "group". 'button.close' => 'Luk', diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php index 72f4b5cb..02ab0484 100644 --- a/WEB-INF/resources/de.lang.php +++ b/WEB-INF/resources/de.lang.php @@ -134,8 +134,6 @@ $i18n_key_words = array( 'button.send' => 'Senden', 'button.send_by_email' => 'Als E-Mail senden', 'button.create_group' => 'Gruppe erstellen', -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Gruppe exportieren', 'button.import' => 'Gruppe importieren', 'button.close' => 'Schließen', diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php index 6701a4c3..6740c556 100644 --- a/WEB-INF/resources/en.lang.php +++ b/WEB-INF/resources/en.lang.php @@ -127,7 +127,6 @@ $i18n_key_words = array( 'button.send' => 'Send', 'button.send_by_email' => 'Send by e-mail', 'button.create_group' => 'Create group', -'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Export group', 'button.import' => 'Import group', 'button.close' => 'Close', diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php index 7a2bf9a9..5bb6eefe 100644 --- a/WEB-INF/resources/es.lang.php +++ b/WEB-INF/resources/es.lang.php @@ -144,8 +144,6 @@ $i18n_key_words = array( 'button.send' => 'Enviar', 'button.send_by_email' => 'Enviar por correo', 'button.create_group' => 'Crear grupo', -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Exportar grupo', 'button.import' => 'Importar grupo', // TODO: translate the following. diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php index 6f37883e..e0b512e6 100644 --- a/WEB-INF/resources/et.lang.php +++ b/WEB-INF/resources/et.lang.php @@ -148,8 +148,6 @@ $i18n_key_words = array( 'button.send' => 'Saada', 'button.send_by_email' => 'Saada e-postiga', 'button.create_group' => 'Loo grupp', -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Ekspordi grupp', 'button.import' => 'Impordi grupp', 'button.close' => 'Sulge', diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php index 5a6c6aa8..97610c3a 100644 --- a/WEB-INF/resources/fa.lang.php +++ b/WEB-INF/resources/fa.lang.php @@ -147,8 +147,6 @@ $i18n_key_words = array( 'button.send' => 'ارسال', 'button.send_by_email' => 'ارسال به ایمیل', 'button.create_group' => 'ایجاد تیم', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'ایجاد پشتیبان از تیم', // TODO: replace "team" with "group". 'button.import' => 'وارد کردن تیم', // TODO: replace "team" with "group". 'button.close' => 'بستن', diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php index 9f577f3d..91bcd40d 100644 --- a/WEB-INF/resources/fi.lang.php +++ b/WEB-INF/resources/fi.lang.php @@ -142,8 +142,6 @@ $i18n_key_words = array( 'button.send' => 'Lähetä', 'button.send_by_email' => 'Lähetä sähköpostilla', 'button.create_group' => 'Luo tiimi', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Vie tiimi', // TODO: replace "team" with "group". 'button.import' => 'Tuo tiimi', // TODO: replace "team" with "group". 'button.close' => 'Sulje', diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php index be5c9d22..0cb6764a 100644 --- a/WEB-INF/resources/fr.lang.php +++ b/WEB-INF/resources/fr.lang.php @@ -140,8 +140,6 @@ $i18n_key_words = array( 'button.send' => 'Envoyer', 'button.send_by_email' => 'Envoyer par courriel', 'button.create_group' => 'Créer une équipe', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Exporter l\\\'équipe', // TODO: replace "team" with "group". 'button.import' => 'Importer une équipe', // TODO: replace "team" with "group". 'button.close' => 'Fermer', diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php index 28898273..e3455465 100644 --- a/WEB-INF/resources/gr.lang.php +++ b/WEB-INF/resources/gr.lang.php @@ -135,8 +135,6 @@ $i18n_key_words = array( 'button.send' => 'Αποστολή', 'button.send_by_email' => 'Αποστολή μέσω email', 'button.create_group' => 'Δημιουργία ομάδας', -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Εξαγωγη ομάδας', 'button.import' => 'Εισαγωγή ομάδας', 'button.close' => 'Κλείσιμο', diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php index d9ab0d1c..2d65957b 100644 --- a/WEB-INF/resources/he.lang.php +++ b/WEB-INF/resources/he.lang.php @@ -157,8 +157,6 @@ $i18n_key_words = array( 'button.send' => 'שלח', 'button.send_by_email' => 'שלח בדואר אלקטרוני', 'button.create_group' => 'צור צוות', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'ייצא צוות', // TODO: replace "team" with "group". 'button.import' => 'ייבא צוות', // TODO: replace "team" with "group". 'button.close' => 'סגור', diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php index 38ec28cb..c9e59f47 100644 --- a/WEB-INF/resources/hu.lang.php +++ b/WEB-INF/resources/hu.lang.php @@ -147,8 +147,6 @@ $i18n_key_words = array( 'button.send' => 'Küld', 'button.send_by_email' => 'Küldés e-mail-ben', 'button.create_group' => 'Csoport létrehozása', -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Csoport exportálása', 'button.import' => 'Csoport importálása', // TODO: translate the following. diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php index e4d328e6..7402e033 100644 --- a/WEB-INF/resources/it.lang.php +++ b/WEB-INF/resources/it.lang.php @@ -139,8 +139,6 @@ $i18n_key_words = array( 'button.send' => 'Invia', 'button.send_by_email' => 'Invia tramite e-mail', 'button.create_group' => 'Crea gruppo', -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Esporta gruppo', 'button.import' => 'Importa gruppo', 'button.close' => 'Chiudi', diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php index 3f0db6e0..5cb5305e 100644 --- a/WEB-INF/resources/ja.lang.php +++ b/WEB-INF/resources/ja.lang.php @@ -151,7 +151,6 @@ $i18n_key_words = array( 'button.send_by_email' => 'Eメールの送信', // TODO: translate the following. // 'button.create_group' => 'Create group', -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'チームのエクスポート', // TODO: replace "team" with "group". 'button.import' => 'チームのインポート', // TODO: replace "team" with "group". // TODO: translate the following. diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php index d59c1634..df131170 100644 --- a/WEB-INF/resources/ko.lang.php +++ b/WEB-INF/resources/ko.lang.php @@ -150,7 +150,6 @@ $i18n_key_words = array( 'button.send_by_email' => '이메일로 송신', // TODO: translate the following. // 'button.create_group' => 'Create group', -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => '팀 익스포트', // TODO: replace "team" with "group". 'button.import' => '팀 임포트', // TODO: replace "team" with "group". // TODO: translate the following. diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php index 8aa557e6..e6425bad 100644 --- a/WEB-INF/resources/nl.lang.php +++ b/WEB-INF/resources/nl.lang.php @@ -128,8 +128,6 @@ $i18n_key_words = array( 'button.send' => 'Verzenden', 'button.send_by_email' => 'Verzend per e-mail', 'button.create_group' => 'Maak groep', -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Groep exporteren', 'button.import' => 'Groep importeren', 'button.close' => 'Sluiten', diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php index cdcc05de..09fdec8e 100644 --- a/WEB-INF/resources/no.lang.php +++ b/WEB-INF/resources/no.lang.php @@ -150,8 +150,6 @@ $i18n_key_words = array( 'button.send' => 'Send', 'button.send_by_email' => 'Send som e-post', 'button.create_group' => 'Opprett team', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Eksport team', // TODO: replace "team" with "group". 'button.import' => 'Importer team', // TODO: replace "team" with "group". 'button.close' => 'Lukk', diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php index 11166236..678f38e9 100644 --- a/WEB-INF/resources/pl.lang.php +++ b/WEB-INF/resources/pl.lang.php @@ -144,8 +144,6 @@ $i18n_key_words = array( 'button.send' => 'Wyślij', 'button.send_by_email' => 'Wyślij e-mail', 'button.create_group' => 'Stwórz zespół', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Eksportuj zespół', // TODO: replace "team" with "group". 'button.import' => 'Importuj zespół', // TODO: replace "team" with "group". 'button.close' => 'Zamknij', diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php index bfeb7e72..967bfabd 100644 --- a/WEB-INF/resources/pt-br.lang.php +++ b/WEB-INF/resources/pt-br.lang.php @@ -141,8 +141,6 @@ $i18n_key_words = array( 'button.send' => 'Enviar', 'button.send_by_email' => 'Enviar por e-mail', 'button.create_group' => 'Criar equipe', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Exportar equipe', // TODO: replace "team" with "group". 'button.import' => 'Importar equipe', // TODO: replace "team" with "group". 'button.close' => 'Fechar', diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php index b9b746c9..9ce23328 100644 --- a/WEB-INF/resources/pt.lang.php +++ b/WEB-INF/resources/pt.lang.php @@ -144,7 +144,6 @@ $i18n_key_words = array( 'button.send_by_email' => 'Enviar por e-mail', // TODO: translate the following. // 'button.create_group' => 'Create group', -// 'button.create_timesheet' => 'Create timesheet', // 'button.export' => 'Export group', // 'button.import' => 'Import group', // 'button.close' => 'Close', diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php index 050bddef..7472f0b5 100644 --- a/WEB-INF/resources/ro.lang.php +++ b/WEB-INF/resources/ro.lang.php @@ -150,8 +150,6 @@ $i18n_key_words = array( 'button.send' => 'Trimite', 'button.send_by_email' => 'Trimite pe e-mail', 'button.create_group' => 'Adauga echipa', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Exporta echipa', // TODO: replace "team" with "group". 'button.import' => 'Importa echipa', // TODO: replace "team" with "group". // TODO: translate the following. diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php index 2d04e8f9..ac9d0d14 100644 --- a/WEB-INF/resources/ru.lang.php +++ b/WEB-INF/resources/ru.lang.php @@ -126,7 +126,6 @@ $i18n_key_words = array( 'button.send' => 'Отправить', 'button.send_by_email' => 'Отправить по e-mail', 'button.create_group' => 'Создать группу', -'button.create_timesheet' => 'Создать табель', 'button.export' => 'Экспортировать группу', 'button.import' => 'Импортировать группу', 'button.close' => 'Закрыть', diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php index 0ed07029..f1e0c894 100644 --- a/WEB-INF/resources/sk.lang.php +++ b/WEB-INF/resources/sk.lang.php @@ -147,8 +147,6 @@ $i18n_key_words = array( 'button.send' => 'Odoslať', 'button.send_by_email' => 'Odoslať na e-mail', 'button.create_group' => 'Vytvoriť tím', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Exportovať tím', // TODO: replace "team" with "group". 'button.import' => 'Importovať tím', // TODO: replace "team" with "group". 'button.close' => 'Zatvoriť', diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php index e9388450..17e8ca7f 100644 --- a/WEB-INF/resources/sl.lang.php +++ b/WEB-INF/resources/sl.lang.php @@ -140,8 +140,6 @@ $i18n_key_words = array( 'button.send' => 'Pošlji', 'button.send_by_email' => 'Pošlji preko elektronske pošte', 'button.create_group' => 'Ustvari tim', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Izvozi tim', // TODO: replace "team" with "group". 'button.import' => 'Uvozi tim', // TODO: replace "team" with "group". // TODO: translate the following. diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php index 5d2b9f88..ee49bd17 100644 --- a/WEB-INF/resources/sr.lang.php +++ b/WEB-INF/resources/sr.lang.php @@ -141,8 +141,6 @@ $i18n_key_words = array( 'button.send' => 'Pošalji', 'button.send_by_email' => 'Pošalji mejlom', 'button.create_group' => 'Napravi tim', // TODO: replace "team" with "group". -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Izvezi tim', // TODO: replace "team" with "group". 'button.import' => 'Uvezi tim', // TODO: replace "team" with "group". 'button.close' => 'Zatvori', diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php index ba2f6665..6acbcc0d 100644 --- a/WEB-INF/resources/sv.lang.php +++ b/WEB-INF/resources/sv.lang.php @@ -139,8 +139,6 @@ $i18n_key_words = array( 'button.send' => 'Skicka', 'button.send_by_email' => 'Skicka som e-post', 'button.create_group' => 'Skapa grupp', -// TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => 'Exportera grupp', 'button.import' => 'Importera grupp', 'button.close' => 'Stäng', diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php index 22e87237..614ce942 100644 --- a/WEB-INF/resources/tr.lang.php +++ b/WEB-INF/resources/tr.lang.php @@ -154,7 +154,6 @@ $i18n_key_words = array( 'button.send_by_email' => 'E-posta ile gönder', 'button.create_group' => 'Ekip yarat', // TODO: replace "team" with "group". // TODO: translate the following. -// 'button.create_timesheet' => 'Create timesheet', // 'button.export' => 'Export group', 'button.import' => 'Ekibi içeri aktar', // TODO: replace "team" with "group". // TODO: translate the following. diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php index a1583eb4..9239d7ed 100644 --- a/WEB-INF/resources/zh-cn.lang.php +++ b/WEB-INF/resources/zh-cn.lang.php @@ -142,7 +142,6 @@ $i18n_key_words = array( 'button.send_by_email' => '通过邮件发送', // TODO: translate the following. // 'button.create_group' => 'Create group', -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => '导出团队信息', // TODO: replace "team" with "group". 'button.import' => '导入团队信息', // TODO: replace "team" with "group". 'button.close' => '关闭', diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php index 42f15202..fdbf657c 100644 --- a/WEB-INF/resources/zh-tw.lang.php +++ b/WEB-INF/resources/zh-tw.lang.php @@ -147,7 +147,6 @@ $i18n_key_words = array( 'button.send_by_email' => '通過郵件發送', // TODO: translate the following. // 'button.create_group' => 'Create group', -// 'button.create_timesheet' => 'Create timesheet', 'button.export' => '輸出團隊資訊', // TODO: replace "team" with "group". 'button.import' => '輸入團隊資訊', // TODO: replace "team" with "group". // TODO: translate the following. diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 7db67991..90fe1c06 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
- diff --git a/report.php b/report.php index ed7928c7..84b18b66 100644 --- a/report.php +++ b/report.php @@ -228,39 +228,6 @@ if (ttReportHelper::grouping($options)) { } $totals = ttReportHelper::getTotals($options); -// TODO: Determine if we can create a timesheet out of this report. -// There must be only one user, and nothing assigned to existing timesheets. -$canCreateTimesheet = false; -if ($user->isPluginEnabled('ts') && count($report_items) > 0 && - ($user->can('manage_own_timesheets') || $user->can('manage_timesheets'))) { - - $canCreateTimesheet = true; // Start with true and reset if we can't. - $first_user_id = null; - foreach ($report_items as $report_item) { - // Check user id. - if (!$first_user_id) - $first_user_id = $report_item['user_id']; - else { - if ($report_item['user_id'] != $first_user_id) { - // We have items for multiple users. - $canCreateTimesheet = false; - break; - } - } - // Check timesheet id. - if ($report_item['timesheet_id']) { - // We have an item already assigned to a timesheet. - $canCreateTimesheet = false; - break; - } - } - // Save user_id in session. - $bean->saveDetachedAttribute('timesheet_user_id', $first_user_id); - - // TODO: Improve this for "view_all_reports" situation. - // We may need to add "manage_all_timesheets" right. -} - // Assign variables that are used to print subtotals. if ($report_items) { $smarty->assign('print_subtotals', true); @@ -277,7 +244,6 @@ $smarty->assign('forms', array($form->getName()=>$form->toArray())); $smarty->assign('report_items', $report_items); $smarty->assign('subtotals', $subtotals); $smarty->assign('totals', $totals); -$smarty->assign('can_create_timesheet', $canCreateTimesheet); $smarty->assign('bean', $bean); $smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']); $smarty->assign('content_page_name', 'report.tpl');
 Anuko Time Tracker 1.18.47.4800 | Copyright © Anuko | +  Anuko Time Tracker 1.18.47.4801 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl index 294582dc..44a6e337 100644 --- a/WEB-INF/templates/report.tpl +++ b/WEB-INF/templates/report.tpl @@ -205,9 +205,6 @@ -{if $can_create_timesheet} - -{/if}