[Phpgroupware-cvs] projects/inc class.soprojects.inc.php, 1.50, 1.51 class.sostatistics.inc.php, 1.10, 1.11 class.uistatistics.inc.php, 1.23, 1.24

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv7342/inc

Modified Files:
        class.soprojects.inc.php class.sostatistics.inc.php 
        class.uistatistics.inc.php 
Log Message:
update

Index: class.uistatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** class.uistatistics.inc.php  25 Nov 2003 15:34:35 -0000      1.23
--- class.uistatistics.inc.php  27 Nov 2003 18:41:55 -0000      1.24
***************
*** 189,193 ****
                }
  
- 
                function list_projects()
                {
--- 189,192 ----
***************
*** 335,353 ****
                        }
                        return $coordinator_list;
-               }
- 
-               function status_format($status = '')
-               {
-                       switch ($status)
-                       {
-                               case 'active':          $stat_sel[0]=' 
selected'; break;
-                               case 'nonactive':       $stat_sel[1]=' 
selected'; break;
-                               case 'archive':         $stat_sel[2]=' 
selected'; break;
-                       }
- 
-                       $status_list = '<option value="active"' . $stat_sel[0] 
. '>' . lang('Active') . '</option>' . "\n"
-                                               . '<option value="nonactive"' . 
$stat_sel[1] . '>' . lang('Nonactive') . '</option>' . "\n"
-                                               . '<option value="archive"' . 
$stat_sel[2] . '>' . lang('Archive') . '</option>' . "\n";
-                       return $status_list;
                }
  
--- 334,337 ----

Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** class.soprojects.inc.php    21 Nov 2003 21:32:25 -0000      1.50
--- class.soprojects.inc.php    27 Nov 2003 18:41:55 -0000      1.51
***************
*** 766,770 ****
                                        {
                                                $bla = 
$GLOBALS['phpgw']->strip_html($this->db->f('title')) . ' ['
!                                                               . 
$GLOBALS['phpgw']->strip_html($this->db->f('num')) . ']';
                                        }
                                        else
--- 766,770 ----
                                        {
                                                $bla = 
$GLOBALS['phpgw']->strip_html($this->db->f('title')) . ' ['
!                                                               . 
$GLOBALS['phpgw']->strip_html($this->db->f('p_number')) . ']';
                                        }
                                        else

Index: class.sostatistics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.sostatistics.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** class.sostatistics.inc.php  10 Sep 2003 00:28:57 -0000      1.10
--- class.sostatistics.inc.php  27 Nov 2003 18:41:55 -0000      1.11
***************
*** 77,82 ****
                        }
  
!                       $this->db->query('SELECT title,num,phpgw_p_projects.id 
as id FROM phpgw_p_projects' . $join . 'phpgw_p_hours ON '
!                                                       . 
'phpgw_p_hours.employee=' . $account_id . ' GROUP BY 
title,num,phpgw_p_projects.id',__LINE__,__FILE__);
  
                        while ($this->db->next_record())
--- 77,82 ----
                        }
  
!                       $this->db->query('SELECT 
title,p_number,phpgw_p_projects.id as id FROM phpgw_p_projects' . $join . 
'phpgw_p_hours ON '
!                                                       . 
'phpgw_p_hours.employee=' . $account_id . ' GROUP BY 
title,p_number,phpgw_p_projects.id',__LINE__,__FILE__);
  
                        while ($this->db->next_record())
***************
*** 85,89 ****
                                (
                                        'project_id'    => $this->db->f('id'),
!                                       'num'                   => 
$this->db->f('num'),
                                        'title'                 => 
$this->db->f('title')
                                );
--- 85,89 ----
                                (
                                        'project_id'    => $this->db->f('id'),
!                                       'num'                   => 
$this->db->f('p_number'),
                                        'title'                 => 
$this->db->f('title')
                                );
***************
*** 103,109 ****
                        }
  
!                       $this->db->query('SELECT SUM(minutes) as min,num,descr 
FROM phpgw_p_hours,phpgw_p_activities ' . $idfilter
                                                        . ' AND 
phpgw_p_hours.activity_id=phpgw_p_activities.id' . $this->stat_filter($values)
!                                                       . ' GROUP BY 
phpgw_p_activities.descr,phpgw_p_activities.num',__LINE__,__FILE__);
  
                        while ($this->db->next_record())
--- 103,109 ----
                        }
  
!                       $this->db->query('SELECT SUM(minutes) as 
min,a_number,descr FROM phpgw_p_hours,phpgw_p_activities ' . $idfilter
                                                        . ' AND 
phpgw_p_hours.activity_id=phpgw_p_activities.id' . $this->stat_filter($values)
!                                                       . ' GROUP BY 
phpgw_p_activities.descr,phpgw_p_activities.a_number',__LINE__,__FILE__);
  
                        while ($this->db->next_record())
***************
*** 113,117 ****
                                        'min'   => $this->db->f('min'),
                                        'descr' => $this->db->f('descr'),
!                                       'num'   => $this->db->f('num')
                                );
                        }
--- 113,117 ----
                                        'min'   => $this->db->f('min'),
                                        'descr' => $this->db->f('descr'),
!                                       'num'   => $this->db->f('a_number')
                                );
                        }