Skip to content

T
timesheet
Commit 1e681afe authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Cleanup main projectlist printing.

parent 8c173145
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
addedit.php
View file @ 1e681afe
......@@ -422,33 +422,33 @@ function showtimesheetproject()
} // end of function showtimesheetproject()
?>
<table width="100%" border="0" cellpadding="2" cellspacing="1" class="tbl">
<tr>
<th nowrap="nowrap">&nbsp;</th>
<th nowrap="nowrap"><?php echo $AppUI->_( 'Project' );?></th>
<th nowrap="nowrap"><?php echo $AppUI->_( 'Worked hours' );?></th>
<th nowrap="nowrap"><?php echo $AppUI->_( 'Project status' );?></th>
</tr>
<form name="projectFrm" action="./index.php?m=timesheet" method="post">
<input type="hidden" name="dosql" value="do_timesheet_aed" />
<input type="hidden" name="projects" value="0" />
<input type="hidden" name="timesheet_id" value="<?php echo $timesheet_id;?>" />
<input type="hidden" name="timesheet_date" value="<?php echo $obj->timesheet_date;?>" />
<input type="hidden" name="timesheet_creator" value="<?php echo $obj->timesheet_creator;?>" />
<input type="hidden" name="timesheet_worked" value="<?php echo $obj->timesheet_worked;?>" />
<?php
if ($status == 0)
showproject();
else
// FIXME: Workaround for problem in showtimesheetproject(); function. Now all hours worked are
// recalculated from the projects table, while you actually would like to see the hours as
// submitted/approved by users and manager.
echo '<table width="100%" border="0" cellpadding="2" cellspacing="1" class="tbl">';
echo '<tr>';
echo '<th nowrap="nowrap">&nbsp;</th>';
echo '<th nowrap="nowrap">'. $AppUI->_( 'Project' ) .'</th>';
echo '<th nowrap="nowrap">'. $AppUI->_( 'Worked hours' ) .'</th>';
echo '<th nowrap="nowrap">'. $AppUI->_( 'Project status' ) .'</th>';
echo '</tr>';
echo '<form name="projectFrm" action="./index.php?m=timesheet" method="post">';
echo '<input type="hidden" name="dosql" value="do_timesheet_aed" />';
echo '<input type="hidden" name="projects" value="0" />';
echo '<input type="hidden" name="timesheet_id" value="'. $timesheet_id .'" />';
echo '<input type="hidden" name="timesheet_date" value="'. $obj->timesheet_date .'" />';
echo '<input type="hidden" name="timesheet_creator" value="'. $obj->timesheet_creator .'" />';
echo '<input type="hidden" name="timesheet_worked" value="'. $obj->timesheet_worked .'" />';
if ($status == 0)
showproject();
//showtimesheetproject();
else
// FIXME: Workaround for problem in showtimesheetproject(); function. Now all hours worked are
// recalculated from the projects table, while you actually would like to see the hours as
// submitted/approved by users and manager.
showproject();
//showtimesheetproject();
echo '<script language="javascript">workedHoursChange('. $obj->timesheet_worked .');</script>';
echo "</form>";
echo "</table>";
?>
<script language="javascript">
workedHoursChange(<?php echo $obj->timesheet_worked; ?>);
</script>
</form>
</table>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment