[Phpgroupware-cvs] CVS: property/inc class.boworkorder.inc.php,1.2,1.3 class.socommon.inc.php,1.12,1.13 class.soworkorder.inc.php,1.2,1.3 class.uiworkorder.inc.php,1.2,1.3

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv3494/inc

Modified Files:
        class.boworkorder.inc.php class.socommon.inc.php 
        class.soworkorder.inc.php class.uiworkorder.inc.php 
Log Message:
no message

Index: class.boworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boworkorder.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.boworkorder.inc.php   13 Mar 2003 09:54:49 -0000      1.2
--- class.boworkorder.inc.php   13 Mar 2003 10:25:03 -0000      1.3
***************
*** 348,351 ****
--- 348,359 ----
                        }
  
+                       if($project['tenant_id'])
+                       {
+                               
$tenant_data=$this->socommon->read_single_tenant($project['tenant_id']);
+                               $project['tenant_phone']= 
$tenant_data['tenant_phone'];
+                               $project['tenant_name']= 
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
+                       }
+ 
+ 
  //_debug_array($project);
                        return $project;

Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.socommon.inc.php      27 Feb 2003 09:53:36 -0000      1.12
--- class.socommon.inc.php      13 Mar 2003 10:25:03 -0000      1.13
***************
*** 30,33 ****
--- 30,53 ----
                }
  
+ 
+ 
+               function read_single_tenant($tenant_id)
+               {
+ 
+ 
+                       $this->db->query("SELECT * FROM fm_tenant WHERE 
tenant_id ='$tenant_id'");
+ 
+                       $this->db->next_record();
+                               $tenant_data = array
+                               (
+                                       'first_name'            => 
$this->db->f('first_name'),
+                                       'last_name'                     => 
$this->db->f('last_name'),
+                                       'tenant_phone'          => 
$this->db->f('contact_phone')
+                               );
+ 
+ //_debug_array($tenant_data);
+                       return  $tenant_data;
+               }
+ 
                function read_attibutes($data)
                {

Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.soworkorder.inc.php   13 Mar 2003 09:54:54 -0000      1.2
--- class.soworkorder.inc.php   13 Mar 2003 10:25:06 -0000      1.3
***************
*** 239,244 ****
                                $project['budget']                              
= $this->db->f('budget');
                                $project['actual_cost']                 = 
$this->db->f('actual_cost');
!                               $project['vendor_id']                   = 
$this->db->f('vendor_id');
!                               $project['lifetime']                    = 
$this->db->f('lifetime');
                                $project['street_name']                 = 
$this->db->f('street_name');
                                $project['street_number']               = 
$this->db->f('street_number');
--- 239,243 ----
                                $project['budget']                              
= $this->db->f('budget');
                                $project['actual_cost']                 = 
$this->db->f('actual_cost');
!                               $project['tenant_id']                   = 
$this->db->f('tenant_id');
                                $project['street_name']                 = 
$this->db->f('street_name');
                                $project['street_number']               = 
$this->db->f('street_number');
***************
*** 325,329 ****
                        $project['name'] = 
$this->db->db_addslashes($project['name']);
                        $project['title'] = 
$this->db->db_addslashes($project['title']);
! _debug_array($project);
                        $this->db->query("INSERT INTO fm_wo_project 
(id,name,equipment_id,access,category,entry_date,start_date,end_date,coordinator,status,"
                                . 
"descr,title,budget,location_code,property_id,property_name,building_id,entrance_id,floor,apartment_id,"
--- 324,328 ----
                        $project['name'] = 
$this->db->db_addslashes($project['name']);
                        $project['title'] = 
$this->db->db_addslashes($project['title']);
! //_debug_array($project);
                        $this->db->query("INSERT INTO fm_wo_project 
(id,name,equipment_id,access,category,entry_date,start_date,end_date,coordinator,status,"
                                . 
"descr,title,budget,location_code,property_id,property_name,building_id,entrance_id,floor,apartment_id,"

Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uiworkorder.inc.php   13 Mar 2003 09:54:57 -0000      1.2
--- class.uiworkorder.inc.php   13 Mar 2003 10:25:06 -0000      1.3
***************
*** 490,494 ****
                                'select_user_name'                              
=> 'values[coordinator]',
                                'lang_no_user'                                  
=> lang('Select coordinator'),
!                               'user_list'                                     
        => $this->bocommon->get_user_list('select',$this->filter),
  
                                'status_list'                                   
=> $this->bo->select_status_list('select',$values['status']),
--- 490,494 ----
                                'select_user_name'                              
=> 'values[coordinator]',
                                'lang_no_user'                                  
=> lang('Select coordinator'),
!                               'user_list'                                     
        => $this->bocommon->get_user_list('select',$values['coordinator']),
  
                                'status_list'                                   
=> $this->bo->select_status_list('select',$values['status']),