From 55fb421c8c80c95f5a3b41b128161b9dd17df32a Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Sun, 21 Jan 2018 17:20:57 +0000 Subject: [PATCH] Added paid value to csv and xml exports. --- WEB-INF/templates/footer.tpl | 2 +- tofile.php | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 9820f54d..9f017e66 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.15.2.3766 | Copyright © Anuko | +  Anuko Time Tracker 1.15.2.3767 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/tofile.php b/tofile.php index c7f81e50..6849b7f1 100644 --- a/tofile.php +++ b/tofile.php @@ -53,7 +53,7 @@ $bean = new ActionForm('reportBean', new Form('reportForm'), $request); $type = $request->getParameter('type'); // Also, there are 2 variations of report: totals only, or normal. Totals only means that the report -// is grouped by (either date, user, client, project, task or cf_1) and user only needs to see subtotals by group. +// is grouped by (either date, user, client, project, task, or cf_1) and user only needs to see subtotals by group. $totals_only = $bean->getAttribute('chtotalsonly'); // Obtain items. @@ -132,6 +132,7 @@ if ('xml' == $type) { print $item['expense']; print "]]>\n"; } + if ($bean->getAttribute('chpaid')) print "\t\n"; if ($bean->getAttribute('chinvoice')) print "\t\n"; print "\n"; @@ -198,6 +199,7 @@ if ('csv' == $type) { if ($bean->getAttribute('chduration')) print ',"'.$i18n->getKey('label.duration').'"'; if ($bean->getAttribute('chnote')) print ',"'.$i18n->getKey('label.note').'"'; if ($bean->getAttribute('chcost')) print ',"'.$i18n->getKey('label.cost').'"'; + if ($bean->getAttribute('chpaid')) print ',"'.$i18n->getKey('label.paid').'"'; if ($bean->getAttribute('chinvoice')) print ',"'.$i18n->getKey('label.invoice').'"'; print "\n"; @@ -224,6 +226,7 @@ if ('csv' == $type) { else print ',"'.$item['expense'].'"'; } + if ($bean->getAttribute('chpaid')) print ',"'.$item['paid'].'"'; if ($bean->getAttribute('chinvoice')) print ',"'.str_replace('"','""',$item['invoice']).'"'; print "\n"; } -- 2.20.1