outreach-cvs Mailing List for Outreach Project Tool

outreach-cvs — Automated notifications on every commit in the OPT CVS repository

You can subscribe to this list here.

2002	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (131)	_Sep	_Oct (5)	_Nov	_Dec
2003	_Jan	_Feb	_Mar	_Apr (114)	_May (105)	_Jun (46)	_Jul (5)	_Aug (86)	_Sep (19)	_Oct (333)	_Nov (10)	_Dec (14)
2004	_Jan (22)	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct (5)	_Nov (2)	_Dec (10)
2005	_Jan (9)	_Feb (2)	_Mar	_Apr	_May (1)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec
2006	_Jan	_Feb	_Mar (160)	_Apr	_May	_Jun	_Jul	_Aug (1)	_Sep (40)	_Oct	_Nov	_Dec
2007	_Jan	_Feb	_Mar	_Apr (1)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

1 2 3 .. 45 > >> (Page 1 of 45)

[OPT-CVS] opt/overview user_todo.inc,1.10,1.11

From: Martin V. <mar...@us...> - 2007-04-20 18:37:08

Update of /cvsroot/outreach/opt/overview
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19912/overview

Modified Files:
	user_todo.inc 
Log Message:
Fixed left join error wth MySQL 5


Index: user_todo.inc
===================================================================
RCS file: /cvsroot/outreach/opt/overview/user_todo.inc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** user_todo.inc	8 Sep 2006 20:00:21 -0000	1.10
--- user_todo.inc	20 Apr 2007 18:37:05 -0000	1.11
***************
*** 154,158 ****
  {   // Just get requests which have tasks due this (or last) week involving this user
      $sql="select distinct(requests.id), title, priority, status, deadline, aproj, initial_estimate_seconds/3600
!           from requests, request2task, task, person_task left join projects on requests.aproj = projects.id
  	  where (projects.active != 0) and requests.id = request2task.request and request2task.task = task.id
            and person_task.taskID = task.id and person_task.personID = $person $scope_filter_sql order by priority asc";
--- 154,158 ----
  {   // Just get requests which have tasks due this (or last) week involving this user
      $sql="select distinct(requests.id), title, priority, status, deadline, aproj, initial_estimate_seconds/3600
!           from (requests, request2task, task, person_task) left join projects on requests.aproj = projects.id
  	  where (projects.active != 0) and requests.id = request2task.request and request2task.task = task.id
            and person_task.taskID = task.id and person_task.personID = $person $scope_filter_sql order by priority asc";

[OPT-CVS] opt/include gui.php,1.20,1.21

From: Martin V. <mar...@us...> - 2006-09-09 21:46:10

Update of /cvsroot/outreach/opt/include
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23630

Modified Files:
	gui.php 
Log Message:
Fixed an issue with different time formats caused by different MySQL
revisions (4 & 5). OPT should now work on both releases.


Index: gui.php
===================================================================
RCS file: /cvsroot/outreach/opt/include/gui.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** gui.php	10 Mar 2006 20:45:39 -0000	1.20
--- gui.php	9 Sep 2006 21:45:59 -0000	1.21
***************
*** 129,148 ****
    function niceDate($table,$col,$id,$format=0,$ifnull="n/a") {
      $query = "SELECT $col FROM $table WHERE id = $id";
      $result = crm_run_query( $query );
      if ( OPT_num_rows($result) ) {
         $row = OPT_fetch_row( $result );
!        switch( $format ) {
!        case 0:
!             return date("Y/m/d H:i:s", strtotime($row[0]) );
!             break;
!        case 1:
!             return date("Y/m/d", strtotime($row[0]) );
!             break;
!        case 2:
!             return date("H:i:s", strtotime($row[0]) );
!             break;
!        default:
!             return $row[0];
!             break;
         }
      }
--- 129,172 ----
    function niceDate($table,$col,$id,$format=0,$ifnull="n/a") {
      $query = "SELECT $col FROM $table WHERE id = $id";
+ //echo $query ."<br />";
      $result = crm_run_query( $query );
      if ( OPT_num_rows($result) ) {
         $row = OPT_fetch_row( $result );
!        // Because MySQL has changed the date format and inside OPT dates are 
!        // not always stored in the same way (history) we need a dirty hack
!        // to retrieve the correct dates while upgrading our systems over
!        // the years. All date structures could use a rehaul though, but this 
!        // seems to works..... MV
!        if (is_numeric($row[0])) {
!          if ($row[0] == 0) return $ifnull;
!          switch( $format ) {
!          case 0:
!               return substr($row[0],0,4)."/".substr($row[0],4,2)."/".substr($row[0],6,2)." ".substr($row[0],8,2).":".substr($row[0],10,2).":".substr($row[0],12,2);
!               break;
!          case 1:
!               return substr($row[0],0,4)."/".substr($row[0],4,2)."/".substr($row[0],6,2);
!               break;
!          case 2:
!               return substr($row[0],8,2).":".substr($row[0],10,2).":".substr($row[0],12,2);
!               break;
!          default:
!               return $row[0];
!               break;
!          }
!        } else {
!          switch( $format ) {
!          case 0:
!               return date("Y/m/d H:i:s", strtotime($row[0]) );
!               break;
!          case 1:
!               return date("Y/m/d", strtotime($row[0]) );
!               break;
!          case 2:
!               return date("H:i:s", strtotime($row[0]) );
!               break;
!          default:
!               return $row[0];
!               break;
!          }
         }
      }

[OPT-CVS] opt/setup opt_init.sql,1.26,1.27

From: Martin V. <mar...@us...> - 2006-09-09 15:28:00

Update of /cvsroot/outreach/opt/setup
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1238

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


Index: opt_init.sql
===================================================================
RCS file: /cvsroot/outreach/opt/setup/opt_init.sql,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** opt_init.sql	4 Dec 2004 08:55:51 -0000	1.26
--- opt_init.sql	9 Sep 2006 15:27:56 -0000	1.27
***************
*** 981,984 ****
--- 981,985 ----
    resolved_date timestamp(14) NOT NULL, 
    initial_estimate TIME NOT NULL default 0,
+   initial_estimate_seconds int(10) unsigned NOT NULL default '0',
    PRIMARY KEY  (id),
    KEY aproj (aproj),
***************
*** 1074,1077 ****
--- 1075,1079 ----
    PercentOfParent tinyint(3) unsigned NOT NULL default '0',
    estimated time default 0 not null,    
+   estimated_seconds int(10) unsigned NOT NULL default '0',
    PRIMARY KEY  (id),
    KEY ProjectID (ProjectID)
***************
*** 1101,1104 ****
--- 1103,1107 ----
    date timestamp(14) NOT NULL,
    estimator mediumint(8) unsigned NOT NULL default '0',
+   estimated_seconds int(10) unsigned NOT NULL default '0',
    PRIMARY KEY  (id),
    KEY taskID (taskID)
***************
*** 1120,1123 ****
--- 1123,1127 ----
    comment mediumtext NOT NULL,
    person mediumint(8) unsigned NOT NULL default '0',
+   worked_seconds int(10) unsigned NOT NULL default '0',
    PRIMARY KEY  (id),
    KEY taskID (taskID)

[OPT-CVS] opt/rt/reports/progress index.php,1.9,1.10

From: Martin V. <mar...@us...> - 2006-09-09 12:53:42

Update of /cvsroot/outreach/opt/rt/reports/progress
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4739

Modified Files:
	index.php 
Log Message:
Fix a typo in SQL statement


Index: index.php
===================================================================
RCS file: /cvsroot/outreach/opt/rt/reports/progress/index.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** index.php	8 Sep 2006 20:07:15 -0000	1.9
--- index.php	9 Sep 2006 12:53:39 -0000	1.10
***************
*** 380,384 ****
      if ($task_ids) {
          // Now determine total hrs worked a week ago
!         $sql="select sum(worked_seconds)/3600) from task_progress_history where taskID IN (".implode(", ", $task_ids).
              ") and UNIX_TIMESTAMP(date) < $week_earlier";
          $result=CRM_run_query($sql);
--- 380,384 ----
      if ($task_ids) {
          // Now determine total hrs worked a week ago
!         $sql="select sum(worked_seconds/3600) from task_progress_history where taskID IN (".implode(", ", $task_ids).
              ") and UNIX_TIMESTAMP(date) < $week_earlier";
          $result=CRM_run_query($sql);
***************
*** 393,397 ****
          }
          // Now determine total hrs worked as of this week
!         $sql="select sum(worked_seconds)/3600) from task_progress_history where taskID IN (".implode(", ", $task_ids).
              ") and UNIX_TIMESTAMP(date) < $end_date";
          $result=CRM_run_query($sql);
--- 393,397 ----
          }
          // Now determine total hrs worked as of this week
!         $sql="select sum(worked_seconds/3600) from task_progress_history where taskID IN (".implode(", ", $task_ids).
              ") and UNIX_TIMESTAMP(date) < $end_date";
          $result=CRM_run_query($sql);

[OPT-CVS] opt/tasks index.php,1.6,1.7

From: Martin V. <mar...@us...> - 2006-09-08 20:19:00

Update of /cvsroot/outreach/opt/tasks
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv462

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


Index: index.php
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** index.php	3 Mar 2006 22:06:14 -0000	1.6
--- index.php	8 Sep 2006 20:18:57 -0000	1.7
***************
*** 117,121 ****
    $sql="select distinct(id), TaskName, CatID, StartDate, StartDatePlanned, EndDate, EndDatePlanned, 
                 DateSet, TaskDesc, ProjectID, PercentComplete, StatusUpdated, active, date, parent,
!                PercentOfParent, TIME_TO_SEC(estimated) as secs_estimated
          from task LEFT JOIN person_task ON task.id = person_task.taskID
          where
--- 117,121 ----
    $sql="select distinct(id), TaskName, CatID, StartDate, StartDatePlanned, EndDate, EndDatePlanned, 
                 DateSet, TaskDesc, ProjectID, PercentComplete, StatusUpdated, active, date, parent,
!                PercentOfParent, estimated_seconds as secs_estimated
          from task LEFT JOIN person_task ON task.id = person_task.taskID
          where

[OPT-CVS] opt/tasks/report ext_timecard.php,1.2,1.3

From: Martin V. <mar...@us...> - 2006-09-08 20:18:25

Update of /cvsroot/outreach/opt/tasks/report
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv433/report

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


Index: ext_timecard.php
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/report/ext_timecard.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ext_timecard.php	28 Apr 2003 02:36:00 -0000	1.2
--- ext_timecard.php	8 Sep 2006 20:18:23 -0000	1.3
***************
*** 77,81 ****
      t.taskName as taskname,
      DATE_FORMAT(tph.workfrom, '%e %b %Y') as tdate,
!     TIME_FORMAT(tph.worked, '%H:%i'),
      TIME_FORMAT(tph.workfrom, '%H:%i') as ttime,
      TIME_FORMAT(tph.workto, '%H:%i'),
--- 77,81 ----
      t.taskName as taskname,
      DATE_FORMAT(tph.workfrom, '%e %b %Y') as tdate,
!     TIME_FORMAT(SEC_TO_TIME(tph.worked_seconds), '%H:%i'),
      TIME_FORMAT(tph.workfrom, '%H:%i') as ttime,
      TIME_FORMAT(tph.workto, '%H:%i'),
***************
*** 94,98 ****
      tph.person=p.id AND
      tph.taskID=t.id AND
!     tph.worked > 0 AND
      tph.date <= FROM_UNIXTIME($week_end) AND 
      tph.date > FROM_UNIXTIME($prev_week_end)
--- 94,98 ----
      tph.person=p.id AND
      tph.taskID=t.id AND
!     tph.worked_seconds > 0 AND
      tph.date <= FROM_UNIXTIME($week_end) AND 
      tph.date > FROM_UNIXTIME($prev_week_end)

[OPT-CVS] opt/tasks/report gantt_image.php,1.7,1.8

From: Martin V. <mar...@us...> - 2006-09-08 20:17:57

Update of /cvsroot/outreach/opt/tasks/report
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32523/report

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


Index: gantt_image.php
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/report/gantt_image.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gantt_image.php	18 Jun 2003 18:58:43 -0000	1.7
--- gantt_image.php	8 Sep 2006 20:17:55 -0000	1.8
***************
*** 133,137 ****
  $sql="select distinct(task.id) as id, TaskName, StartDate, StartDatePlanned, EndDate, EndDatePlanned, 
                 DateSet, TaskDesc, ProjectID, PercentComplete, StatusUpdated, active, date, parent,
!                PercentOfParent, TIME_TO_SEC(estimated) as secs_estimated, personID, fname
          from task LEFT JOIN person_task ON task.id = person_task.taskID, people
          where
--- 133,137 ----
  $sql="select distinct(task.id) as id, TaskName, StartDate, StartDatePlanned, EndDate, EndDatePlanned, 
                 DateSet, TaskDesc, ProjectID, PercentComplete, StatusUpdated, active, date, parent,
!                PercentOfParent, estimated_seconds as secs_estimated, personID, fname
          from task LEFT JOIN person_task ON task.id = person_task.taskID, people
          where

[OPT-CVS] opt/tasks/report people_task.php,1.4,1.5

From: Martin V. <mar...@us...> - 2006-09-08 20:17:29

Update of /cvsroot/outreach/opt/tasks/report
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32481/report

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


Index: people_task.php
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/report/people_task.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** people_task.php	10 Mar 2006 20:46:23 -0000	1.4
--- people_task.php	8 Sep 2006 20:17:27 -0000	1.5
***************
*** 86,90 ****
        // Person time
        echo("  <td class=\"regular\" bgcolor=\"$OPT_col_md\">\n");
!       $sql="select sec_to_time(sum(time_to_sec(worked)))
              from
                task as t,
--- 86,90 ----
        // Person time
        echo("  <td class=\"regular\" bgcolor=\"$OPT_col_md\">\n");
!       $sql="select sec_to_time(sum(worked_seconds))
              from
                task as t,
***************
*** 140,144 ****
      // Task time
      echo("  <td class=\"regular\" bgcolor=\"$OPT_col_lt\">\n");
!     $sql="select sec_to_time(sum(time_to_sec(worked))) from task_progress_history where taskID=$myrow[3]";
      $result2=CRM_run_query($sql);
      list($time)=OPT_fetch_row($result2);
--- 140,144 ----
      // Task time
      echo("  <td class=\"regular\" bgcolor=\"$OPT_col_lt\">\n");
!     $sql="select sec_to_time(sum(worked_seconds)) from task_progress_history where taskID=$myrow[3]";
      $result2=CRM_run_query($sql);
      list($time)=OPT_fetch_row($result2);

[OPT-CVS] opt/tasks/report people_time.php,1.3,1.4

From: Martin V. <mar...@us...> - 2006-09-08 20:16:58

Update of /cvsroot/outreach/opt/tasks/report
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32084/report

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


Index: people_time.php
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/report/people_time.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** people_time.php	10 Mar 2006 20:46:37 -0000	1.3
--- people_time.php	8 Sep 2006 20:16:54 -0000	1.4
***************
*** 39,43 ****
            t.PercentComplete,
            tph.progress,
!           tph.worked,
            tph.date
          from
--- 39,43 ----
            t.PercentComplete,
            tph.progress,
!           SEC_TO_TIME(tph.worked_seconds),
            tph.date
          from
***************
*** 112,116 ****
        // Person time
        echo("  <td class=\"regular\" bgcolor=\"$OPT_col_md\">\n");
!       $sql="select sec_to_time(sum(time_to_sec(worked)))
              from
                task as t,
--- 112,116 ----
        // Person time
        echo("  <td class=\"regular\" bgcolor=\"$OPT_col_md\">\n");
!       $sql="select sec_to_time(sum(worked_seconds))
              from
                task as t,

[OPT-CVS] opt/tasks/report time_task.php,1.3,1.4

From: Martin V. <mar...@us...> - 2006-09-08 20:16:33

Update of /cvsroot/outreach/opt/tasks/report
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv32047/report

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


Index: time_task.php
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/report/time_task.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** time_task.php	10 Mar 2006 20:47:00 -0000	1.3
--- time_task.php	8 Sep 2006 20:16:27 -0000	1.4
***************
*** 39,43 ****
            t.PercentComplete,
            tph.progress,
!           tph.worked,
            tph.date
          from
--- 39,43 ----
            t.PercentComplete,
            tph.progress,
!           SEC_TO_TIME(tph.worked_seconds),
            tph.date
          from

[OPT-CVS] opt/tasks/report timecard.php,1.2,1.3

From: Martin V. <mar...@us...> - 2006-09-08 20:16:00

Update of /cvsroot/outreach/opt/tasks/report
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31643/report

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


Index: timecard.php
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/report/timecard.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** timecard.php	28 Apr 2003 02:36:00 -0000	1.2
--- timecard.php	8 Sep 2006 20:15:57 -0000	1.3
***************
*** 85,89 ****
      t.taskName as taskname,
      UNIX_TIMESTAMP(tph.date) as tdate,
!     TIME_FORMAT(SEC_TO_TIME(SUM(TIME_TO_SEC(tph.worked))), '%H:%i')
    from
      task as t,
--- 85,89 ----
      t.taskName as taskname,
      UNIX_TIMESTAMP(tph.date) as tdate,
!     TIME_FORMAT(SEC_TO_TIME(SUM(tph.worked_seconds)), '%H:%i')
    from
      task as t,
***************
*** 95,99 ****
      tph.person=p.id AND
      tph.taskID=t.id  AND
!     tph.worked > 0 AND
      tph.date <= FROM_UNIXTIME($week_end) AND 
      tph.date > FROM_UNIXTIME($prev_week_end)
--- 95,99 ----
      tph.person=p.id AND
      tph.taskID=t.id  AND
!     tph.worked_seconds > 0 AND
      tph.date <= FROM_UNIXTIME($week_end) AND 
      tph.date > FROM_UNIXTIME($prev_week_end)

[OPT-CVS] opt/tasks/task add_form.inc,1.9,1.10

From: Martin V. <mar...@us...> - 2006-09-08 20:15:31

Update of /cvsroot/outreach/opt/tasks/task
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31611/task

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


Index: add_form.inc
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/task/add_form.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** add_form.inc	22 Oct 2003 18:11:41 -0000	1.9
--- add_form.inc	8 Sep 2006 20:15:28 -0000	1.10
***************
*** 17,21 ****
      if (myExp.test(str)) {
        c=parseInt(str,10) ;
!       if ((c<=840) && (c>=0)) {
          return true;
        } else {
--- 17,21 ----
      if (myExp.test(str)) {
        c=parseInt(str,10) ;
!       if ((c<=1193000) && (c>=0)) {
          return true;
        } else {
***************
*** 36,42 ****
  {
      $editing_task = 1;
!     $sql="select * from task where id=$task";
      $res=crm_run_query($sql);
      make_vars($res);
      make_main_title(__("Edit Task"),"../../images");
  
--- 36,43 ----
  {
      $editing_task = 1;
!     $sql="select *, SEC_TO_TIME(estimated_seconds) estimated_formatted from task where id=$task";
      $res=crm_run_query($sql);
      make_vars($res);
+     $estimated=$estimated_formatted;
      make_main_title(__("Edit Task"),"../../images");

[OPT-CVS] opt/tasks/task add_now.inc,1.11,1.12

From: Martin V. <mar...@us...> - 2006-09-08 20:14:42

Update of /cvsroot/outreach/opt/tasks/task
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31186/task

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


Index: add_now.inc
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/task/add_now.inc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** add_now.inc	23 Dec 2003 20:06:15 -0000	1.11
--- add_now.inc	8 Sep 2006 20:14:40 -0000	1.12
***************
*** 39,56 ****
    if($estimated) {
      $exploded_estimate=explode(":",$estimated);
!     $est_count=sizeOf($exploded_estimate);
!     $remaining=0;
!     if ($est_count==1) {
!       $remaining=intVal($estimated);
!       $estimated.=":00:00";
!     } elseif ($est_count==2) {  
!       $remaining=intVal($exploded_estimate[0]);
!       $remaining=$remaining + ($exploded_estimate[1])/60;  // will get rounded to nearest int
!       $estimated.=":00";
      }
    } else {
!     $remaining=0;
!     $estimated = "00:00:00";
    }
    $task=OPT_get_ID("task");
    $sql="INSERT INTO task
--- 39,53 ----
    if($estimated) {
      $exploded_estimate=explode(":",$estimated);
!     $estimated=0;
!     $multiplier=3600;
!     for($i=0;$i<count($exploded_estimate);$i++) {
!       $estimated+=$exploded_estimate[$i]*$multiplier;
!       $multiplier=$multiplier/60;
      }
    } else {
!     $estimated=0;
    }
+   $remaining=$estimated/3600;
+ 
    $task=OPT_get_ID("task");
    $sql="INSERT INTO task
***************
*** 66,75 ****
            parent=$parent,
            PercentOfParent=$PercentOfParent,
!           estimated='$estimated'";
    $result=crm_run_query($sql);
    // END Bertelsen
  
    // Store a history of estimates for this task (including identity of estimator)
!   $history_sql="insert into task_estimate_history (taskID, estimated, estimator) VALUES
                     ('$task', '$estimated', $CRM_user)";
    crm_run_query($history_sql);  //  Needed for graphing changes in estimate for a task
--- 63,72 ----
            parent=$parent,
            PercentOfParent=$PercentOfParent,
!           estimated_seconds='$estimated'";
    $result=crm_run_query($sql);
    // END Bertelsen
  
    // Store a history of estimates for this task (including identity of estimator)
!   $history_sql="insert into task_estimate_history (taskID, estimated_seconds, estimator) VALUES
                     ('$task', '$estimated', $CRM_user)";
    crm_run_query($history_sql);  //  Needed for graphing changes in estimate for a task
***************
*** 78,82 ****
    if ($estimated && ($remaining > 0))
    {
!         $progress_sql="insert into task_progress_history (taskID, progress, worked, remaining, person)
                         values ($task, 0, 0, $remaining, $CRM_user)";
          crm_run_query($progress_sql);  // Starting point for progress graphs
--- 75,79 ----
    if ($estimated && ($remaining > 0))
    {
!         $progress_sql="insert into task_progress_history (taskID, progress, worked_seconds, remaining, person)
                         values ($task, 0, 0, $remaining, $CRM_user)";
          crm_run_query($progress_sql);  // Starting point for progress graphs

[OPT-CVS] opt/tasks/task delete_warn.inc,1.4,1.5

From: Martin V. <mar...@us...> - 2006-09-08 20:13:50

Update of /cvsroot/outreach/opt/tasks/task
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30775/task

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


Index: delete_warn.inc
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/task/delete_warn.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** delete_warn.inc	21 May 2004 22:15:36 -0000	1.4
--- delete_warn.inc	8 Sep 2006 20:13:48 -0000	1.5
***************
*** 16,20 ****
  <?
  $task_warn_sql="select count(distinct(person)) from task_progress_history as 
!                 tph where taskID = $task and worked > 0";
  $task_warn_result=CRM_run_query($task_warn_sql);
  $task_warn_row=OPT_fetch_row($task_warn_result);
--- 16,20 ----
  <?
  $task_warn_sql="select count(distinct(person)) from task_progress_history as 
!                 tph where taskID = $task and worked_seconds > 0";
  $task_warn_result=CRM_run_query($task_warn_sql);
  $task_warn_row=OPT_fetch_row($task_warn_result);

[OPT-CVS] opt/tasks/task display.inc,1.18,1.19

From: Martin V. <mar...@us...> - 2006-09-08 20:13:18

Update of /cvsroot/outreach/opt/tasks/task
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30741/task

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


Index: display.inc
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/task/display.inc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** display.inc	3 Mar 2006 22:06:29 -0000	1.18
--- display.inc	8 Sep 2006 20:13:16 -0000	1.19
***************
*** 24,31 ****
      OPT_message(sprintf(__("%d other parent task date(s) have been altered."),$changes));
    }
!   $sql="select *, (TIME_TO_SEC(estimated)/3600*(100-PercentComplete)/100) hrs_remaining,
!                (TIME_TO_SEC(estimated)/3600) max_hrs_remaining from task where id=$task";
    $res=crm_run_query($sql);
    make_vars($res);
    list($totalcount,$affectcount,$complete,$affect,$personal,$time,$total_estimated)=compute_progress($task);
    include "$CRM_path/tasks/calculate_status.inc";
--- 24,33 ----
      OPT_message(sprintf(__("%d other parent task date(s) have been altered."),$changes));
    }
!   $sql="select *, SEC_TO_TIME(estimated_seconds) estimated_formatted,
!                   (estimated_seconds/3600*(100-PercentComplete)/100) hrs_remaining,
!                   (estimated_seconds/3600) max_hrs_remaining from task where id=$task";
    $res=crm_run_query($sql);
    make_vars($res);
+   $estimated=$estimated_formatted;
    list($totalcount,$affectcount,$complete,$affect,$personal,$time,$total_estimated)=compute_progress($task);
    include "$CRM_path/tasks/calculate_status.inc";
***************
*** 427,431 ****
    <td bgcolor="<? echo $OPT_col_lt ?>" align="left" colspan="2">
      <?
!       $sql="select sec_to_time(sum(time_to_sec(worked))) from task_progress_history where taskID=$task";
        $result=CRM_run_query($sql);
        $myrow=OPT_fetch_row($result);
--- 429,433 ----
    <td bgcolor="<? echo $OPT_col_lt ?>" align="left" colspan="2">
      <?
!       $sql="select sec_to_time(sum(worked_seconds)) from task_progress_history where taskID=$task";
        $result=CRM_run_query($sql);
        $myrow=OPT_fetch_row($result);

[OPT-CVS] opt/tasks/task estimate_bar_graph.php,1.3,1.4

From: Martin V. <mar...@us...> - 2006-09-08 20:12:44

Update of /cvsroot/outreach/opt/tasks/task
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30325/task

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


Index: estimate_bar_graph.php
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/task/estimate_bar_graph.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** estimate_bar_graph.php	6 Jul 2004 14:29:27 -0000	1.3
--- estimate_bar_graph.php	8 Sep 2006 20:12:32 -0000	1.4
***************
*** 7,11 ****
  include ("$CRM_inc/jpgraph/jpgraph_bar.php");
  
! $est_sql="select date, TIME_TO_SEC(estimated)/3600, fname, lname, task_estimate_history.id
            from task_estimate_history, people where estimator = people.id and taskID = $task";
  
--- 7,11 ----
  include ("$CRM_inc/jpgraph/jpgraph_bar.php");
  
! $est_sql="select date, estimated_seconds/3600, fname, lname, task_estimate_history.id
            from task_estimate_history, people where estimator = people.id and taskID = $task";

[OPT-CVS] opt/tasks/task mod_now.inc,1.9,1.10

From: Martin V. <mar...@us...> - 2006-09-08 20:12:00

Update of /cvsroot/outreach/opt/tasks/task
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29923/task

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


Index: mod_now.inc
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/task/mod_now.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mod_now.inc	25 Oct 2003 23:14:06 -0000	1.9
--- mod_now.inc	8 Sep 2006 20:11:58 -0000	1.10
***************
*** 43,56 ****
    }
  
!   $cur_estimate=getvalue("task", "estimated", $task);
    if($estimated) {
!     $est_count=sizeOf(explode(":",$estimated));
      if ($est_count==1) {
!       $estimated.=":00:00";
      } elseif ($est_count==2) {
!       $estimated.=":00";
      }
    } else {
!     $estimated = "00:00:00";
    }
  
--- 43,58 ----
    }
  
!   $cur_estimate=getvalue("task", "estimated_seconds", $task);
    if($estimated) {
!     $est_count=sizeOf($Xestimated=explode(":",$estimated));
      if ($est_count==1) {
!       $estimated=$Xestimated[0]*3600;
      } elseif ($est_count==2) {
!       $estimated=$Xestimated[0]*3600+$Xestimated[1]*60;
!     } else {
!       $estimated=$Xestimated[0]*3600+$Xestimated[1]*60+$Xestimated[2];
      }
    } else {
!     $estimated = 0;
    }
  
***************
*** 104,111 ****
    }
  
!   $prev_estimated=getvalue("task", "estimated", $task);
!   if ($prev_estimated != stripslashes($estimated))
    {
!      $changed_desc=$changed_desc."Estimated effort changed from $prev_estimated to $estimated\n";
    }
    
--- 106,114 ----
    }
  
!   $prev_estimated=getvalue("task", "estimated_seconds", $task);
!   // Bogdan, Feb 2006 -- ugly, needs to be converted to hh:mm at least
!   if ($prev_estimated != $estimated)
    {
!      $changed_desc=$changed_desc."Estimated effort changed from $prev_estimated to $estimated seconds\n";
    }
    
***************
*** 128,132 ****
            parent=$parent,
            PercentOfParent=$PercentOfParent,
!           estimated='$estimated',
            date=date
          WHERE
--- 131,135 ----
            parent=$parent,
            PercentOfParent=$PercentOfParent,
!           estimated_seconds=$estimated,
            date=date
          WHERE
***************
*** 145,149 ****
    if ($cur_estimate != $estimated)
    {
!     $history_sql="insert into task_estimate_history (taskID, estimated, estimator) VALUES
                     ('$task', '$estimated', $CRM_user)";
      crm_run_query($history_sql);  //  Needed for graphing changes in estimate for a task
--- 148,152 ----
    if ($cur_estimate != $estimated)
    {
!     $history_sql="insert into task_estimate_history (taskID, estimated_seconds, estimator) VALUES
                     ('$task', '$estimated', $CRM_user)";
      crm_run_query($history_sql);  //  Needed for graphing changes in estimate for a task
***************
*** 152,156 ****
      $percent_complete=getvalue("task", "PercentComplete", $task);
      $progress_sql="insert into task_progress_history set progress='$percent_complete', taskID='$task', 
!           worked='0', remaining=TIME_TO_SEC('$estimated')*(100-$percent_complete)/3600/100, person=$CRM_user";
      crm_run_query($progress_sql);   
    }
--- 155,159 ----
      $percent_complete=getvalue("task", "PercentComplete", $task);
      $progress_sql="insert into task_progress_history set progress='$percent_complete', taskID='$task', 
!           worked_seconds='0', remaining=$estimated*(100-$percent_complete)/3600/100, person=$CRM_user";
      crm_run_query($progress_sql);   
    }

[OPT-CVS] opt/tasks/task mod_status.inc,1.6,1.7

From: Martin V. <mar...@us...> - 2006-09-08 20:10:45

Update of /cvsroot/outreach/opt/tasks/task
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29514/task

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


Index: mod_status.inc
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/task/mod_status.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mod_status.inc	14 Nov 2003 21:03:25 -0000	1.6
--- mod_status.inc	8 Sep 2006 20:10:41 -0000	1.7
***************
*** 6,10 ****
  # Bogdan Stancescu <bo...@la...>, December 2001
  # Revision 1.1
!   $sql="SELECT PercentComplete, StartDate, TIME_TO_SEC(estimated) estimated_secs FROM task WHERE id=$task";
    $result=crm_run_query($sql);
    make_vars($result);
--- 6,10 ----
  # Bogdan Stancescu <bo...@la...>, December 2001
  # Revision 1.1
!   $sql="SELECT PercentComplete, StartDate, estimated_seconds estimated_secs FROM task WHERE id=$task";
    $result=crm_run_query($sql);
    make_vars($result);
***************
*** 30,39 ****
          {  // User increased the hours remaining past total estimated for this task!
             $complete = 0; // Reset to no progress
!            $sql = "update task set estimated = SEC_TO_TIME($hrs_remaining*3600) where id=$task";
             crm_run_query($sql);  // Increase the estimate to match hours remaining 
  
             // Now we must record the change in total estimate for hours
!            $sql="insert into task_estimate_history (taskID, estimated, estimator) VALUES
!                  ('$task', SEC_TO_TIME($hrs_remaining*3600), $CRM_user)";
             crm_run_query($sql);  //  Needed for graphing changes in estimate for a task
  	   
--- 30,39 ----
          {  // User increased the hours remaining past total estimated for this task!
             $complete = 0; // Reset to no progress
!            $sql = "update task set estimated_seconds = $hrs_remaining*3600 where id=$task";
             crm_run_query($sql);  // Increase the estimate to match hours remaining 
  
             // Now we must record the change in total estimate for hours
!            $sql="insert into task_estimate_history (taskID, estimated_seconds, estimator) VALUES
!                  ('$task', $hrs_remaining*3600, $CRM_user)";
             crm_run_query($sql);  //  Needed for graphing changes in estimate for a task
  	   
***************
*** 41,45 ****
  	   $percent_complete=getvalue("task", "PercentComplete", $task);
  	   $progress_sql="insert into task_progress_history set progress='$complete', taskID='$task',
!              worked='0', remaining=$hrs_remaining*(100-$complete)/100, person=$CRM_user";
  	   crm_run_query($progress_sql);
          }
--- 41,45 ----
  	   $percent_complete=getvalue("task", "PercentComplete", $task);
  	   $progress_sql="insert into task_progress_history set progress='$complete', taskID='$task',
!              worked_seconds='0', remaining=$hrs_remaining*(100-$complete)/100, person=$CRM_user";
  	   crm_run_query($progress_sql);
          }
***************
*** 95,99 ****
      }
      $sql="insert into task_progress_history set progress='$complete', taskID='$task', 
!           worked='$worked', remaining='$hrs_remaining', person=$CRM_user";
      crm_run_query($sql);
    }
--- 95,99 ----
      }
      $sql="insert into task_progress_history set progress='$complete', taskID='$task', 
!           worked_seconds=TIME_TO_SEC('$worked'), remaining='$hrs_remaining', person=$CRM_user";
      crm_run_query($sql);
    }

[OPT-CVS] opt/tasks/task progress.inc,1.4,1.5

From: Martin V. <mar...@us...> - 2006-09-08 20:09:57

Update of /cvsroot/outreach/opt/tasks/task
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29093/task

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


Index: progress.inc
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/task/progress.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** progress.inc	18 Mar 2006 09:43:51 -0000	1.4
--- progress.inc	8 Sep 2006 20:09:55 -0000	1.5
***************
*** 22,29 ****
  
  <?
! $sql="select p.id, p.fname, p.lname, tph.date, tph.workfrom, tph.workto, tph.worked, tph.comment
        from task as t, task_progress_history as tph, people as p
        where t.projectID=$proj AND t.active=1 AND tph.taskID=t.id AND tph.person=p.id
!       and tph.taskID = $task and tph.worked > 0 order by tph.date";
  
  $result=CRM_run_query($sql);
--- 22,31 ----
  
  <?
! $sql="select p.id, p.fname, p.lname, tph.date, 
!              date_format(tph.workfrom, \"%b %d %Y, %H:%i\"), date_format(tph.workto, \"%b %d %Y, %H:%i\"), 
!              SEC_TO_TIME(tph.worked_seconds), tph.comment
        from task as t, task_progress_history as tph, people as p
        where t.projectID=$proj AND t.active=1 AND tph.taskID=t.id AND tph.person=p.id
!       and tph.taskID = $task and tph.worked_seconds > 0 order by tph.date";
  
  $result=CRM_run_query($sql);
***************
*** 74,78 ****
        if ($myrow[4])
        {
!           echo(makeNiceTime($myrow[4])." - ".makeNiceTime($myrow[5]));
        }
        else
--- 76,80 ----
        if ($myrow[4])
        {
!           echo($myrow[4]." - ".$myrow[5]);
        }
        else

[OPT-CVS] opt/tasks/task task_lib.php,1.8,1.9

From: Martin V. <mar...@us...> - 2006-09-08 20:09:23

Update of /cvsroot/outreach/opt/tasks/task
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv29053/task

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


Index: task_lib.php
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/task/task_lib.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** task_lib.php	6 Mar 2006 20:14:09 -0000	1.8
--- task_lib.php	8 Sep 2006 20:09:21 -0000	1.9
***************
*** 153,157 ****
  
    if ($task) {
!     $sql="select id, PercentComplete, PercentOfParent, time_to_sec(estimated) from task where id=$task";
      $result=CRM_run_query($sql);
      $myrow=OPT_fetch_row($result);
--- 153,157 ----
  
    if ($task) {
!     $sql="select id, PercentComplete, PercentOfParent, estimated_seconds from task where id=$task";
      $result=CRM_run_query($sql);
      $myrow=OPT_fetch_row($result);
***************
*** 161,165 ****
  		$affect=0;
  	}
! 	$sql="select sum(time_to_sec(worked)) from task_progress_history where taskID=$task";
      list($loctime)=OPT_fetch_row(CRM_run_query($sql));
      $time+=$loctime;
--- 161,165 ----
  		$affect=0;
  	}
! 	$sql="select sum(worked_seconds) from task_progress_history where taskID=$task";
      list($loctime)=OPT_fetch_row(CRM_run_query($sql));
      $time+=$loctime;

[OPT-CVS] opt/tasks/task_search full_search_filter.inc,1.2,1.3

From: Martin V. <mar...@us...> - 2006-09-08 20:08:31

Update of /cvsroot/outreach/opt/tasks/task_search
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28659/task_search

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


Index: full_search_filter.inc
===================================================================
RCS file: /cvsroot/outreach/opt/tasks/task_search/full_search_filter.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** full_search_filter.inc	6 Jul 2004 14:29:27 -0000	1.2
--- full_search_filter.inc	8 Sep 2006 20:08:30 -0000	1.3
***************
*** 204,208 ****
      $estimate_low = 3600 * floatval($estimate_low);
      $estimate_high = 3600 * floatval($estimate_high);
!     $filter_components[] = "((TIME_TO_SEC(estimated) >= $estimate_low) AND ((TIME_TO_SEC(estimated) <= $estimate_high)))";
  }
  if (strlen($worked_low) && (strlen($worked_high)))
--- 204,208 ----
      $estimate_low = 3600 * floatval($estimate_low);
      $estimate_high = 3600 * floatval($estimate_high);
!     $filter_components[] = "((estimated_seconds >= $estimate_low) AND ((estimated_seconds <= $estimate_high)))";
  }
  if (strlen($worked_low) && (strlen($worked_high)))
***************
*** 210,214 ****
      $worked_low = 3600 * floatval($worked_low);
      $worked_high = 3600 * floatval($worked_high);
!     $sql="select taskID, sum(TIME_TO_SEC(worked)) as worked_secs from task_progress_history group by taskID";
      $result = crm_run_query($sql);
      while ($row = OPT_fetch_row($result))
--- 210,214 ----
      $worked_low = 3600 * floatval($worked_low);
      $worked_high = 3600 * floatval($worked_high);
!     $sql="select taskID, sum(worked_seconds) as worked_secs from task_progress_history group by taskID";
      $result = crm_run_query($sql);
      while ($row = OPT_fetch_row($result))
***************
*** 232,236 ****
      $remaining_low = 3600 * floatval($remaining_low);
      $remaining_high = 3600 * floatval($remaining_high);
!     $filter_components[] = "(((TIME_TO_SEC(estimated)*(100-PercentComplete)/100) >= $remaining_low) AND ((TIME_TO_SEC(estimated)*(100-PercentComplete)/100) <= $remaining_high))";
  }
  if (strlen($complete_low) && (strlen($complete_high)))
--- 232,236 ----
      $remaining_low = 3600 * floatval($remaining_low);
      $remaining_high = 3600 * floatval($remaining_high);
!     $filter_components[] = "(((estimated_seconds*(100-PercentComplete)/100) >= $remaining_low) AND ((estimated_seconds*(100-PercentComplete)/100) <= $remaining_high))";
  }
  if (strlen($complete_low) && (strlen($complete_high)))
***************
*** 361,363 ****
  
  
! ?>
\ No newline at end of file
--- 361,363 ----
  
  
! ?>

[OPT-CVS] opt/rt/reports/progress index.php,1.8,1.9

From: Martin V. <mar...@us...> - 2006-09-08 20:07:17

Update of /cvsroot/outreach/opt/rt/reports/progress
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28244/reports/progress

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


Index: index.php
===================================================================
RCS file: /cvsroot/outreach/opt/rt/reports/progress/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** index.php	11 Mar 2006 16:39:01 -0000	1.8
--- index.php	8 Sep 2006 20:07:15 -0000	1.9
***************
*** 380,384 ****
      if ($task_ids) {
          // Now determine total hrs worked a week ago
!         $sql="select sum(TIME_TO_SEC(worked)/3600) from task_progress_history where taskID IN (".implode(", ", $task_ids).
              ") and UNIX_TIMESTAMP(date) < $week_earlier";
          $result=CRM_run_query($sql);
--- 380,384 ----
      if ($task_ids) {
          // Now determine total hrs worked a week ago
!         $sql="select sum(worked_seconds)/3600) from task_progress_history where taskID IN (".implode(", ", $task_ids).
              ") and UNIX_TIMESTAMP(date) < $week_earlier";
          $result=CRM_run_query($sql);
***************
*** 393,397 ****
          }
          // Now determine total hrs worked as of this week
!         $sql="select sum(TIME_TO_SEC(worked)/3600) from task_progress_history where taskID IN (".implode(", ", $task_ids).
              ") and UNIX_TIMESTAMP(date) < $end_date";
          $result=CRM_run_query($sql);
--- 393,397 ----
          }
          // Now determine total hrs worked as of this week
!         $sql="select sum(worked_seconds)/3600) from task_progress_history where taskID IN (".implode(", ", $task_ids).
              ") and UNIX_TIMESTAMP(date) < $end_date";
          $result=CRM_run_query($sql);
***************
*** 446,450 ****
      if ((sizeOf($task_ids) == 0) && ($week_earlier >= $created_date)  && ($status != 2))
      {
!        $last_week=intVal(getvalue("requests", "TIME_TO_SEC(initial_estimate)/3600",$req));
         $using_request_estimate_for_last_week = 1;
      }  
--- 446,450 ----
      if ((sizeOf($task_ids) == 0) && ($week_earlier >= $created_date)  && ($status != 2))
      {
!        $last_week=intVal(getvalue("requests", "initial_estimate_seconds/3600",$req));
         $using_request_estimate_for_last_week = 1;
      }  
***************
*** 469,473 ****
      if ((sizeOf($task_ids) == 0) && ($end_date >= $created_date) && ($status != 2))
      {
!         $this_week=intVal(getvalue("requests", "TIME_TO_SEC(initial_estimate)/3600",$req));
          $using_request_estimate_for_this_week = 1;  
      } 
--- 469,473 ----
      if ((sizeOf($task_ids) == 0) && ($end_date >= $created_date) && ($status != 2))
      {
!         $this_week=intVal(getvalue("requests", "initial_estimate_seconds/3600",$req));
          $using_request_estimate_for_this_week = 1;  
      }

[OPT-CVS] opt/rt/req_create index.php,1.8,1.9

From: Martin V. <mar...@us...> - 2006-09-08 20:06:41

Update of /cvsroot/outreach/opt/rt/req_create
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27850/req_create

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


Index: index.php
===================================================================
RCS file: /cvsroot/outreach/opt/rt/req_create/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** index.php	11 Mar 2006 16:39:01 -0000	1.8
--- index.php	8 Sep 2006 20:06:39 -0000	1.9
***************
*** 304,308 ****
      if ($req && !$pass_thru_initial_estimate)
      {
!       $initial_estimate=makeNiceTime(getvalue("requests", "initial_estimate", $req, ''));
      }
      else if ($pass_thru_initial_estimate)
--- 304,308 ----
      if ($req && !$pass_thru_initial_estimate)
      {
!       $initial_estimate=makeNiceTime(getvalue("requests", "SEC_TO_TIME(initial_estimate_seconds)", $req, ''));
      }
      else if ($pass_thru_initial_estimate)

[OPT-CVS] opt/rt/req_delete index.php,1.7,1.8

From: Martin V. <mar...@us...> - 2006-09-08 20:06:15

Update of /cvsroot/outreach/opt/rt/req_delete
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27806/req_delete

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


Index: index.php
===================================================================
RCS file: /cvsroot/outreach/opt/rt/req_delete/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.php	11 Mar 2006 16:39:01 -0000	1.7
--- index.php	8 Sep 2006 20:06:11 -0000	1.8
***************
*** 128,132 ****
    for ($i=0; $i<sizeof($task_id); $i++)
    {
!     $sql = "SELECT count(*) from task_progress_history WHERE taskID=$task_id[$i] AND worked>0";
      $count_query_run = CRM_run_query($sql);
      $count_query = OPT_fetch_row($count_query_run);
--- 128,132 ----
    for ($i=0; $i<sizeof($task_id); $i++)
    {
!     $sql = "SELECT count(*) from task_progress_history WHERE taskID=$task_id[$i] AND worked_seconds>0";
      $count_query_run = CRM_run_query($sql);
      $count_query = OPT_fetch_row($count_query_run);
***************
*** 225,229 ****
    for ($i=0; $i<sizeof($task_id); $i++)
    {
!     $sql = "SELECT count(*) from task_progress_history WHERE taskID=$task_id[$i] AND worked>0";
      $count_query_run = CRM_run_query($sql);
      $count_query = OPT_fetch_row($count_query_run);
--- 225,229 ----
    for ($i=0; $i<sizeof($task_id); $i++)
    {
!     $sql = "SELECT count(*) from task_progress_history WHERE taskID=$task_id[$i] AND worked_seconds>0";
      $count_query_run = CRM_run_query($sql);
      $count_query = OPT_fetch_row($count_query_run);

[OPT-CVS] opt/rt/req_list index.php,1.20,1.21

From: Martin V. <mar...@us...> - 2006-09-08 20:05:43

Update of /cvsroot/outreach/opt/rt/req_list
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27431/req_list

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


Index: index.php
===================================================================
RCS file: /cvsroot/outreach/opt/rt/req_list/index.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** index.php	11 Mar 2006 16:39:01 -0000	1.20
--- index.php	8 Sep 2006 20:05:40 -0000	1.21
***************
*** 1071,1075 ****
    if ($show_hours_column == "1")
    {
!     $hrs_remaining=getvalue("requests", "TIME_TO_SEC(initial_estimate)/3600", $myrow["id"]);
      if (intval($hrs_remaining) == 0)
      {
--- 1071,1075 ----
    if ($show_hours_column == "1")
    {
!     $hrs_remaining=getvalue("requests", "initial_estimate_seconds/3600", $myrow["id"]);
      if (intval($hrs_remaining) == 0)
      {
***************
*** 1080,1084 ****
        $hrs_remaining=sprintf("%.0f", $hrs_remaining);
      }
!     $sql="select count(*), sum(TIME_TO_SEC(estimated)/3600 * (100-PercentComplete)/100) from
            task, request2task where request2task.request = ".$myrow["id"]." and request2task.task = task.id";
      $task_hrs_res=CRM_run_query($sql);
--- 1080,1084 ----
        $hrs_remaining=sprintf("%.0f", $hrs_remaining);
      }
!     $sql="select count(*), sum(estimated_seconds/3600 * (100-PercentComplete)/100) from
            task, request2task where request2task.request = ".$myrow["id"]." and request2task.task = task.id";
      $task_hrs_res=CRM_run_query($sql);

2 messages has been excluded from this view by a project administrator.

Flat | Threaded

1 2 3 .. 45 > >> (Page 1 of 45)

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (131)	Sep	Oct (5)	Nov	Dec
2003	Jan	Feb	Mar	Apr (114)	May (105)	Jun (46)	Jul (5)	Aug (86)	Sep (19)	Oct (333)	Nov (10)	Dec (14)
2004	Jan (22)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (5)	Nov (2)	Dec (10)
2005	Jan (9)	Feb (2)	Mar	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2006	Jan	Feb	Mar (160)	Apr	May	Jun	Jul	Aug (1)	Sep (40)	Oct	Nov	Dec
2007	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec