[Phpgroupware-cvs] projects/inc/class.boprojects.inc.php, 1.139

[nomail]

Update of /projects/inc
Modified Files:
        Branch: 
          class.boprojects.inc.php

date: 2004/06/17 14:23:14;  author: ceb;  state: Exp;  lines: +17 -5

Log Message:
update
=====================================================================
Index: projects/inc/class.boprojects.inc.php
diff -u projects/inc/class.boprojects.inc.php:1.138 
projects/inc/class.boprojects.inc.php:1.139
--- projects/inc/class.boprojects.inc.php:1.138 Wed Jun  9 23:25:39 2004
+++ projects/inc/class.boprojects.inc.php       Thu Jun 17 14:23:14 2004
@@ -352,8 +352,8 @@
                                'year'          => 
$GLOBALS['phpgw']->common->show_date(time(),'Y')
                        );
 
-                       $date['daydate']                = 
mktime(2,0,0,$date['month'],$date['day'],$date['year']);
-                       $date['monthdate']              = 
mktime(2,0,0,$date['month']+2,0,$date['year']);
+                       $date['daydate']                = 
mktime(12,0,0,$date['month'],$date['day'],$date['year']);
+                       $date['monthdate']              = 
mktime(12,0,0,$date['month']+2,0,$date['year']);
                        $date['monthformatted'] = 
$GLOBALS['phpgw']->common->show_date($date['monthdate'],'n/Y');
                        return $date;
                }
@@ -464,6 +464,10 @@
                                        $i = count($emps);
                                        $emps[$i] = $co;
                                }
+                               else
+                               {
+                                       $emps[0] = $co;
+                               }
                        }
 
                        //_debug_array($emps);
@@ -473,12 +477,20 @@
                                $this->accounts = 
CreateObject('phpgwapi.accounts',$emps[$i]);
                                $this->accounts->read_repository();
 
+                               if($data['roles_included'] == True)
+                               {
+                                       $role_name = 
$this->soprojects->return_value('role',$project_id,$emps[$i]);
+                               }
+
                                $empl[] = array
                                (
                                        'account_id'            => 
$this->accounts->data['account_id'],
                                        'account_lid'           => 
$this->accounts->data['account_lid'],
                                        'account_firstname'     => 
$this->accounts->data['firstname'],
-                                       'account_lastname'      => 
$this->accounts->data['lastname']
+                                       'account_lastname'      => 
$this->accounts->data['lastname'],
+                                       'account_fullname'      => 
$GLOBALS['phpgw']->common->display_fullname($this->accounts->data['account_lid'],$this->accounts->data['firstname'],
+                                                                               
                                                                                
                $this->accounts->data['lastname']),
+                                       'role_name'                     => 
$co==$emps[$i]?(lang('coordinator') . "\n" . $role_name):$role_name
                                );
                        }
                        asort($empl);
@@ -1502,7 +1514,7 @@
                        }
                        unset($async);
 
-                       //_debug_array($values['employees']);
+                       _debug_array($values['employees']);
                        if (is_array($values['employees']))
                        {
                                
$this->soprojects->delete_acl($values['project_id']);