Index: src/www/reporting/timeadd.php
===================================================================
--- src/www/reporting/timeadd.php (revision 16080)
+++ src/www/reporting/timeadd.php (working copy)
@@ -44,25 +44,29 @@
$time_code = getStringFromRequest('time_code');
$old_time_code = getStringFromRequest('old_time_code');
$hours = getStringFromRequest('hours');
+ $old_hours=getStringFromRequest('old_hours');
+
if (getStringFromRequest('delete')) {
- if ($project_task_id && $report_date && $old_time_code) {
+ if ($project_task_id && $report_date && $old_time_code && $old_hours) {
$res=db_query_params ('DELETE FROM rep_time_tracking
WHERE user_id=$1
AND report_date=$2
AND project_task_id=$3
- AND time_code=$4',
+ AND time_code=$4
+ AND hours=$5',
array (user_getid(),
$report_date,
$project_task_id,
- $old_time_code));
+ $old_time_code,
+ $old_hours));
if (!$res || db_affected_rows($res) < 1) {
exit_error(db_error());
} else {
$feedback=_('Successfully Deleted');
}
} else {
- $error_msg = _('INTERNAL ERROR: delete: ').$project_task_id.' && '.$report_date.' && '.$old_time_code;
+ $error_msg = _('INTERNAL ERROR: delete: ').$project_task_id.' && '.$report_date.' && '.$old_time_code.' && '.$old_hours;
}
} elseif (getStringFromRequest('add')) {
@@ -148,6 +152,7 @@
+
boxGetAltRowStyle($xi++).'>
'.$r['name'].' |
'. date( 'D, M d, Y',$r['report_date']) .' |
Index: src/www/pm/mod_task.php
===================================================================
--- src/www/pm/mod_task.php (revision 16080)
+++ src/www/pm/mod_task.php (working copy)
@@ -40,6 +40,71 @@
?>
+
+
+
';
//setenv("TZ=" . $user_timezone); //restore the user's timezone
@@ -296,12 +361,13 @@
//
-$res=db_query_params ('SELECT users.realname, rep_time_tracking.report_date, rep_time_tracking.hours, rep_time_category.category_name
+$res=db_query_params ('SELECT users.user_id, users.realname, rep_time_tracking.report_date, rep_time_tracking.hours, rep_time_tracking.time_code, rep_time_category.category_name
FROM users,rep_time_tracking,rep_time_category
WHERE
users.user_id=rep_time_tracking.user_id
AND rep_time_tracking.time_code=rep_time_category.time_code
- AND rep_time_tracking.project_task_id=$1',
+ AND rep_time_tracking.project_task_id=$1
+ ORDER BY rep_time_tracking.report_date',
array($project_task_id));
$total_hours =0;
for ($i=0; $i'.date(_('Y-m-d H:i'),db_result($res,$i,'report_date')).'
'.db_result($res,$i,'hours').' |
'.db_result($res,$i,'category_name').' |
- '.db_result($res,$i,'realname').' |
+ '.db_result($res,$i,'realname').' | ';
+
+ $sameUser = db_result($res, $i, 'user_id') == user_getid();
+ $boolCheck = ($sameUser)? "enabled" : "disabled";
+
+ echo '
+ |
| ';
$total_hours += db_result($res,$i,'hours');