[OPT-CVS] opt/calendar/timesheets task_hours_handler.inc,1.5,1.6

[Martin V. <mar...@us...>]

Update of /cvsroot/outreach/opt/calendar/timesheets
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19487/timesheets

Modified Files:
	task_hours_handler.inc 
Log Message:
Modification supplied by Bogdan Stancescu
Allow for longer task durations and get rid of the 800 hours limit


Index: task_hours_handler.inc
===================================================================
RCS file: /cvsroot/outreach/opt/calendar/timesheets/task_hours_handler.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** task_hours_handler.inc	11 Mar 2006 16:38:54 -0000	1.5
--- task_hours_handler.inc	8 Sep 2006 19:46:18 -0000	1.6
***************
*** 55,59 ****
  
        if ($worked_hrs[$i] > 0 && $tasks[$i]) {
!         $estimated_secs=getvalue("task", "TIME_TO_SEC(estimated)", $tasks[$i]);
          if ($complete[$i] != '') {
            $hrs_remaining=intVal($complete[$i]);  
--- 55,59 ----
  
        if ($worked_hrs[$i] > 0 && $tasks[$i]) {
!         $estimated_secs=getvalue("task", "estimated_seconds", $tasks[$i]);
          if ($complete[$i] != '') {
            $hrs_remaining=intVal($complete[$i]);  
***************
*** 92,96 ****
          else {
            $prog_query = "";
!           $remaining="remaining='".getvalue("task", "TIME_TO_SEC(estimated) * (100-PercentComplete) 
                                         / 360000", $tasks[$i])."', ";
            $prog_query="progress='".getvalue("task", "PercentComplete", $tasks[$i])."', ";
--- 92,96 ----
          else {
            $prog_query = "";
!           $remaining="remaining='".getvalue("task", "estimated_seconds * (100-PercentComplete) 
                                         / 360000", $tasks[$i])."', ";
            $prog_query="progress='".getvalue("task", "PercentComplete", $tasks[$i])."', ";
***************
*** 104,108 ****
           
          $sql="insert into task_progress_history set $prog_query $remaining taskID='$tasks[$i]', 
!               worked=SEC_TO_TIME(3600*$worked_hrs[$i]), 
                $work_period comment='$Scomment', person=$person, date='$nice_sdate'";
          crm_run_query($sql);
--- 104,108 ----
           
          $sql="insert into task_progress_history set $prog_query $remaining taskID='$tasks[$i]', 
!               worked_seconds=3600*$worked_hrs[$i], 
                $work_period comment='$Scomment', person=$person, date='$nice_sdate'";
          crm_run_query($sql);