X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Ftimesheet_view.tpl;h=77cc78bd541249c90ff8c2ebaed89b1d23ab929a;hb=fe8af9a04f7170a0623915f31610c6c4c3df4058;hp=97591fe0b1588bff7a2203310963808faa726ad8;hpb=e5486346ac0574517a4fd118f03616ec455df9a9;p=timetracker.git

diff --git a/WEB-INF/templates/timesheet_view.tpl b/WEB-INF/templates/timesheet_view.tpl
index 97591fe0..77cc78bd 100644
--- a/WEB-INF/templates/timesheet_view.tpl
+++ b/WEB-INF/templates/timesheet_view.tpl
@@ -7,21 +7,26 @@
     <td>
       <table border=0 width=100%>
         <tr><td align="center"><b style="font-size: 15pt; font-family: Arial, Helvetica, sans-serif;">{$timesheet['name']|escape} </b></td></tr>
+{if $user->behalfUser}
         <tr><td align="left"><b>{$i18n.label.user}:</b> {$timesheet['user_name']|escape}</td></tr>
+{/if}
 {if $timesheet['client_id']}
         <tr><td align="left"><b>{$i18n.label.client}:</b> {$timesheet['client_name']|escape}</td></tr>
 {/if}
-{if $not_client}
+{if $timesheet['project_id']}
+        <tr><td align="left"><b>{$i18n.label.project}:</b> {$timesheet['project_name']|escape}</td></tr>
+{/if}
+{if $timesheet['comment']}
+        <tr><td align="left"><b>{$i18n.label.comment}:</b> {$timesheet['comment']|escape}</td></tr>
+{/if}
+{if $timesheet['approve_status'] == null}
         <tr><td align="left"><b>{$i18n.label.submitted}:</b> {if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>
-  {if $timesheet['submitter_comment']}
-        <tr><td align="left"><b>{$i18n.label.comment}:</b> {$timesheet['submitter_comment']|escape}</td></tr>
-  {/if}
-  {if $timesheet['submit_status']}
-        <tr><td align="left"><b>{$i18n.label.approved}:</b> {if $timesheet.approval_status != null}{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>{/if}
-  {/if}
-  {if $timesheet['manager_comment']}
-        <tr><td align="left"><b>{$i18n.label.note}:</b> {$timesheet['manager_comment']|escape}</td></tr>
-  {/if}
+{/if}
+{if $timesheet['approve_status'] != null}
+        <tr><td align="left"><b>{$i18n.label.approved}:</b> {if $timesheet.approve_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td></tr>
+{/if}
+{if $timesheet['approve_comment']}
+        <tr><td align="left"><b>{$i18n.label.note}:</b> {$timesheet['approve_comment']|escape}</td></tr>
 {/if}
       </table>
     </td>
@@ -32,21 +37,19 @@
       <tr>
         <td class="tableHeader">{$group_by_header|escape}</td>
         <td class="tableHeaderCentered" width="5%">{$i18n.label.duration}</td>
-        <td class="tableHeaderCentered" width="5%">{$i18n.label.cost}</td>
       </tr>
   {foreach $subtotals as $subtotal}
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{if $subtotal['name']}{$subtotal['name']|escape}{else}&nbsp;{/if}</td>
         <td class="cellRightAlignedSubtotal">{$subtotal['time']}</td>
-        <td class="cellRightAlignedSubtotal">{if $user->can('manage_invoices') || $user->isClient()}{$subtotal['cost']}{else}{$subtotal['expenses']}{/if}</td>
       </tr>
   {/foreach}
       <tr><td>&nbsp;</td></tr>
       <tr class="rowReportSubtotal">
         <td class="cellLeftAlignedSubtotal">{$i18n.label.total}</td>
         <td nowrap class="cellRightAlignedSubtotal">{$totals['time']}</td>
-        <td nowrap class="cellRightAlignedSubtotal">{$user->currency|escape} {if $user->can('manage_invoices') || $user->isClient()}{$totals['cost']}{else}{$totals['expenses']}{/if}</td>
       </tr>
+      <tr><td>&nbsp;</td></tr>
       </table>
 
 {$forms.timesheetForm.open}
@@ -55,7 +58,7 @@
   <tr>
     <td align="center">
       <table>
-        <tr><td>{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control} {$forms.timesheetForm.btn_submit.control}</td></tr>
+        <tr><td>{if $show_approvers}{$i18n.form.mail.to}: {$forms.timesheetForm.approver.control}{/if} {$forms.timesheetForm.btn_submit.control}</td></tr>
       </table>
     </td>
   </tr>