[Phpgroupware-cvs] CVS: property/inc class.botts.inc.php,1.6,1.7 class.sotts.inc.php,1.10,1.11 class.uitts.inc.php,1.12,1.13

[Sigurd Nes <address@hidden>]

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

Modified Files:
        class.botts.inc.php class.sotts.inc.php class.uitts.inc.php 
Log Message:
no message

Index: class.botts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.botts.inc.php 16 Mar 2003 11:41:17 -0000      1.6
--- class.botts.inc.php 7 Apr 2003 09:01:58 -0000       1.7
***************
*** 257,260 ****
--- 257,265 ----
                        $ticket['group_lid'] = 
$GLOBALS['phpgw']->accounts->id2name($ticket['group_id']);
  
+                       if($ticket['tenant_id'])
+                       {
+                               
$tenant_data=$this->socommon->read_single_tenant($ticket['tenant_id']);
+                               $ticket['tenant_name']= 
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
+                       }
  
                        $history_values = 
$this->historylog->return_array(array(),array('O'),'history_timestamp','DESC',$id);

Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.sotts.inc.php 16 Mar 2003 11:41:17 -0000      1.10
--- class.sotts.inc.php 7 Apr 2003 09:01:58 -0000       1.11
***************
*** 160,169 ****
--- 160,174 ----
                                $ticket['details']                      = 
stripslashes($this->db->f('details'));
                                $ticket['location_code']        = 
$this->db->f('location_code');
+                               $ticket['equipment_id']         = 
$this->db->f('equipment_id');
                                $ticket['property_id']          = 
$this->db->f('property_id');
+                               $ticket['property_name']        = 
$this->db->f('property_name');
                                $ticket['building_id']          = 
$this->db->f('building_id');
                                $ticket['entrance_id']          = 
$this->db->f('entrance_id');
+                               $ticket['floor']                        = 
$this->db->f('floor');
                                $ticket['apartment_id']         = 
$this->db->f('apartment_id');
+                               $ticket['contact_phone']        = 
$this->db->f('contact_phone');
                                $ticket['street_name']          = 
$this->db->f('street_name');
                                $ticket['street_number']        = 
$this->db->f('street_number');
+                               $ticket['tenant_id']            = 
$this->db->f('tenant_id');
  
                                $owner_id=(int)$this->db->f('owner');

Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uitts.inc.php 4 Apr 2003 19:07:33 -0000       1.12
--- class.uitts.inc.php 7 Apr 2003 09:01:58 -0000       1.13
***************
*** 441,444 ****
--- 441,445 ----
                                'sub'                           => 'order',
                                'location_code'         => 
$ticket['location_code'],
+                               'equipment_id'          => 
$ticket['equipment_id'],
                                'property_id'           => 
$ticket['property_id'],
                                'property_name'         => 
$ticket['property_name'],
***************
*** 451,455 ****
                                'street_number'         => 
$ticket['street_number'],
                                'tenant_id'                     => 
$ticket['tenant_id'],
!                               'contact_phone'         => 
$ticket['contact_phone']
                        );
  
--- 452,457 ----
                                'street_number'         => 
$ticket['street_number'],
                                'tenant_id'                     => 
$ticket['tenant_id'],
!                               'tenant_name'           => 
$ticket['tenant_name'],
!                               'tenant_phone'          => 
$ticket['contact_phone']
                        );
  
***************
*** 459,462 ****
--- 461,465 ----
                                'bypass'                        => true,
                                'location_code'         => 
$ticket['location_code'],
+                               'equipment_id'          => 
$ticket['equipment_id'],
                                'property_id'           => 
$ticket['property_id'],
                                'property_name'         => 
$ticket['property_name'],
***************
*** 469,473 ****
                                'street_number'         => 
$ticket['street_number'],
                                'tenant_id'                     => 
$ticket['tenant_id'],
!                               'contact_phone'         => 
$ticket['contact_phone']
                        );
  
--- 472,477 ----
                                'street_number'         => 
$ticket['street_number'],
                                'tenant_id'                     => 
$ticket['tenant_id'],
!                               'tenant_name'           => 
$ticket['tenant_name'],
!                               'tenant_phone'          => 
$ticket['contact_phone']
                        );
  
***************
*** 495,501 ****
--- 499,524 ----
                        );
  
+                       
$location_data=$this->bocommon->initiate_ui_location(array(
+                                               'location_type' => 'view',
+                                               'equipment'             => true,
+                                               'tenant'                => true,
+                                               'address'               => true,
+                                               'equipment_id'  => 
$ticket['equipment_id'],
+                                               'property_id'   => 
$ticket['property_id'],
+                                               'property_name' => 
$ticket['property_name'],
+                                               'building_id'   => 
$ticket['building_id'],
+                                               'entrance_id'   => 
$ticket['entrance_id'],
+                                               'floor'                 => 
$ticket['floor'],
+                                               'street_name'   => 
$ticket['street_name'],
+                                               'street_number' => 
$ticket['street_number'],
+                                               'tenant_id'             => 
$ticket['tenant_id'],
+                                               'tenant_name'   => 
$ticket['tenant_name'],
+                                               'tenant_phone'  => 
$ticket['contact_phone'],
+                                               'apartment_id'  => 
$ticket['apartment_id']));
+ 
                        $data = array
                        (
  
+                               'location_data'                                 
=> $location_data,
                                'error'                                         
        => $receipt['error'],
                                'message'                                       
        => $receipt['message'],