X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=WEB-INF%2Ftemplates%2Fweek.tpl;h=b120c49b4fd316bbdcb82db7a8b604c0b7efdda8;hb=9df2c85d1cd3337978dcb72d5f12c602f2588cb7;hp=fff4bfa4b405c32191534c477ed397d9f01d2869;hpb=8ecf916786c15d7bbe18bbb512b183c622be0bb4;p=timetracker.git

diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index fff4bfa4..b120c49b 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -37,14 +37,14 @@
 <table width="720">
 <tr>
   <td valign="top">
-{if $time_records}
+{if $grouped_records}
       <table border="0" cellpadding="3" cellspacing="1" width="100%">
       <tr>
-  {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <td class="tableHeader">{$i18n.label.project}</td>
+  {if ($user->isPluginEnabled('cl') || ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode))}
+        <td class="tableHeader"></td>
   {/if}
-  {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <td class="tableHeader">{$i18n.label.task}</td>
+  {if ($user->isPluginEnabled('cf') || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+        <td class="tableHeader"></td>
   {/if}
         <td class="tableHeader">{$day_header_0}</td>
         <td class="tableHeader">{$day_header_1}</td>
@@ -54,18 +54,38 @@
         <td class="tableHeader">{$day_header_5}</td>
         <td class="tableHeader">{$day_header_6}</td>
       </tr>
-  {foreach $time_records as $record}
+  {foreach $grouped_records as $record}
       <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
-    {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <td valign="top">{$record.project|escape}</td>
+    {if ($user->isPluginEnabled('cl') || ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode))}
+        <td valign="top">{$record.project|escape}<p>{$record.client|escape}</td>
     {/if}
-    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <td valign="top">{$record.task|escape}</td>
+    {if ($user->isPluginEnabled('cf') || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+        <td valign="top">{$record.task|escape}<p>{$record.cf_1_value|escape}</td>
     {/if}
-        <td valign="top">{$record.date}</td>
-        <td align="right" valign="top">{if ($record.duration == '0:00' && $record.start <> '')}<font color="#ff0000">{$i18n.form.time.uncompleted}</font>{else}{$record.duration}{/if}</td>
+        <td valign="top">{$record.$date_0.duration}</td>
+        <td valign="top">{$record.$date_1.duration}</td>
+        <td valign="top">{$record.$date_2.duration}</td>
+        <td valign="top">{$record.$date_3.duration}</td>
+        <td valign="top">{$record.$date_4.duration}</td>
+        <td valign="top">{$record.$date_5.duration}</td>
+        <td valign="top">{$record.$date_6.duration}</td>
       </tr>
   {/foreach}
+      <tr>
+  {if ($user->isPluginEnabled('cl') || ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode))}
+        <td class="tableHeader"></td>
+  {/if}
+  {if ($user->isPluginEnabled('cf') || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+        <td class="tableHeader"></td>
+  {/if}
+        <td class="tableHeader">{$grouped_records_totals.$date_0}</td>
+        <td class="tableHeader">{$grouped_records_totals.$date_1}</td>
+        <td class="tableHeader">{$grouped_records_totals.$date_2}</td>
+        <td class="tableHeader">{$grouped_records_totals.$date_3}</td>
+        <td class="tableHeader">{$grouped_records_totals.$date_4}</td>
+        <td class="tableHeader">{$grouped_records_totals.$date_5}</td>
+        <td class="tableHeader">{$grouped_records_totals.$date_6}</td>
+      </tr>
     </table>
 {/if}
   </td>