projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Starting to use on behalf group properties.
[timetracker.git]
/
tofile.php
diff --git
a/tofile.php
b/tofile.php
index
5a190f4
..
445b32d
100644
(file)
--- a/
tofile.php
+++ b/
tofile.php
@@
-60,9
+60,9
@@
$totals_only = $bean->getAttribute('chtotalsonly');
// Obtain items.
$options = ttReportHelper::getReportOptions($bean);
if ($totals_only)
// Obtain items.
$options = ttReportHelper::getReportOptions($bean);
if ($totals_only)
- $subtotals = ttReportHelper::getSubtotals($
bean, $
options);
+ $subtotals = ttReportHelper::getSubtotals($options);
else
else
- $items = ttReportHelper::getItems($
bean, $
options);
+ $items = ttReportHelper::getItems($options);
// Build a string to use as filename for the files being downloaded.
$filename = strtolower($i18n->get('title.report')).'_'.$bean->mValues['start_date'].'_'.$bean->mValues['end_date'];
// Build a string to use as filename for the files being downloaded.
$filename = strtolower($i18n->get('title.report')).'_'.$bean->mValues['start_date'].'_'.$bean->mValues['end_date'];
@@
-84,15
+84,17
@@
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_by = $bean->getAttribute('group_by');
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
."><![CDATA[".$subtotal['name']."]]></".$group_by
.">\n";
+ print "\t<".$group_by
_tag."><![CDATA[".$subtotal['name']."]]></".$group_by_tag
.">\n";
if ($bean->getAttribute('chduration')) {
$val = $subtotal['time'];
if ($bean->getAttribute('chduration')) {
$val = $subtotal['time'];
- if($val &&
defined('EXPORT_DECIMAL_DURATION') &&
isTrue(EXPORT_DECIMAL_DURATION))
+ if($val && isTrue(EXPORT_DECIMAL_DURATION))
$val = time_to_decimal($val);
print "\t<duration><![CDATA[".$val."]]></duration>\n";
}
$val = time_to_decimal($val);
print "\t<duration><![CDATA[".$val."]]></duration>\n";
}
@@
-124,7
+126,7
@@
if ('xml' == $type) {
if ($bean->getAttribute('chfinish')) print "\t<finish><![CDATA[".$item['finish']."]]></finish>\n";
if ($bean->getAttribute('chduration')) {
$duration = $item['duration'];
if ($bean->getAttribute('chfinish')) print "\t<finish><![CDATA[".$item['finish']."]]></finish>\n";
if ($bean->getAttribute('chduration')) {
$duration = $item['duration'];
- if($duration &&
defined('EXPORT_DECIMAL_DURATION') &&
isTrue(EXPORT_DECIMAL_DURATION))
+ if($duration && isTrue(EXPORT_DECIMAL_DURATION))
$duration = time_to_decimal($duration);
print "\t<duration><![CDATA[".$duration."]]></duration>\n";
}
$duration = time_to_decimal($duration);
print "\t<duration><![CDATA[".$duration."]]></duration>\n";
}
@@
-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_by = $bean->getAttribute('group_by');
if ($totals_only) {
// Totals only report.
if ($totals_only) {
// Totals only report.
-
- // Determine group_by header.
- if ('cf_1' == $group_by)
- $group_by_header = $custom_fields->fields[0]['label'];
- else {
- $key = 'label.'.$group_by;
- $group_by_header = $i18n->get($key);
- }
+ $group_by_header = ttReportHelper::makeGroupByHeader($options);
// Print headers.
print '"'.$group_by_header.'"';
// Print headers.
print '"'.$group_by_header.'"';
@@
-185,7
+179,7
@@
if ('csv' == $type) {
print '"'.$subtotal['name'].'"';
if ($bean->getAttribute('chduration')) {
$val = $subtotal['time'];
print '"'.$subtotal['name'].'"';
if ($bean->getAttribute('chduration')) {
$val = $subtotal['time'];
- if($val &&
defined('EXPORT_DECIMAL_DURATION') &&
isTrue(EXPORT_DECIMAL_DURATION))
+ if($val && isTrue(EXPORT_DECIMAL_DURATION))
$val = time_to_decimal($val);
print ',"'.$val.'"';
}
$val = time_to_decimal($val);
print ',"'.$val.'"';
}
@@
-229,7
+223,7
@@
if ('csv' == $type) {
if ($bean->getAttribute('chfinish')) print ',"'.$item['finish'].'"';
if ($bean->getAttribute('chduration')) {
$val = $item['duration'];
if ($bean->getAttribute('chfinish')) print ',"'.$item['finish'].'"';
if ($bean->getAttribute('chduration')) {
$val = $item['duration'];
- if($val &&
defined('EXPORT_DECIMAL_DURATION') &&
isTrue(EXPORT_DECIMAL_DURATION))
+ if($val && isTrue(EXPORT_DECIMAL_DURATION))
$val = time_to_decimal($val);
print ',"'.$val.'"';
}
$val = time_to_decimal($val);
print ',"'.$val.'"';
}