[eGroupWare-cvs] projects/inc class.soprojects.inc.php,1.42.2.12,1.42.2.13

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

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

Modified Files:
      Tag: phpgw_head
	class.soprojects.inc.php 
Log Message:
cvs-sync: 2003/12/23 16:34:00, uid65887:
update


Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/egroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.42.2.12
retrieving revision 1.42.2.13
diff -C2 -d -r1.42.2.12 -r1.42.2.13
*** class.soprojects.inc.php	14 Mar 2004 23:56:31 -0000	1.42.2.12
--- class.soprojects.inc.php	14 Mar 2004 23:56:43 -0000	1.42.2.13
***************
*** 78,116 ****
  		}
  
! 		function db2projects()
  		{
  			while ($this->db->next_record())
  			{
! 				$projects[] = array
! 				(
! 					'project_id'	=> $this->db->f('id'),
! 					'parent'		=> $this->db->f('parent'),
! 					'number'		=> $this->db->f('p_number'),
! 					'access'		=> $this->db->f('access'),
! 					'cat'			=> $this->db->f('category'),
! 					'sdate'			=> $this->db->f('start_date'),
! 					'edate'			=> $this->db->f('end_date'),
! 					'coordinator'	=> $this->db->f('coordinator'),
! 					'customer'		=> $this->db->f('customer'),
! 					'status'		=> $this->db->f('status'),
! 					'descr'			=> $this->db->f('descr'),
! 					'title'			=> $this->db->f('title'),
! 					'budget'		=> $this->db->f('budget'),
! 					'ptime'			=> $this->db->f('time_planned'),
! 					'owner'			=> $this->db->f('owner'),
! 					'cdate'			=> $this->db->f('date_created'),
! 					'processor'		=> $this->db->f('processor'),
! 					'udate'			=> $this->db->f('entry_date'),
! 					'investment_nr'	=> $this->db->f('investment_nr'),
! 					'pcosts'		=> $this->db->f('pcosts'),
! 					'main'			=> $this->db->f('main'),
! 					'level'			=> $this->db->f('level'),
! 					'previous'		=> $this->db->f('previous')
! 				);
  			}
  			return $projects;
  		}
  
- 
  		function read_projects($values)
  		{
--- 78,124 ----
  		}
  
! 		function db2projects($column = False)
  		{
+ 			$i = 0;
  			while ($this->db->next_record())
  			{
! 				if($column)
! 				{
! 					$projects[$i] = $this->db->f(0);
! 					$i++;
! 				}
! 				else
! 				{
! 					$projects[] = array
! 					(
! 						'project_id'	=> $this->db->f('id'),
! 						'parent'		=> $this->db->f('parent'),
! 						'number'		=> $this->db->f('p_number'),
! 						'access'		=> $this->db->f('access'),
! 						'cat'			=> $this->db->f('category'),
! 						'sdate'			=> $this->db->f('start_date'),
! 						'edate'			=> $this->db->f('end_date'),
! 						'coordinator'	=> $this->db->f('coordinator'),
! 						'customer'		=> $this->db->f('customer'),
! 						'status'		=> $this->db->f('status'),
! 						'descr'			=> $this->db->f('descr'),
! 						'title'			=> $this->db->f('title'),
! 						'budget'		=> $this->db->f('budget'),
! 						'ptime'			=> $this->db->f('time_planned'),
! 						'owner'			=> $this->db->f('owner'),
! 						'cdate'			=> $this->db->f('date_created'),
! 						'processor'		=> $this->db->f('processor'),
! 						'udate'			=> $this->db->f('entry_date'),
! 						'investment_nr'	=> $this->db->f('investment_nr'),
! 						'pcosts'		=> $this->db->f('pcosts'),
! 						'main'			=> $this->db->f('main'),
! 						'level'			=> $this->db->f('level'),
! 						'previous'		=> $this->db->f('previous')
! 					);
! 				}
  			}
  			return $projects;
  		}
  
  		function read_projects($values)
  		{
***************
*** 120,124 ****
  			$sort	= (isset($values['sort'])?$values['sort']:'ASC');
  			$order	= $values['order'];
! 			$status	= $values['status'];
  			$type	= (isset($values['type'])?$values['type']:'mains');
  
--- 128,132 ----
  			$sort	= (isset($values['sort'])?$values['sort']:'ASC');
  			$order	= $values['order'];
! 			$status	= isset($values['status'])?$values['status']:'active';
  			$type	= (isset($values['type'])?$values['type']:'mains');
  
***************
*** 126,129 ****
--- 134,138 ----
  			$main	= intval($values['main']);
  			$parent	= intval($values['parent']);
+ 			$column	= (isset($values['column'])?$values['column']:False);
  
  			$query	= $this->db->db_addslashes($values['query']);
***************
*** 149,153 ****
  			if ($filter == 'none')
  			{
! 				if ($this->isprojectadmin('pad') || $this->isbookkeeper('pbo'))
  				{
  					$filtermethod = " ( access != 'private' OR coordinator = " . $this->account . ' )';
--- 158,162 ----
  			if ($filter == 'none')
  			{
! 				if ($this->isprojectadmin())
  				{
  					$filtermethod = " ( access != 'private' OR coordinator = " . $this->account . ' )';
***************
*** 207,213 ****
  			}
  
! 			$sql = "SELECT * from phpgw_p_projects WHERE $filtermethod $statussort $querymethod";
  
  			$this->db2->query($sql . $parent_select,__LINE__,__FILE__);
  			$total = $this->db2->num_rows();
  
--- 216,227 ----
  			}
  
! 			$column_select = ((is_string($column) && $column != '')?$column:'*');
! 
! 			$sql = "SELECT $column_select from phpgw_p_projects WHERE $filtermethod $statussort $querymethod";
  
  			$this->db2->query($sql . $parent_select,__LINE__,__FILE__);
+ 
+ 			//echo $sql . $parent_select;
+ 
  			$total = $this->db2->num_rows();
  
***************
*** 221,225 ****
  			}
  
! 			$pro = $this->db2projects();
  
  			if ($main == 0 && $type != 'mains' && $type != 'amains')
--- 235,239 ----
  			}
  
! 			$pro = $this->db2projects($column);
  
  			if ($main == 0 && $type != 'mains' && $type != 'amains')
***************
*** 327,331 ****
  			$values['pcosts']			= $values['pcosts'] + 0.0;
  
! 			if ($values['parent'] && $values['parent'] != 0)
  			{
  				$values['main']		= intval($this->id2item(array('project_id' => $values['parent'],'item' => 'main')));
--- 341,347 ----
  			$values['pcosts']			= $values['pcosts'] + 0.0;
  
! 			$values['parent']			= intval($values['parent']);
! 
! 			if ($values['parent'] > 0)
  			{
  				$values['main']		= intval($this->id2item(array('project_id' => $values['parent'],'item' => 'main')));
***************
*** 341,345 ****
  							. intval($values['edate']) . ',' . intval($values['coordinator']) . ',' . intval($values['customer']) . ",'" . $values['status']
  							. "','" . $values['descr'] . "','" . $values['title'] . "'," . $values['budget'] . ",'" . $values['number'] . "',"
! 							. intval($values['parent']) . ',' . intval($values['ptime']) . ',' . time() . ',' . $this->account . ",'" . $values['investment_nr']
  							. "'," . $values['pcosts'] . ',' . intval($values['main']) . ',' . intval($values['level']) . ',' . intval($values['previous']) . ')',__LINE__,__FILE__);
  
--- 357,361 ----
  							. intval($values['edate']) . ',' . intval($values['coordinator']) . ',' . intval($values['customer']) . ",'" . $values['status']
  							. "','" . $values['descr'] . "','" . $values['title'] . "'," . $values['budget'] . ",'" . $values['number'] . "',"
! 							. $values['parent'] . ',' . intval($values['ptime']) . ',' . time() . ',' . $this->account . ",'" . $values['investment_nr']
  							. "'," . $values['pcosts'] . ',' . intval($values['main']) . ',' . intval($values['level']) . ',' . intval($values['previous']) . ')',__LINE__,__FILE__);
  
***************
*** 349,353 ****
  			if ($p_id && ($p_id != 0))
  			{
! 				if (!$values['parent'] || $values['parent'] == 0)
  				{
  					$this->db->query('UPDATE phpgw_p_projects SET main=' . $p_id . ' WHERE id=' . $p_id,__LINE__,__FILE__);
--- 365,369 ----
  			if ($p_id && ($p_id != 0))
  			{
! 				if ($values['parent'] == 0)
  				{
  					$this->db->query('UPDATE phpgw_p_projects SET main=' . $p_id . ' WHERE id=' . $p_id,__LINE__,__FILE__);
***************
*** 448,451 ****
--- 464,469 ----
  		function edit_project($values, $book_activities = 0, $bill_activities = 0)
  		{
+ 			$values['project_id'] = intval($values['project_id']);
+ 
  			if (is_array($book_activities))
  			{
***************
*** 476,480 ****
  			$values['number']			= $this->db->db_addslashes($values['number']);
  			$values['investment_nr']	= $this->db->db_addslashes($values['investment_nr']);
! 			$values['project_id']		= intval($values['project_id']);
  			$values['parent']			= intval($values['parent']);
  
--- 494,498 ----
  			$values['number']			= $this->db->db_addslashes($values['number']);
  			$values['investment_nr']	= $this->db->db_addslashes($values['investment_nr']);
! 
  			$values['parent']			= intval($values['parent']);
  
***************
*** 493,496 ****
--- 511,518 ----
  					$values['level']	= intval($this->id2item(array('project_id' => $values['parent'],'item' => 'level'))+1);
  				}
+ 				else
+ 				{
+ 					$values['main'] = $values['project_id'];
+ 				}
  			}
  
***************
*** 500,504 ****
  							. $values['descr'] . "', title='" . $values['title'] . "', budget=" . $values['budget'] . ", p_number='"
  							. $values['number'] . "', time_planned=" . intval($values['ptime']) . ', processor=' . $this->account . ", investment_nr='"
! 							. $values['investment_nr'] . "', pcosts=" . $values['pcosts'] . ', parent=' . $values['parent']
  							. ', level=' . intval($values['level']) . ', previous=' . intval($values['previous']) . ' where id=' . $values['project_id'],__LINE__,__FILE__);
  
--- 522,526 ----
  							. $values['descr'] . "', title='" . $values['title'] . "', budget=" . $values['budget'] . ", p_number='"
  							. $values['number'] . "', time_planned=" . intval($values['ptime']) . ', processor=' . $this->account . ", investment_nr='"
! 							. $values['investment_nr'] . "', pcosts=" . $values['pcosts'] . ', parent=' . $values['parent'] . ', main=' . intval($values['main'])
  							. ', level=' . intval($values['level']) . ', previous=' . intval($values['previous']) . ' where id=' . $values['project_id'],__LINE__,__FILE__);
  
***************
*** 944,950 ****
  		function create_jobid($pro_parent)
  		{
  			$this->db->query('select p_number from phpgw_p_projects where id=' . $pro_parent);
  			$this->db->next_record();
! 			$prefix = $this->db->f('num') . '/';
  
  			$this->db->query("select max(p_number) from phpgw_p_projects where p_number like ('$prefix%')");
--- 966,979 ----
  		function create_jobid($pro_parent)
  		{
+ 			/*$parent_level = $this->id2item(array('project_id' => $pro_parent, 'item' => 'level'));
+ 			switch($parent_level)
+ 			{
+ 				case 0:		$add = ' / '; break;
+ 				default:	$add = ''; break;
+ 			}*/
+ 
  			$this->db->query('select p_number from phpgw_p_projects where id=' . $pro_parent);
  			$this->db->next_record();
! 			$prefix = $this->db->f('p_number') . '/';
  
  			$this->db->query("select max(p_number) from phpgw_p_projects where p_number like ('$prefix%')");