X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Fweek.tpl;h=6fc08b8a9bda2d69d584db89ce01802b94aa9113;hb=45ca7d2258832cb0d2465eb16dd646d925458106;hp=0d279ec6b7de5edad94988621007afa2aa7cf854;hpb=bdbadef4880db22d573cc3f154af3eb833942d56;p=timetracker.git

diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 0d279ec6..6fc08b8a 100644
--- a/WEB-INF/templates/week.tpl
+++ b/WEB-INF/templates/week.tpl
@@ -1,5 +1,20 @@
 {include file="time_script.tpl"}
 
+<script>
+// This is here because fillDropdowns() in time_script.tpl uses a different form name.
+// Perhaps a better fix would be to provide form name as paramater to fillDropdowns()?
+// TODO: try to fix it properly.
+//
+// The fillDropdowns function populates the "project" and "task" dropdown controls
+// with relevant values.
+function fillDropdowns() {
+  if(document.body.contains(document.weekTimeForm.client))
+    fillProjectDropdown(document.weekTimeForm.client.value);
+
+  fillTaskDropdown(document.weekTimeForm.project.value);
+}
+</script>
+
 <style>
 .not_billable td {
   color: #ff6666;
@@ -8,13 +23,11 @@
 
 {$forms.weekTimeForm.open}
 <table cellspacing="4" cellpadding="0" border="0">
-{if defined(WEEK_VIEW_DEBUG)}
   <tr>
     <td align="center" colspan=2">
       <a href="time.php?date={$selected_date->toString()}">{$i18n.label.day_view}</a>&nbsp;/&nbsp;<a href="week.php?date={$selected_date->toString()}">{$i18n.label.week_view}</a>
     </td>
   </tr>
-{/if}
   <tr>
     <td valign="top">
       <table>
@@ -23,6 +36,41 @@
           <td align="right">{$i18n.label.user}:</td>
           <td>{$forms.weekTimeForm.onBehalfUser.control}</td>
         </tr>
+{/if}
+{if $user->isPluginEnabled('cl')}
+        <tr>
+          <td align="right">{$i18n.label.client}{if $user->isPluginEnabled('cm')} (*){/if}:</td>
+          <td>{$forms.weekTimeForm.client.control}</td>
+        </tr>
+{/if}
+{if $user->isPluginEnabled('iv')}
+        <tr>
+          <td align="right">&nbsp;</td>
+          <td><label>{$forms.weekTimeForm.billable.control}{$i18n.form.time.billable}</label></td>
+        </tr>
+{/if}
+{if ($custom_fields && $custom_fields->fields[0])}
+        <tr>
+          <td align="right">{$custom_fields->fields[0]['label']|escape}{if $custom_fields->fields[0]['required']} (*){/if}:</td><td>{$forms.weekTimeForm.cf_1.control}</td>
+        </tr>
+{/if}
+{if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+        <tr>
+          <td align="right">{$i18n.label.project} (*):</td>
+          <td>{$forms.weekTimeForm.project.control}</td>
+        </tr>
+{/if}
+{if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+        <tr>
+          <td align="right">{$i18n.label.task}:</td>
+          <td>{$forms.weekTimeForm.task.control}</td>
+        </tr>
+{/if}
+{if $user->isPluginEnabled('wvn')}
+        <tr>
+          <td align="right">{$i18n.label.week_note}:</td>
+          <td>{$forms.weekTimeForm.note.control}</td>
+        </tr>
 {/if}
       </table>
     </td>
@@ -39,70 +87,94 @@
   </tr>
 </table>
 
+<table>
+  <tr>
+    <td align="center" colspan="2">{$forms.weekTimeForm.btn_submit.control}</td>
+  </tr>
+  <tr><td>&nbsp;</td></tr>
+</table>
+
+{if $user->isPluginEnabled('wvl')}
 <table width="720">
 <tr>
   <td valign="top">
-{if $grouped_records}
+{if $time_records}
       <table border="0" cellpadding="3" cellspacing="1" width="100%">
       <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>
+        <td width="5%" class="tableHeader">{$i18n.label.date}</td>
+  {if $user->isPluginEnabled('cl')}
+        <td width="20%" class="tableHeader">{$i18n.label.client}</td>
+  {/if}
+  {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}
+  {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+        <td class="tableHeader">{$i18n.label.task}</td>
   {/if}
-  {if ($user->isPluginEnabled('cf') || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
-        <td class="tableHeader"></td>
+  {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+        <td width="5%" class="tableHeader" align="right">{$i18n.label.start}</td>
+        <td width="5%" class="tableHeader" align="right">{$i18n.label.finish}</td>
   {/if}
-        <td class="tableHeader">{$day_header_0}</td>
-        <td class="tableHeader">{$day_header_1}</td>
-        <td class="tableHeader">{$day_header_2}</td>
-        <td class="tableHeader">{$day_header_3}</td>
-        <td class="tableHeader">{$day_header_4}</td>
-        <td class="tableHeader">{$day_header_5}</td>
-        <td class="tableHeader">{$day_header_6}</td>
+        <td width="5%" class="tableHeader">{$i18n.label.duration}</td>
+        <td class="tableHeader">{$i18n.label.note}</td>
+        <td></td>
+        <td></td>
       </tr>
-  {foreach $grouped_records as $record}
+  {foreach $time_records as $record}
       <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
-    {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>
+        <td valign="top">{$record.date}</td>
+    {if $user->isPluginEnabled('cl')}
+        <td valign="top">{$record.client|escape}</td>
     {/if}
-    {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 ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+        <td valign="top">{$record.project|escape}</td>
+    {/if}
+    {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)}
+        <td valign="top">{$record.task|escape}</td>
+    {/if}
+    {if (($smarty.const.TYPE_START_FINISH == $user->record_type) || ($smarty.const.TYPE_ALL == $user->record_type))}
+        <td nowrap align="right" valign="top">{if $record.start}{$record.start}{else}&nbsp;{/if}</td>
+        <td nowrap align="right" valign="top">{if $record.finish}{$record.finish}{else}&nbsp;{/if}</td>
+    {/if}
+        <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">{if $record.comment}{$record.comment|escape}{else}&nbsp;{/if}</td>
+        <td valign="top" align="center">
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+          &nbsp;
+    {else}
+          <a href="time_edit.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.edit}" src="images/icon_edit.png"></a>
+      {if ($record.duration == '0:00' && $record.start <> '')}
+          <input type="hidden" name="record_id" value="{$record.id}">
+          <input type="hidden" name="browser_date" value="">
+          <input type="hidden" name="browser_time" value="">
+          <input type="submit" id="btn_stop" name="btn_stop" onclick="browser_date.value=get_date();browser_time.value=get_time()" value="{$i18n.button.stop}">
+      {/if}
+    {/if}
+        </td>
+        <td valign="top" align="center">
+    {if $record.approved || $record.timesheet_id || $record.invoice_id}
+          &nbsp;
+    {else}
+          <a href="time_delete.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.delete}" src="images/icon_delete.png"></a>
     {/if}
-        <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>
+        </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>
 </tr>
 </table>
-<!--
+{/if}
+
 {if $time_records}
 <table cellpadding="3" cellspacing="1" width="720">
+  {if $user->isPluginEnabled('wvl')}
   <tr>
     <td align="left">{$i18n.label.week_total}: {$week_total}</td>
-    <td align="right">{$i18n.label.day_total}: {$day_total}</td>
+    <td></td>
   </tr>
+  {/if}
   {if $user->isPluginEnabled('mq')}
   <tr>
     <td align="left">{$i18n.label.month_total}: {$month_total}</td>
@@ -115,10 +187,4 @@
   {/if}
 </table>
 {/if}
--->
-<table>
-  <tr>
-    <td align="center" colspan="2">{$forms.weekTimeForm.btn_submit.control}</td>
-  </tr>
-</table>
 {$forms.weekTimeForm.close}