[eGroupWare-cvs] projects/inc class.soprojects.inc.php,1.42.2.22,1.42.2.23

[<cvs...@us...>]

Update of /cvsroot/egroupware/projects/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24528/inc

Modified Files:
      Tag: phpgw_head
	class.soprojects.inc.php 
Log Message:
cvs-sync: 2004/01/26 16:54:58, ceb:
update


Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/egroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.42.2.22
retrieving revision 1.42.2.23
diff -C2 -d -r1.42.2.22 -r1.42.2.23
*** class.soprojects.inc.php	14 Mar 2004 23:59:03 -0000	1.42.2.22
--- class.soprojects.inc.php	14 Mar 2004 23:59:14 -0000	1.42.2.23
***************
*** 31,34 ****
--- 31,35 ----
  		var $db;
  		var $grants;
+ 		var $column_array;
  
  		function soprojects()
***************
*** 42,45 ****
--- 43,47 ----
  			$this->member	= $this->get_acl_projects();
  			$this->soconfig	= CreateObject('projects.soconfig');
+ 			$this->column_array = array();
  		}
  
***************
*** 62,66 ****
  				if($column)
  				{
! 					$projects[$i] = $this->db->f(0);
  					$i++;
  				}
--- 64,72 ----
  				if($column)
  				{
! 					$projects[$i] = array();
! 					for($k=0;$k<count($this->column_array);$k++)
! 					{
! 						$projects[$i][$this->column_array[$k]] = $this->db->f($this->column_array[$k]);
! 					}
  					$i++;
  				}
***************
*** 115,118 ****
--- 121,125 ----
  			$order	= $values['order']?$values['order']:'start_date';
  			$status	= isset($values['status'])?$values['status']:'active';
+ 			$action	= (isset($values['action'])?$values['action']:'mains');
  			$type	= (isset($values['type'])?$values['type']:'mains');
  
***************
*** 180,184 ****
  			}
  
! 			switch($type)
  			{
  				case 'all':
--- 187,196 ----
  			}
  
! 			if(!$action && $ype)
! 			{
! 				$action = $type;
! 			}
! 
! 			switch($action)
  			{
  				case 'all':
***************
*** 194,197 ****
--- 206,210 ----
  
  			$column_select = ((is_string($column) && $column != '')?$column:'*');
+ 			$this->column_array = explode(',',$column);
  
  			$sql = "SELECT $column_select from phpgw_p_projects WHERE $filtermethod $statussort $querymethod";
***************
*** 941,947 ****
  		}
  
! 		function sum_budget($action = 'budget')
  		{
! 			$this->db->query('SELECT SUM(' . $action . ") as sumvalue from phpgw_p_projects where ( parent=0 AND status!='archive' )",__LINE__,__FILE__);
  			if ($this->db->next_record())
  			{
--- 954,985 ----
  		}
  
! 
! // -------- SUM BUDGET ---------------
! 
! 		function sum_budget($values)
  		{
! 			$action		= $values['action']?$values['action']:'mains';
! 			$bcolumn	= $values['bcolumn']?$values['bcolumn']:'budget';
! 			$project_id	= intval($values['project_id']);
! 
! 			$values['column'] = 'id,level';
! 
! 			$projects = $this->read_projects($values);
! 
! 			//_debug_array($projects);
! 
! 			$pro = array();
! 			for($i=0;$i<count($projects);$i++)
! 			{
! 				$pro[$i] = $projects[$i]['id'];
! 			}
! 
! 			if(count($pro) == 0)
! 			{
! 				$pro[0] = 0;
! 			}
! 
! 			$sql = 'SELECT SUM(' . $bcolumn . ') as sumvalue from phpgw_p_projects where id in(' . implode(',',$pro) . ')';
! 			$this->db->query($sql,__LINE__,__FILE__);
  			if ($this->db->next_record())
  			{