projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduced an index in tt_project_task_binds to eliminate duplicates.
[timetracker.git]
/
tofile.php
diff --git
a/tofile.php
b/tofile.php
index
42b7343
..
07bbc11
100644
(file)
--- a/
tofile.php
+++ b/
tofile.php
@@
-84,12
+84,14
@@
if ('xml' == $type) {
print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
print "<rows>\n";
print "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
print "<rows>\n";
- $group_by1 = $bean->getAttribute('group_by1');
if ($totals_only) {
if ($totals_only) {
- // Totals only report. Print subtotals.
+ // Totals only report.
+ $group_by_tag = ttReportHelper::makeGroupByXmlTag($options);
+
+ // Print subtotals.
foreach ($subtotals as $subtotal) {
print "<row>\n";
foreach ($subtotals as $subtotal) {
print "<row>\n";
- print "\t<".$group_by
1."><![CDATA[".$subtotal['name']."]]></".$group_by1
.">\n";
+ print "\t<".$group_by
_tag."><![CDATA[".$subtotal['name']."]]></".$group_by_tag
.">\n";
if ($bean->getAttribute('chduration')) {
$val = $subtotal['time'];
if($val && defined('EXPORT_DECIMAL_DURATION') && isTrue(EXPORT_DECIMAL_DURATION))
if ($bean->getAttribute('chduration')) {
$val = $subtotal['time'];
if($val && defined('EXPORT_DECIMAL_DURATION') && isTrue(EXPORT_DECIMAL_DURATION))
@@
-161,17
+163,9
@@
if ('csv' == $type) {
$bom = chr(239).chr(187).chr(191); // 0xEF 0xBB 0xBF in the beginning of the file is UTF8 BOM.
print $bom; // Without this Excel does not display UTF8 characters properly.
$bom = chr(239).chr(187).chr(191); // 0xEF 0xBB 0xBF in the beginning of the file is UTF8 BOM.
print $bom; // Without this Excel does not display UTF8 characters properly.
- $group_by1 = $bean->getAttribute('group_by1');
if ($totals_only) {
// Totals only report.
if ($totals_only) {
// Totals only report.
-
- // Determine group_by header.
- if ('cf_1' == $group_by1)
- $group_by_header = $custom_fields->fields[0]['label'];
- else {
- $key = 'label.'.$group_by1;
- $group_by_header = $i18n->get($key);
- }
+ $group_by_header = ttReportHelper::makeGroupByHeader($options);
// Print headers.
print '"'.$group_by_header.'"';
// Print headers.
print '"'.$group_by_header.'"';