X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Ftimesheet_view.tpl;h=77cc78bd541249c90ff8c2ebaed89b1d23ab929a;hb=a1f560292f6ce8999022da19b9d487636bf93769;hp=1711443942b31d3b7ae23de1738867618b67514a;hpb=8fd871c1242b3309b8a374a97969ab74d5375069;p=timetracker.git
diff --git a/WEB-INF/templates/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index 17114439..77cc78bd 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -7,21 +7,26 @@
{$timesheet['name']|escape} |
+{if $user->behalfUser}
{$i18n.label.user}: {$timesheet['user_name']|escape} |
+{/if}
{if $timesheet['client_id']}
{$i18n.label.client}: {$timesheet['client_name']|escape} |
{/if}
-{if $not_client}
+{if $timesheet['project_id']}
+ {$i18n.label.project}: {$timesheet['project_name']|escape} |
+{/if}
+{if $timesheet['comment']}
+ {$i18n.label.comment}: {$timesheet['comment']|escape} |
+{/if}
+{if $timesheet['approve_status'] == null}
{$i18n.label.submitted}: {if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if} |
- {if $timesheet['submitter_comment']}
- {$i18n.label.comment}: {$timesheet['submitter_comment']|escape} |
- {/if}
- {if $timesheet['submit_status']}
- {$i18n.label.approved}: {if $timesheet.approval_status != null}{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if} | {/if}
- {/if}
- {if $timesheet['manager_comment']}
- {$i18n.label.note}: {$timesheet['manager_comment']|escape} |
- {/if}
+{/if}
+{if $timesheet['approve_status'] != null}
+ {$i18n.label.approved}: {if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if} |
+{/if}
+{if $timesheet['approve_comment']}
+ {$i18n.label.note}: {$timesheet['approve_comment']|escape} |
{/if}
|
@@ -32,21 +37,19 @@
-
{foreach $subtotals as $subtotal}
{if $subtotal['name']}{$subtotal['name']|escape}{else} {/if} |
{$subtotal['time']} |
- {if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if} |
{/foreach}
|
{$i18n.label.total} |
{$totals['time']} |
- {$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if} |
+ |
{$forms.timesheetForm.open}
@@ -55,7 +58,7 @@
- {$i18n.form.mail.to}: {$forms.timesheetForm.approver.control} {$forms.timesheetForm.btn_submit.control} |
+ {if $show_approvers}{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control}{/if} {$forms.timesheetForm.btn_submit.control} |
|
@@ -66,7 +69,9 @@
- {$forms.timesheetForm.btn_approve.control} {$forms.timesheetForm.btn_disapprove.control} |
+ {$i18n.label.comment}: |
+ {$forms.timesheetForm.comment.control} |
+ {$forms.timesheetForm.btn_approve.control} {$forms.timesheetForm.btn_disapprove.control} |
|