[Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php, 1.25, 1.26 class.boreport.inc.php, 1.7, 1.8 class.soreport.inc.php, 1.6, 1.7 class.uireport.inc.php, 1.14, 1.15

[Sigurd Nes <address@hidden>]

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

Modified Files:
        class.bolocation.inc.php class.boreport.inc.php 
        class.soreport.inc.php class.uireport.inc.php 
Log Message:
no message

Index: class.bolocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.bolocation.inc.php    29 Aug 2003 16:17:55 -0000      1.25
--- class.bolocation.inc.php    3 Sep 2003 18:04:35 -0000       1.26
***************
*** 526,530 ****
                function read_single($location_code='',$extra='')
                {
- //_debug_array($extra);
                        $location_data = $this->so->read_single($location_code);
  
--- 526,529 ----
***************
*** 538,547 ****
                        }
  
!                       if(!$extra['tenant_id'])
                        {
                                unset($location_data['tenant_id']);
                                unset($location_data['last_name']);
                                unset($location_data['first_name']);
-                               unset($location_data['contact_phone']);
                        }
  
--- 537,554 ----
                        }
  
!                       if($extra['tenant_id']>0)
!                       {
!                               
$tenant_data=$this->bocommon->read_single_tenant($extra['tenant_id']);
!                               $location_data['tenant_id']     = 
$extra['tenant_id'];
!                               $location_data['contact_phone']= 
$tenant_data['contact_phone'];
!                               $location_data['last_name']     = 
$tenant_data['last_name'];
!                               $location_data['first_name']    = 
$tenant_data['first_name'];
!                       }
!                       else
                        {
                                unset($location_data['tenant_id']);
+                               unset($location_data['contact_phone']);
                                unset($location_data['last_name']);
                                unset($location_data['first_name']);
                        }
  

Index: class.boreport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boreport.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.boreport.inc.php      27 Jun 2003 11:14:51 -0000      1.7
--- class.boreport.inc.php      3 Sep 2003 18:04:35 -0000       1.8
***************
*** 254,257 ****
--- 254,274 ----
                        }
  
+                       if($report['tenant_id']>0)
+                       {
+                               
$tenant_data=$this->bocommon->read_single_tenant($report['tenant_id']);
+                               $report['location_data']['tenant_id']= 
$report['tenant_id'];
+                               $report['location_data']['contact_phone']= 
$tenant_data['contact_phone'];
+                               $report['location_data']['last_name']   = 
$tenant_data['last_name'];
+                               $report['location_data']['first_name']  = 
$tenant_data['first_name'];
+                       }
+                       else
+                       {
+                               unset($report['location_data']['tenant_id']);
+                               
unset($report['location_data']['contact_phone']);
+                               unset($report['location_data']['last_name']);
+                               unset($report['location_data']['first_name']);
+                       }
+ 
+ 
  //_debug_array($report);
                        return $report;

Index: class.soreport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soreport.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.soreport.inc.php      9 Jul 2003 11:12:17 -0000       1.6
--- class.soreport.inc.php      3 Sep 2003 18:04:35 -0000       1.7
***************
*** 185,189 ****
                function read_single($report_id)
                {
!                       $sql = "SELECT 
location_code,report_type_id,title,abstract,status,entry_date from "
                        . " fm_report WHERE report_id='$report_id'";
  
--- 185,189 ----
                function read_single($report_id)
                {
!                       $sql = "SELECT 
location_code,report_type_id,title,abstract,status,entry_date,tenant_id from "
                        . " fm_report WHERE report_id='$report_id'";
  
***************
*** 201,204 ****
--- 201,205 ----
                                $report['date']                         = 
$this->db->f('date');
                                $report['cat_id']                       = 
$this->db->f('report_type_id');
+                               $report['tenant_id']            = 
$this->db->f('tenant_id');
  
  //_debug_array($report);
***************
*** 268,271 ****
--- 269,281 ----
                        }
  
+                       while (is_array($report['extra']) && 
list($input_name,$value) = each($report['extra']))
+                       {
+                               if($value)
+                               {
+                                       $cols[] = $input_name;
+                                       $vals[] = $value;
+                               }
+                       }
+ 
                        if($cols)
                        {
***************
*** 318,321 ****
--- 328,336 ----
  
                        while (is_array($report['location']) && 
list($input_name,$value) = each($report['location']))
+                       {
+                               $vals[] = "$input_name = '$value'";
+                       }
+ 
+                       while (is_array($report['extra']) && 
list($input_name,$value) = each($report['extra']))
                        {
                                $vals[] = "$input_name = '$value'";

Index: class.uireport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uireport.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.uireport.inc.php      29 Aug 2003 16:17:55 -0000      1.14
--- class.uireport.inc.php      3 Sep 2003 18:04:35 -0000       1.15
***************
*** 389,393 ****
                                $values['street_number']        = 
$_POST['street_number'];
                                $values['location_name']        = $_POST['loc' 
. (count($values['location'])).'_name']; // if not address - get the parent 
name as address
- 
                        }
                        else
--- 389,392 ----
***************
*** 510,514 ****
                                                'type_id'               => -1, 
// calculated from location_types
                                                'no_link'               => 
False, // disable lookup links for location type less than type_id
!                                               'tenant'                => 
False,
                                                'equipment'             => 
False,
                                                'lookup_type'   => 'form'
--- 509,513 ----
                                                'type_id'               => -1, 
// calculated from location_types
                                                'no_link'               => 
False, // disable lookup links for location type less than type_id
!                                               'tenant'                => True,
                                                'equipment'             => 
False,
                                                'lookup_type'   => 'form'
***************
*** 717,721 ****
                                                'type_id'               => 
count(explode('-',$values['location_data']['location_code'])),
                                                'no_link'               => 
False, // disable lookup links for location type less than type_id
!                                               'tenant'                => 
False,
                                                'equipment'             => 
False,
                                                'lookup_type'   => 'view'
--- 716,720 ----
                                                'type_id'               => 
count(explode('-',$values['location_data']['location_code'])),
                                                'no_link'               => 
False, // disable lookup links for location type less than type_id
!                                               'tenant'                => True,
                                                'equipment'             => 
False,
                                                'lookup_type'   => 'view'