if ($user->isClient()) $client_part = "and client_id = $user->client_id";
$sql = "select * from tt_timesheets".
- " where id = $timesheet_id and group_id = $group_id and org_id = $org_id $client_part and status = 1";
+ " where id = $timesheet_id and group_id = $group_id and org_id = $org_id $client_part and status is not null";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
if ($val = $res->fetchRow())
{/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="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}
+ </table>
+ {if !$user->isClient()}
+ <table width="100%">
+ <tr><td align="center"><br><form><input type="button" onclick="chLocation('reports.php');" value="{$i18n.button.add}"></form></td></tr>
+ </table>
{/if}
+{if $inactive_timesheets}
+ <table cellspacing="1" cellpadding="3" border="0" width="100%">
-
+ <tr><td class="sectionHeaderNoBorder">{$i18n.form.timesheets.inactive_timesheets}</td></tr>
+ <tr>
+ <td class="tableHeader">{$i18n.label.thing_name}</td>
+ {if $show_client}
+ <td class="tableHeader">{$i18n.label.client}</td>
+ {/if}
+ {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 $inactive_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>
+ {/if}
+ {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="timesheet_edit.php?id={$timesheet.id}">{$i18n.label.edit}</a></td>
</tr>
{/foreach}
</table>
-
{if !$user->isClient()}
<table width="100%">
<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>