projects
/
timetracker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2940db8
)
Adjusted PDF reports to print notes on separate lines.
author
Nik Okuntseff
<support@anuko.com>
Sun, 10 Mar 2019 19:11:12 +0000
(19:11 +0000)
committer
Nik Okuntseff
<support@anuko.com>
Sun, 10 Mar 2019 19:11:12 +0000
(19:11 +0000)
topdf.php
patch
|
blob
|
history
diff --git
a/topdf.php
b/topdf.php
index
8e0738d
..
4ede4cd
100644
(file)
--- a/
topdf.php
+++ b/
topdf.php
@@
-154,7
+154,6
@@
if ($totals_only) {
if ($bean->getAttribute('chfinish')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.finish').'</td>'; }
if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.duration').'</td>'; }
if ($bean->getAttribute('chunits')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.work_units_short').'</td>'; }
if ($bean->getAttribute('chfinish')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.finish').'</td>'; }
if ($bean->getAttribute('chduration')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.duration').'</td>'; }
if ($bean->getAttribute('chunits')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.work_units_short').'</td>'; }
- if ($bean->getAttribute('chnote')) { $colspan++; $html .= '<td>'.$i18n->get('label.note').'</td>'; }
if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.cost').'</td>'; }
if ($bean->getAttribute('chapproved')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.approved').'</td>'; }
if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.paid').'</td>'; }
if ($bean->getAttribute('chcost')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.cost').'</td>'; }
if ($bean->getAttribute('chapproved')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.approved').'</td>'; }
if ($bean->getAttribute('chpaid')) { $colspan++; $html .= "<td $styleCentered>".$i18n->get('label.paid').'</td>'; }
@@
-201,7
+200,6
@@
if ($totals_only) {
if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
- if ($bean->getAttribute('chnote')) $html .= '<td></td>';
if ($bean->getAttribute('chcost')) {
$html .= "<td $styleRightAligned>";
if ($user->can('manage_invoices') || $user->isClient())
if ($bean->getAttribute('chcost')) {
$html .= "<td $styleRightAligned>";
if ($user->can('manage_invoices') || $user->isClient())
@@
-233,7
+231,6
@@
if ($totals_only) {
if ($bean->getAttribute('chfinish')) $html .= "<td $styleRightAligned>".$item['finish'].'</td>';
if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$item['duration'].'</td>';
if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$item['units'].'</td>';
if ($bean->getAttribute('chfinish')) $html .= "<td $styleRightAligned>".$item['finish'].'</td>';
if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$item['duration'].'</td>';
if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$item['units'].'</td>';
- if ($bean->getAttribute('chnote')) $html .= '<td>'.htmlspecialchars($item['note']).'</td>';
if ($bean->getAttribute('chcost')) {
$html .= "<td $styleRightAligned>";
if ($user->can('manage_invoices') || $user->isClient())
if ($bean->getAttribute('chcost')) {
$html .= "<td $styleRightAligned>";
if ($user->can('manage_invoices') || $user->isClient())
@@
-261,6
+258,14
@@
if ($totals_only) {
if ($bean->getAttribute('chtimesheet')) $html .= '<td>'.htmlspecialchars($item['timesheet_name']).'</td>';
$html .= '</tr>';
if ($bean->getAttribute('chtimesheet')) $html .= '<td>'.htmlspecialchars($item['timesheet_name']).'</td>';
$html .= '</tr>';
+ if ($bean->getAttribute('chnote') && $item['note']) {
+ $html .= '<tr>';
+ $html .= "<td $styleRightAligned>".$i18n->get('label.note').'</td>';
+ $noteSpan = $colspan-1;
+ $html .= '<td colspan="'.$noteSpan.'">'.htmlspecialchars($item['note']).'</td>';
+ $html .= '</tr>';
+ }
+
$prev_date = $item['date'];
if ($print_subtotals) $prev_grouped_by = $item['grouped_by'];
}
$prev_date = $item['date'];
if ($print_subtotals) $prev_grouped_by = $item['grouped_by'];
}
@@
-298,7
+303,6
@@
if ($totals_only) {
if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['time'].'</td>';
if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$subtotals[$prev_grouped_by]['units'].'</td>';
- if ($bean->getAttribute('chnote')) $html .= '<td></td>';
if ($bean->getAttribute('chcost')) {
$html .= "<td $styleRightAligned>";
if ($user->can('manage_invoices') || $user->isClient())
if ($bean->getAttribute('chcost')) {
$html .= "<td $styleRightAligned>";
if ($user->can('manage_invoices') || $user->isClient())
@@
-328,7
+332,6
@@
if ($totals_only) {
if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$totals['time'].'</td>';
if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$totals['units'].'</td>';
if ($bean->getAttribute('chfinish')) $html .= '<td></td>';
if ($bean->getAttribute('chduration')) $html .= "<td $styleRightAligned>".$totals['time'].'</td>';
if ($bean->getAttribute('chunits')) $html .= "<td $styleRightAligned>".$totals['units'].'</td>';
- if ($bean->getAttribute('chnote')) $html .= '<td></td>';
if ($bean->getAttribute('chcost')) {
$html .= "<td $styleRightAligned>".htmlspecialchars($user->currency).' ';
if ($user->can('manage_invoices') || $user->isClient())
if ($bean->getAttribute('chcost')) {
$html .= "<td $styleRightAligned>".htmlspecialchars($user->currency).' ';
if ($user->can('manage_invoices') || $user->isClient())