X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=WEB-INF%2Ftemplates%2Ftimesheets.tpl;fp=WEB-INF%2Ftemplates%2Ftimesheets.tpl;h=0ba8fd7cfe2935dd71cd4c92851c2669cb1aaef6;hb=a64a8d017c37bec34585e0c345a0c139ac3b43a0;hp=796f2720796ab125ac5cc898de42355d793c709f;hpb=b33cf8ebaf54882a2238b660ba07936301077695;p=timetracker.git

diff --git a/WEB-INF/templates/timesheets.tpl b/WEB-INF/templates/timesheets.tpl
index 796f2720..0ba8fd7c 100644
--- a/WEB-INF/templates/timesheets.tpl
+++ b/WEB-INF/templates/timesheets.tpl
@@ -5,29 +5,46 @@
 <table cellspacing="0" cellpadding="7" border="0" width="720">
   <tr>
     <td valign="top">
-{if $user->can('manage_invoices') || $user->can('view_own_invoices')}
       <table cellspacing="1" cellpadding="3" border="0" width="100%">
         <tr><td colspan="2">{$i18n.form.timesheets.hint}<br></td></tr>
+        <tr><td>&nbsp;</td></tr>
+  {if $inactive_timesheets}
+        <tr><td class="sectionHeaderNoBorder">{$i18n.form.timesheets.active_timesheets}</td></tr>
+  {/if}
         <tr>
           <td class="tableHeader">{$i18n.label.thing_name}</td>
-  {if $user->isPluginEnabled('cl')}
+  {if $show_client}
           <td class="tableHeader">{$i18n.label.client}</td>
   {/if}
-  <td class="tableHeader">{$i18n.label.submitted}</td>
-  <td class="tableHeader">{$i18n.label.approved}</td>
+  {if $show_submit_status}
+          <td class="tableHeader">{$i18n.label.submitted}</td>
+  {/if}
+  {if $show_approval_status}
+          <td class="tableHeader">{$i18n.label.approved}</td>
+  {/if}
           <td class="tableHeader">{$i18n.label.view}</td>
+          <td class="tableHeader">{$i18n.label.edit}</td>
+          <td class="tableHeader">{$i18n.label.delete}</td>
         </tr>
-        {foreach $timesheets as $timesheet}
+        {foreach $active_timesheets as $timesheet}
         <tr valign="top" bgcolor="{cycle values="#f5f5f5,#ffffff"}">
           <td>{$timesheet.name|escape}</td>
+  {if $show_client}
           <td>{$timesheet.client_name|escape}</td>
-          <td>{$invoice.date}</td>
-  {if $user->isPluginEnabled('ps')}
-          <td>{if $invoice.paid}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
   {/if}
-          <td><a href="invoice_view.php?id={$invoice.id}">{$i18n.label.view}</a></td>
+  {if $show_submit_status}
+          <td>{if $timesheet.submit_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  {/if}
+  {if $show_approval_status}
+          <td>{if $timesheet.approval_status}{$i18n.label.yes}{else}{$i18n.label.no}{/if}</td>
+  {/if}
+
+
+
+          <td><a href="timesheet_view.php?id={$timesheet.id}">{$i18n.label.view}</a></td>
   {if !$user->isClient()}
-          <td><a href="invoice_delete.php?id={$invoice.id}">{$i18n.label.delete}</a></td>
+          <td><a href="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
+          <td><a href="timesheet_delete.php?id={$timesheet.id}">{$i18n.label.delete}</a></td>
   {/if}
         </tr>
         {/foreach}
@@ -38,7 +55,6 @@
         <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
       </table>
   {/if}
-{/if}
     </td>
   </tr>
 </table>