X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Ftemplates%2Fweek.tpl;h=e786ba856ffec41fad7710bb5b01ee182eb6f314;hb=2b39252b38f5bd1be462224fe781a40f5b0ddf95;hp=4abfa37991f73ade9a6ad912ab1b4b091fe55ed8;hpb=7df94ddee8feb9bc19b681f2b58fc547df622c9b;p=timetracker.git

diff --git a/WEB-INF/templates/week.tpl b/WEB-INF/templates/week.tpl
index 4abfa379..e786ba85 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,7 +23,7 @@
 
 {$forms.weekTimeForm.open}
 <table cellspacing="4" cellpadding="0" border="0">
-{if defined(WEEK_VIEW_DEBUG)}
+{if $show_navigation}
   <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>
@@ -23,6 +38,41 @@
           <td align="right">{$i18n.label.user}:</td>
           <td>{$forms.weekTimeForm.onBehalfUser.control}</td>
         </tr>
+{/if}
+{if $show_client}
+        <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>
@@ -38,11 +88,115 @@
     <td>{$forms.weekTimeForm.week_durations.control}</td>
   </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 $time_records}
+      <table border="0" cellpadding="3" cellspacing="1" width="100%">
+      <tr>
+        <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 (($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 width="5%" class="tableHeader">{$i18n.label.duration}</td>
+        <td class="tableHeader">{$i18n.label.note}</td>
+  {if $show_files}
+        <td></td>
+  {/if}
+        <td></td>
+        <td></td>
+      </tr>
+  {foreach $time_records as $record}
+      <tr bgcolor="{cycle values="#f5f5f5,#ffffff"}" {if !$record.billable} class="not_billable" {/if}>
+        <td valign="top">{$record.date}</td>
+    {if $user->isPluginEnabled('cl')}
+        <td valign="top">{$record.client|escape}</td>
+    {/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}
+    {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>
+    {if $show_files}
+      {if $record.has_files}
+        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_files.png"></a></td>
+      {else}
+        <td valign="top" align="center"><a href="time_files.php?id={$record.id}"><img class="table_icon" alt="{$i18n.label.files}" src="images/icon_file.png"></a></td>
+      {/if}
+    {/if}
+        <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>
+      </tr>
+  {/foreach}
+    </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></td>
+  </tr>
+  {/if}
+  {if $user->isPluginEnabled('mq')}
+  <tr>
+    <td align="left">{$i18n.label.month_total}: {$month_total}</td>
+    {if $over_quota}
+    <td align="right">{$i18n.form.time.over_quota}: <span style="color: green;">{$quota_remaining}</span></td>
+    {else}
+    <td align="right">{$i18n.form.time.remaining_quota}: <span style="color: red;">{$quota_remaining}</span></td>
+    {/if}
+  </tr>
+  {/if}
+</table>
+{/if}
 {$forms.weekTimeForm.close}