X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=WEB-INF%2Ftemplates%2Freport.tpl;h=f99a3fb9ca5ac873f7186517103721a402f27153;hb=6cb9c41aae566dcc564fa8ad3a6c6ee4facdf373;hp=6192b146514463a4af93bab4380872100697c74b;hpb=ed6483fa05ff6f489a7cfc4ff72fdc4d4d8f3889;p=timetracker.git
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 6192b146..f99a3fb9 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -14,13 +14,13 @@
{if $bean->getAttribute('chtotalsonly')}
-
+
{if $bean->getAttribute('chduration')}{/if}
{if $bean->getAttribute('chcost')}{/if}
{foreach $subtotals as $subtotal}
- {if $subtotal['name']}{$subtotal['name']|escape:'html'}{else} {/if} |
+ {if $subtotal['name']}{$subtotal['name']|escape}{else} {/if} |
{if $bean->getAttribute('chduration')}{$subtotal['time']} | {/if}
{if $bean->getAttribute('chcost')}{if $user->canManageTeam() || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if} | {/if}
@@ -30,47 +30,50 @@
{$i18n.label.total} |
{if $bean->getAttribute('chduration')}{$totals['time']} | {/if}
- {if $bean->getAttribute('chcost')}{$user->currency|escape:'html'} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chcost')}{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if} | {/if}
{else}
-
+
{if $user->canManageTeam() || $user->isClient()}{/if}
{if $bean->getAttribute('chclient')}{/if}
{if $bean->getAttribute('chproject')}{/if}
{if $bean->getAttribute('chtask')}{/if}
- {if $bean->getAttribute('chcf_1')}{/if}
+ {if $bean->getAttribute('chcf_1')}{/if}
{if $bean->getAttribute('chstart')}{/if}
{if $bean->getAttribute('chfinish')}{/if}
{if $bean->getAttribute('chduration')}{/if}
{if $bean->getAttribute('chnote')}{/if}
{if $bean->getAttribute('chcost')}{/if}
- {if $bean->getAttribute('chinvoice')}{/if}
+ {if $bean->getAttribute('chpaid')}{/if}
+ {if $bean->getAttribute('chinvoice')}{/if}
{foreach $report_items as $item}
- {$cur_date = $item.date}
+ {$cur_date = $item.date}
{if $print_subtotals}
{$cur_grouped_by = $item.grouped_by}
{if $cur_grouped_by != $prev_grouped_by && !$first_pass}
{$i18n.label.subtotal}
- {if $user->canManageTeam() || $user->isClient()} | {if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chclient')}{if $group_by == 'client'}{$subtotals[$prev_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chproject')}{if $group_by == 'project'}{$subtotals[$prev_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chtask')}{if $group_by == 'task'}{$subtotals[$prev_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chcf_1')}{if $group_by == 'cf_1'}{$subtotals[$prev_grouped_by]['name']|escape:'html'} | {/if}{/if}
+ {if $user->canManageTeam() || $user->isClient()}{if $group_by == 'user'}{$subtotals[$prev_grouped_by]['name']|escape} | {/if}{/if}
+ {if $bean->getAttribute('chclient')}{if $group_by == 'client'}{$subtotals[$prev_grouped_by]['name']|escape} | {/if}{/if}
+ {if $bean->getAttribute('chproject')}{if $group_by == 'project'}{$subtotals[$prev_grouped_by]['name']|escape} | {/if}{/if}
+ {if $bean->getAttribute('chtask')}{if $group_by == 'task'}{$subtotals[$prev_grouped_by]['name']|escape} | {/if}{/if}
+ {if $bean->getAttribute('chcf_1')}{if $group_by == 'cf_1'}{$subtotals[$prev_grouped_by]['name']|escape} | {/if}{/if}
{if $bean->getAttribute('chstart')} | {/if}
{if $bean->getAttribute('chfinish')} | {/if}
{if $bean->getAttribute('chduration')}{$subtotals[$prev_grouped_by]['time']} | {/if}
{if $bean->getAttribute('chnote')} | {/if}
{if $bean->getAttribute('chcost')}{if $user->canManageTeam() || $user->isClient()}{$subtotals[$prev_grouped_by]['cost']}{else}{$subtotals[$prev_grouped_by]['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chpaid')} | {/if}
{if $bean->getAttribute('chinvoice')} | {/if}
+ {if $use_checkboxes} | {/if}
|
{/if}
- {$first_pass = false}
+ {$first_pass = false}
{/if}
{if $cur_date != $prev_date}
@@ -78,42 +81,43 @@
{/if}
{$item.date} |
- {if $user->canManageTeam() || $user->isClient()}{$item.user|escape:'html'} | {/if}
- {if $bean->getAttribute('chclient')}{$item.client|escape:'html'} | {/if}
- {if $bean->getAttribute('chproject')}{$item.project|escape:'html'} | {/if}
- {if $bean->getAttribute('chtask')}{$item.task|escape:'html'} | {/if}
- {if $bean->getAttribute('chcf_1')}{$item.cf_1|escape:'html'} | {/if}
+ {if $user->canManageTeam() || $user->isClient()}{$item.user|escape} | {/if}
+ {if $bean->getAttribute('chclient')}{$item.client|escape} | {/if}
+ {if $bean->getAttribute('chproject')}{$item.project|escape} | {/if}
+ {if $bean->getAttribute('chtask')}{$item.task|escape} | {/if}
+ {if $bean->getAttribute('chcf_1')}{$item.cf_1|escape} | {/if}
{if $bean->getAttribute('chstart')}{$item.start} | {/if}
{if $bean->getAttribute('chfinish')}{$item.finish} | {/if}
{if $bean->getAttribute('chduration')}{$item.duration} | {/if}
- {if $bean->getAttribute('chnote')}{$item.note|escape:'html'} | {/if}
+ {if $bean->getAttribute('chnote')}{$item.note|escape} | {/if}
{if $bean->getAttribute('chcost')}{if $user->canManageTeam() || $user->isClient()}{$item.cost}{else}{$item.expense}{/if} | {/if}
- {if $bean->getAttribute('chinvoice')}
- {$item.invoice|escape:'html'} |
- {if $use_checkboxes}
- {if 1 == $item.type} | {/if}
- {if 2 == $item.type} | {/if}
- {/if}
+ {if $bean->getAttribute('chpaid')}{if $item.paid == 1}{$i18n.label.yes}{else}{$i18n.label.no}{/if}{/if}
+ {if $bean->getAttribute('chinvoice')} | {$item.invoice|escape} | {/if}
+ {if $use_checkboxes}
+ {if 1 == $item.type} | {/if}
+ {if 2 == $item.type} | {/if}
{/if}
{$prev_date = $item.date}
{if $print_subtotals} {$prev_grouped_by = $item.grouped_by} {/if}
{/foreach}
- {if $print_subtotals}
+ {if $print_subtotals}
{$i18n.label.subtotal}
- {if $user->canManageTeam() || $user->isClient()} | {if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chclient')}{if $group_by == 'client'}{$subtotals[$cur_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chproject')}{if $group_by == 'project'}{$subtotals[$cur_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chtask')}{if $group_by == 'task'}{$subtotals[$cur_grouped_by]['name']|escape:'html'} | {/if}{/if}
- {if $bean->getAttribute('chcf_1')}{if $group_by == 'cf_1'}{$subtotals[$cur_grouped_by]['name']|escape:'html'} | {/if}{/if}
+ {if $user->canManageTeam() || $user->isClient()}{if $group_by == 'user'}{$subtotals[$cur_grouped_by]['name']|escape} | {/if}{/if}
+ {if $bean->getAttribute('chclient')}{if $group_by == 'client'}{$subtotals[$cur_grouped_by]['name']|escape} | {/if}{/if}
+ {if $bean->getAttribute('chproject')}{if $group_by == 'project'}{$subtotals[$cur_grouped_by]['name']|escape} | {/if}{/if}
+ {if $bean->getAttribute('chtask')}{if $group_by == 'task'}{$subtotals[$cur_grouped_by]['name']|escape} | {/if}{/if}
+ {if $bean->getAttribute('chcf_1')}{if $group_by == 'cf_1'}{$subtotals[$cur_grouped_by]['name']|escape} | {/if}{/if}
{if $bean->getAttribute('chstart')} | {/if}
{if $bean->getAttribute('chfinish')} | {/if}
{if $bean->getAttribute('chduration')}{$subtotals[$cur_grouped_by]['time']} | {/if}
{if $bean->getAttribute('chnote')} | {/if}
{if $bean->getAttribute('chcost')}{if $user->canManageTeam() || $user->isClient()}{$subtotals[$cur_grouped_by]['cost']}{else}{$subtotals[$cur_grouped_by]['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chpaid')} | {/if}
{if $bean->getAttribute('chinvoice')} | {/if}
+ {if $use_checkboxes} | {/if}
{/if}
@@ -129,23 +133,36 @@
{if $bean->getAttribute('chfinish')} | {/if}
{if $bean->getAttribute('chduration')}{$totals['time']} | {/if}
{if $bean->getAttribute('chnote')} | {/if}
- {if $bean->getAttribute('chcost')}{$user->currency|escape:'html'} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chcost')}{$user->currency|escape} {if $user->canManageTeam() || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if} | {/if}
+ {if $bean->getAttribute('chpaid')} | {/if}
{if $bean->getAttribute('chinvoice')} | {/if}
+ {if $use_checkboxes} | {/if}
{/if}
-{if $use_checkboxes && $report_items}
-
+{if $report_items && ($use_mark_paid || $use_assign_to_invoice)}
+
+ {if $use_mark_paid}
- {$forms.reportForm.recent_invoice.control} {$forms.reportForm.btn_submit.control} |
+ {$i18n.label.mark_paid}: {$forms.reportForm.mark_paid_select_options.control} {$forms.reportForm.mark_paid_action_options.control} {$forms.reportForm.btn_mark_paid.control} |
|
+ {/if}
+ {if $use_assign_to_invoice}
+
+
+
+ {$i18n.form.report.assign_to_invoice}: {$forms.reportForm.assign_invoice_select_options.control} {$forms.reportForm.recent_invoice.control} {$forms.reportForm.btn_assign.control} |
+
+ |
+
+ {/if}
{/if}
{$forms.reportForm.close}
@@ -160,4 +177,4 @@
-
\ No newline at end of file
+