phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: property/inc class.bobuilding.inc.php,1.3,1.4 cl


From: Sigurd Nes <address@hidden>
Subject: [Phpgroupware-cvs] CVS: property/inc class.bobuilding.inc.php,1.3,1.4 class.bocommon.inc.php,1.17,1.18 class.soadmin.inc.php,1.2,1.3 class.sobuilding.inc.php,1.5,1.6 class.soinvestment.inc.php,1.6,1.7 class.soproperty.inc.php,1.5,1.6 class.sotts.inc.php,1.7,1.8 class.uibuilding.inc.php,1.8,1.9 class.uiequipment.inc.php,1.7,1.8 class.uiinvestment.inc.php,1.8,1.9class.uiproperty.inc.php,1.9,1.10 class.uistandard_2.inc.php,1.4,1.5 class.uistandard_3.inc.php,1.2,1.3 class.uitts.inc.php,1.10,1.11
Date: Fri, 21 Feb 2003 05:29:01 -0500

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

Modified Files:
        class.bobuilding.inc.php class.bocommon.inc.php 
        class.soadmin.inc.php class.sobuilding.inc.php 
        class.soinvestment.inc.php class.soproperty.inc.php 
        class.sotts.inc.php class.uibuilding.inc.php 
        class.uiequipment.inc.php class.uiinvestment.inc.php 
        class.uiproperty.inc.php class.uistandard_2.inc.php 
        class.uistandard_3.inc.php class.uitts.inc.php 
Log Message:
no message

Index: class.bobuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bobuilding.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.bobuilding.inc.php    7 Feb 2003 11:18:44 -0000       1.3
--- class.bobuilding.inc.php    21 Feb 2003 10:28:59 -0000      1.4
***************
*** 109,112 ****
--- 109,117 ----
                }
  
+               function read_category_name($cat_id)
+               {
+                       return $this->so->read_category_name($cat_id);
+               }
+ 
                function select_part_of_town($part_of_town_id)
                {
***************
*** 114,118 ****
                }
  
!               function save($building,$action='',$err='')
                {
                        if ($building['access'])
--- 119,123 ----
                }
  
!               function save($building,$action='')
                {
                        if ($building['access'])
***************
*** 125,140 ****
                        }
  
!                       if ($action=='edit' && !$err)
                        {
!                               if ($building['building_id'] != 0 )
                                {
!                                       if 
($this->socommon->check_building($building['property_id'],$building['building_id']))
!                                       {
!                                               $receipt = 
$this->so->edit($building);
!                                       }
!                                       else
!                                       {
!                                               
$receipt['error'][]=array('msg'=>lang('This building_id ID does not exist!'));
!                                       }
                                }
                        }
--- 130,142 ----
                        }
  
!                       if ($action=='edit')
                        {
!                               if 
($this->socommon->check_building($building['property_id'],$building['building_id']))
                                {
!                                       $receipt = $this->so->edit($building);
!                               }
!                               else
!                               {
!                                       
$receipt['error'][]=array('msg'=>lang('This building_id ID does not exist!'));
                                }
                        }
***************
*** 145,152 ****
                                {
                                        
$receipt['error'][]=array('msg'=>lang('This property ID does not exist!'));
-                               }
-                               
if($this->socommon->check_building($building['property_id'],$building['building_id']))
-                               {
-                                       
$receipt['error'][]=array('msg'=>lang('This building is already registered!'));
                                }
  
--- 147,150 ----

Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.bocommon.inc.php      18 Feb 2003 09:13:57 -0000      1.17
--- class.bocommon.inc.php      21 Feb 2003 10:28:59 -0000      1.18
***************
*** 203,221 ****
  //_debug_array($data);
  
! 
!                       if($data['form'])
!                       {
!                               
$GLOBALS['phpgw']->xslttpl->add_file(array('location_form'));
!                       }
!                       else
                        {
!                               
$GLOBALS['phpgw']->xslttpl->add_file(array('location_view'));
                        }
                        if($data['equipment'])
                        {
!                               $location['equipment']                          
                        = True;
!                               $location['lang_select_location_statustext']    
= lang('select either a location or an equipment');
!                               $location['equipment_link']                     
                        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.equipment');
!                               $location['lang_equipment']                     
                        = lang('Equipment');
                        }
                        else
--- 203,224 ----
  //_debug_array($data);
  
!                       switch($data['location_type'])
                        {
!                               case 'form':
!                                       
$GLOBALS['phpgw']->xslttpl->add_file(array('location_form'));
!                                       break;
!                               case 'view':
!                                       
$GLOBALS['phpgw']->xslttpl->add_file(array('location_view'));
!                                       break;
                        }
+ 
                        if($data['equipment'])
                        {
!                               $location['equipment']                          
                = True;
!                               $location['lang_select_location_statustext']= 
lang('select either a location or an equipment');
!                               $location['equipment_link']                     
                = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.equipment');
!                               $location['lang_equipment']                     
                = lang('Equipment');
!                               $location['value_equipment_id']                 
        = $data['equipment_id'];
!                               $location['lang_select_equipment_help']         
= lang('Klick this link to select equipment');
                        }
                        else
***************
*** 224,232 ****
--- 227,274 ----
                        }
  
+ 
                        if($data['tenant'])
                        {
                                $location['tenant']                             
                                = True;
                                $location['lang_tenant']                        
                        = lang('Tenant');
+                               $location['tenant_link']                        
                        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=tenant');
                                $location['lang_tenant_phone']                  
                = lang('Tenant phone');
+                               $location['lang_select_tenant_help']            
        = lang('Klick this link to select tenant');
+                               $location['value_tenant_id']                    
                = $data['tenant_id'];
+                               $location['value_tenant_name']                  
                = $data['tenant_name'];
+                               $location['value_tenant_phone']                 
                = $data['tenant_phone'];
+                               $data['apartment']                              
                                = True;
+                       }
+                       if($data['apartment'])
+                       {
+                               $location['apartment']                          
                        = True;
+                               $location['apartment_link']                     
                        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=apartment');
+                               $location['value_apartment_id']                 
                = $data['apartment_id'];
+                               $location['value_floor']                        
                        = $data['floor'];
+                               $location['lang_select_apartment_help']         
        = lang('Klick this link to select apartment');
+                               $location['lang_floor']                         
                        = lang('Floor');
+                               $location['lang_apartment']                     
                        = lang('Apartment');
+                               $data['entrance']                               
                                = True;
+                       }
+ 
+                       if($data['entrance'])
+                       {
+                               $location['entrance']                           
                        = True;
+                               $location['value_entrance_id']                  
                = $data['entrance_id'];
+                               $location['value_street_name']                  
                = $data['street_name'];
+                               $location['value_street_number']                
                = $data['street_number'];
+                               $location['entrance_link']                      
                        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=entrance');
+                               $location['lang_entrance']                      
                        = lang('Entrance');
+                               $location['lang_select_entrance_help']          
        = lang('Klick this link to select entrance');
+                               $data['building']                               
                                = True;
+                       }
+ 
+                       if($data['building'])
+                       {
+                               $location['building']                           
                = True;
+                               $location['value_building_id']                  
        = $data['building_id'];
+                               $location['building_link']                      
                = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=building');
+                               $location['lang_building']                      
                = lang('Building');
+                               $location['lang_select_building_help']          
= lang('Klick this link to select building');
                        }
  
***************
*** 234,269 ****
                        $location['value_property_id']                          
                = $data['property_id'];
                        $location['value_property_name']                        
                = $data['property_name'];
-                       $location['value_building_id']                          
                = $data['building_id'];
-                       $location['value_entrance_id']                          
                = $data['entrance_id'];
-                       $location['value_floor']                                
                        = $data['floor'];
-                       $location['value_street_name']                          
                = $data['street_name'];
-                       $location['value_street_number']                        
                = $data['street_number'];
-                       $location['value_apartment_id']                         
                = $data['apartment_id'];
-                       $location['value_tenant_id']                            
                = $data['tenant_id'];
-                       $location['value_tenant_name']                          
                = $data['tenant_name'];
-                       $location['value_tenant_phone']                         
                = $data['tenant_phone'];
-                       $location['value_equipment_id']                         
                = $data['equipment_id'];
- 
                        $location['lang_location']                              
                        = lang('Location');
                        $location['location_link']                              
                        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=property');
                        $location['property_link']                              
                        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=property');
-                       $location['building_link']                              
                        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=building');
-                       $location['entrance_link']                              
                        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=entrance');
-                       $location['apartment_link']                             
                        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=apartment');
-                       $location['tenant_link']                                
                        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=tenant');
                        $location['lang_property']                              
                        = lang('Property');
!                       $location['lang_select_property_help']          = 
lang('Klick this link to select property');
!                       $location['lang_select_building_help']          = 
lang('Klick this link to select building');
!                       $location['lang_select_entrance_help']          = 
lang('Klick this link to select entrance');
!                       $location['lang_select_apartment_help']         = 
lang('Klick this link to select apartment');
!                       $location['lang_select_tenant_help']            = 
lang('Klick this link to select tenant');
!                       $location['lang_select_equipment_help']         = 
lang('Klick this link to select equipment');
! 
                        $location['lang_property_name']                         
                = lang('Property Name');
-                       $location['lang_building']                              
                        = lang('Building');
-                       $location['lang_entrance']                              
                        = lang('Entrance');
-                       $location['lang_floor']                                 
                        = lang('Floor');
                        $location['lang_address']                               
                        = lang('Address');
-                       $location['lang_apartment']                             
                        = lang('Apartment');
  
  //_debug_array($location);
--- 276,286 ----
                        $location['value_property_id']                          
                = $data['property_id'];
                        $location['value_property_name']                        
                = $data['property_name'];
                        $location['lang_location']                              
                        = lang('Location');
                        $location['location_link']                              
                        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=property');
                        $location['property_link']                              
                        = 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=property');
                        $location['lang_property']                              
                        = lang('Property');
!                       $location['lang_select_property_help']                  
        = lang('Klick this link to select property');
                        $location['lang_property_name']                         
                = lang('Property Name');
                        $location['lang_address']                               
                        = lang('Address');
  
  //_debug_array($location);

Index: class.soadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.soadmin.inc.php       18 Feb 2003 20:38:17 -0000      1.2
--- class.soadmin.inc.php       21 Feb 2003 10:28:59 -0000      1.3
***************
*** 281,285 ****
                                $building['owner']                              
= $this->db->f('owner');
                                $building['name']                               
= stripslashes($this->db->f('building_name'));
!                               $building['generaladdress']             = 
stripslashes($this->db->f('general_address'));
                                $building['access']                             
= $this->db->f('access');
                                $building['date']                               
= $this->db->f('entry_date');
--- 281,285 ----
                                $building['owner']                              
= $this->db->f('owner');
                                $building['name']                               
= stripslashes($this->db->f('building_name'));
!                               $building['general_address']            = 
stripslashes($this->db->f('general_address'));
                                $building['access']                             
= $this->db->f('access');
                                $building['date']                               
= $this->db->f('entry_date');

Index: class.sobuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sobuilding.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.sobuilding.inc.php    18 Feb 2003 20:38:17 -0000      1.5
--- class.sobuilding.inc.php    21 Feb 2003 10:28:59 -0000      1.6
***************
*** 27,32 ****
                                $this->join = " LEFT JOIN ";
                        }
  
! 
                }
  
--- 27,37 ----
                                $this->join = " LEFT JOIN ";
                        }
+               }
  
!               function read_category_name($cat_id)
!               {
!                       $this->db->query("SELECT descr FROM  
fm_building_category  where id='$cat_id'");
!                       $this->db->next_record();
!                       return $this->db->f('descr');
                }
  
***************
*** 112,122 ****
                                        'property_id'   => 
$this->db->f('property_id'),
                                        'building_id'   => 
$this->db->f('building_id'),
!                                       'owner'         => 
$this->db->f('owner'),
!                                       'owner_id'      => 
(int)$this->db->f('owner'),
!                                       'access'        => 
$this->db->f('access'),
!                                       'date'          => 
$this->db->f('entry_date'),
!                                       'cat_id'        => 
(int)$this->db->f('cat_id'),
!                                       'name'  => 
stripslashes($this->db->f('building_name')),
!                                       'grants'        => $ngrants
                                );
                        }
--- 117,127 ----
                                        'property_id'   => 
$this->db->f('property_id'),
                                        'building_id'   => 
$this->db->f('building_id'),
!                                       'owner'                 => 
$this->db->f('owner'),
!                                       'owner_id'              => 
(int)$this->db->f('owner'),
!                                       'access'                => 
$this->db->f('access'),
!                                       'date'                  => 
$this->db->f('entry_date'),
!                                       'cat_id'                => 
(int)$this->db->f('cat_id'),
!                                       'name'                  => 
stripslashes($this->db->f('building_name')),
!                                       'grants'                => $ngrants
                                );
                        }
***************
*** 132,147 ****
                        if ($this->db->next_record())
                        {
!                               $building['property_id']                = 
(int)$this->db->f('property_id');
!                               $building['building_id']                = 
(int)$this->db->f('building_id');
                                $building['owner']                              
= $this->db->f('owner');
                                $building['name']                               
= stripslashes($this->db->f('building_name'));
!                               $building['generaladdress']             = 
stripslashes($this->db->f('general_address'));
                                $building['access']                             
= $this->db->f('access');
                                $building['date']                               
= $this->db->f('entry_date');
                                $building['cat_id']                             
= (int)$this->db->f('cat_id');
-                               $building['district_id']                        
= $this->db->f('district_id');
-                               $building['part_of_town']               = 
$this->db->f('bydel');
-                               $building['building_type_id']   = 
$this->db->f('building_type_id');
                                $building['location_code']              = 
$this->db->f('location_code');
  
                                return $building;
--- 137,150 ----
                        if ($this->db->next_record())
                        {
!                               $building['property_id']                = 
$this->db->f('property_id');
!                               $building['building_id']                = 
$this->db->f('building_id');
                                $building['owner']                              
= $this->db->f('owner');
                                $building['name']                               
= stripslashes($this->db->f('building_name'));
!                               $building['general_address']    = 
stripslashes($this->db->f('general_address'));
                                $building['access']                             
= $this->db->f('access');
                                $building['date']                               
= $this->db->f('entry_date');
                                $building['cat_id']                             
= (int)$this->db->f('cat_id');
                                $building['location_code']              = 
$this->db->f('location_code');
+                               $building['remark']                             
= $this->db->f('remark');
  
                                return $building;
***************
*** 151,161 ****
                function add($building)
                {
  
!                       $this->db->query("INSERT INTO fm_building 
(location_code, 
property_id,building_id,owner,access,entry_date,building_name,general_address,cat_id)
 "
                                . "VALUES ('" . $building['location_code']. 
"','" . $building['property_id'] . "','" . $building['building_id'] . "','" . 
$this->account . "','" . $building['access'] . "','" . time() . "','" . 
$building['name']
!                               . "','" . $building['generaladdress'] ."','" . 
$building['cat_id']. "')",__LINE__,__FILE__);
! 
!                       $ids['building_id'] = $building['building_id'];
!                       $ids['property_id'] = $building['property_id'];
  
                        $receipt['message'][] = array('msg'=>lang('Building has 
been saved'));
--- 154,162 ----
                function add($building)
                {
+                       $building['remark'] = 
$this->db->db_addslashes($building['remark']);
  
!                       $this->db->query("INSERT INTO fm_building 
(location_code, 
property_id,building_id,owner,access,entry_date,building_name,general_address,cat_id,remark)
 "
                                . "VALUES ('" . $building['location_code']. 
"','" . $building['property_id'] . "','" . $building['building_id'] . "','" . 
$this->account . "','" . $building['access'] . "','" . time() . "','" . 
$building['name']
!                               . "','" . $building['general_address'] ."','" . 
$building['cat_id'] ."','" . $building['remark']. "')",__LINE__,__FILE__);
  
                        $receipt['message'][] = array('msg'=>lang('Building has 
been saved'));
***************
*** 165,172 ****
                function edit($building)
                {
!                       $building['content'] = 
$this->db->db_addslashes($building['content']);
  
                        $this->db->query("UPDATE fm_building set 
building_name='" . $building['name'] . "', entry_date='" . time()
!                                               . "', cat_id='" . 
$building['cat_id'] . "', general_address='" . $building['generaladdress'] . 
"', access='" . $building['access']
                                                . "' WHERE property_id= '" . 
$building['property_id']
                                                . "' AND building_id=" . 
$building['building_id'],__LINE__,__FILE__);
--- 166,173 ----
                function edit($building)
                {
!                       $building['remark'] = 
$this->db->db_addslashes($building['remark']);
  
                        $this->db->query("UPDATE fm_building set 
building_name='" . $building['name'] . "', entry_date='" . time()
!                                               . "', cat_id='" . 
$building['cat_id'] . "', general_address='" . $building['general_address'] . 
"', access='" . $building['access'] . "', remark='" . $building['remark']
                                                . "' WHERE property_id= '" . 
$building['property_id']
                                                . "' AND building_id=" . 
$building['building_id'],__LINE__,__FILE__);
***************
*** 178,182 ****
                function delete($property_id,$building_id )
                {
!                       $this->db->query('DELETE FROM fm_building WHERE 
property_id=' . $property_id . ' and building_id=' . 
$building_id,__LINE__,__FILE__);
                }
        }
--- 179,183 ----
                function delete($property_id,$building_id )
                {
!                       $this->db->query("DELETE FROM fm_building WHERE 
property_id='" . $property_id . "' and building_id='" . $building_id 
."'",__LINE__,__FILE__);
                }
        }

Index: class.soinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvestment.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.soinvestment.inc.php  18 Feb 2003 20:38:17 -0000      1.6
--- class.soinvestment.inc.php  21 Feb 2003 10:28:59 -0000      1.7
***************
*** 285,289 ****
                        $this->db->query("INSERT INTO fm_building 
(location_code, 
property_id,building_id,owner,access,entry_date,building_name,general_address,cat_id)
 "
                                . "VALUES ('" . $building['location_code']. 
"','" . $building['property_id'] . "','" . $building['building_id'] . "','" . 
$this->account . "','" . $building['access'] . "','" . time() . "','" . 
$building['name']
!                               . "','" . $building['generaladdress'] ."','" . 
$building['cat_id']. "')",__LINE__,__FILE__);
  
                        $ids['building_id'] = $building['building_id'];
--- 285,289 ----
                        $this->db->query("INSERT INTO fm_building 
(location_code, 
property_id,building_id,owner,access,entry_date,building_name,general_address,cat_id)
 "
                                . "VALUES ('" . $building['location_code']. 
"','" . $building['property_id'] . "','" . $building['building_id'] . "','" . 
$this->account . "','" . $building['access'] . "','" . time() . "','" . 
$building['name']
!                               . "','" . $building['general_address'] ."','" . 
$building['cat_id']. "')",__LINE__,__FILE__);
  
                        $ids['building_id'] = $building['building_id'];
***************
*** 299,303 ****
  
                        $this->db->query("UPDATE fm_building set 
building_name='" . $building['name'] . "', entry_date='" . time()
!                                               . "', cat_id='" . 
$building['cat_id'] . "', general_address='" . $building['generaladdress'] . 
"', access='" . $building['access']
                                                . "' WHERE property_id= '" . 
$building['property_id']
                                                . "' AND building_id=" . 
$building['building_id'],__LINE__,__FILE__);
--- 299,303 ----
  
                        $this->db->query("UPDATE fm_building set 
building_name='" . $building['name'] . "', entry_date='" . time()
!                                               . "', cat_id='" . 
$building['cat_id'] . "', general_address='" . $building['general_address'] . 
"', access='" . $building['access']
                                                . "' WHERE property_id= '" . 
$building['property_id']
                                                . "' AND building_id=" . 
$building['building_id'],__LINE__,__FILE__);

Index: class.soproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproperty.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.soproperty.inc.php    18 Feb 2003 20:38:18 -0000      1.5
--- class.soproperty.inc.php    21 Feb 2003 10:28:59 -0000      1.6
***************
*** 144,148 ****
                                $property['owner']                              
= $this->db->f('owner');
                                $property['name']                               
= stripslashes($this->db->f('navn'));
!                               $property['generaladdress']             = 
stripslashes($this->db->f('general_address'));
                                $property['access']                             
= $this->db->f('access');
                                $property['date']                               
= $this->db->f('entry_date');
--- 144,148 ----
                                $property['owner']                              
= $this->db->f('owner');
                                $property['name']                               
= stripslashes($this->db->f('navn'));
!                               $property['general_address']            = 
stripslashes($this->db->f('general_address'));
                                $property['access']                             
= $this->db->f('access');
                                $property['date']                               
= $this->db->f('entry_date');
***************
*** 161,170 ****
                function add($property)
                {
- //print_r($property);
                        $property['generellinfo'] = 
$this->db->db_addslashes($property['generellinfo']);
  
                        $this->db->query("INSERT INTO fm_property 
(location_code, 
property_id,bydel_id,owner,access,entry_date,navn,general_address,cat_id,generellinfo)
 "
                                . "VALUES ('" . $property['property_id'] . 
"','" . $property['property_id'] . "','" . $property['part_of_town_id'] . "','" 
. $this->account . "','" . $property['access'] . "','" . time() . "','" . 
$property['name']
!                               . "','" . $property['generaladdress'] ."','" . 
$property['cat_id'] ."','" . $property['generellinfo']. "')",__LINE__,__FILE__);
  
                        $receipt['message'][]=array('msg'=>lang('Property has 
been saved'));
--- 161,169 ----
                function add($property)
                {
                        $property['generellinfo'] = 
$this->db->db_addslashes($property['generellinfo']);
  
                        $this->db->query("INSERT INTO fm_property 
(location_code, 
property_id,bydel_id,owner,access,entry_date,navn,general_address,cat_id,generellinfo)
 "
                                . "VALUES ('" . $property['property_id'] . 
"','" . $property['property_id'] . "','" . $property['part_of_town_id'] . "','" 
. $this->account . "','" . $property['access'] . "','" . time() . "','" . 
$property['name']
!                               . "','" . $property['general_address'] ."','" . 
$property['cat_id'] ."','" . $property['generellinfo']. "')",__LINE__,__FILE__);
  
                        $receipt['message'][]=array('msg'=>lang('Property has 
been saved'));
***************
*** 177,181 ****
  
                        $this->db->query("UPDATE fm_property set navn='" . 
$property['name'] . "', entry_date='" . time() . "', cat_id='"
!                                                       . $property['cat_id'] . 
"', general_address='" . $property['generaladdress'] . "', access='" . 
$property['access'] . "', bydel_id='" . $property['part_of_town_id']. "', 
generellinfo='" . $property['generellinfo']
                                                        . "' WHERE 
property_id=" . intval($property['property_id']),__LINE__,__FILE__);
  
--- 176,180 ----
  
                        $this->db->query("UPDATE fm_property set navn='" . 
$property['name'] . "', entry_date='" . time() . "', cat_id='"
!                                                       . $property['cat_id'] . 
"', general_address='" . $property['general_address'] . "', access='" . 
$property['access'] . "', bydel_id='" . $property['part_of_town_id']. "', 
generellinfo='" . $property['generellinfo']
                                                        . "' WHERE 
property_id=" . intval($property['property_id']),__LINE__,__FILE__);
  
***************
*** 186,190 ****
                function delete($property_id)
                {
!                       $this->db->query('DELETE FROM fm_property WHERE 
property_id=' . intval($property_id),__LINE__,__FILE__);
                }
        }
--- 185,189 ----
                function delete($property_id)
                {
!                       $this->db->query("DELETE FROM fm_property WHERE 
property_id='" . $property_id ."'",__LINE__,__FILE__);
                }
        }

Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.sotts.inc.php 18 Feb 2003 20:38:18 -0000      1.7
--- class.sotts.inc.php 21 Feb 2003 10:28:59 -0000      1.8
***************
*** 237,241 ****
  
                        $this->db->query("UPDATE fm_building set 
building_name='" . $building['name'] . "', entry_date='" . time()
!                                               . "', cat_id='" . 
$building['cat_id'] . "', general_address='" . $building['generaladdress'] . 
"', access='" . $building['access']
                                                . "' WHERE property_id= '" . 
$building['property_id']
                                                . "' AND building_id=" . 
$building['building_id'],__LINE__,__FILE__);
--- 237,241 ----
  
                        $this->db->query("UPDATE fm_building set 
building_name='" . $building['name'] . "', entry_date='" . time()
!                                               . "', cat_id='" . 
$building['cat_id'] . "', general_address='" . $building['general_address'] . 
"', access='" . $building['access']
                                                . "' WHERE property_id= '" . 
$building['property_id']
                                                . "' AND building_id=" . 
$building['building_id'],__LINE__,__FILE__);

Index: class.uibuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uibuilding.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uibuilding.inc.php    18 Feb 2003 20:38:18 -0000      1.8
--- class.uibuilding.inc.php    21 Feb 2003 10:28:59 -0000      1.9
***************
*** 40,43 ****
--- 40,44 ----
                        $this->bo                                       = 
CreateObject($this->currentapp.'.bobuilding',True);
                        $this->bocommon                                 = 
CreateObject($this->currentapp.'.bocommon',True);
+                       $this->socommon                                 = 
CreateObject($this->currentapp.'.socommon',True);
  
                        $this->start                            = 
$this->bo->start;
***************
*** 83,94 ****
                        while (is_array($building_list) && list(,$building) = 
each($building_list))
                        {
-                               $words = split(' ',$building['name']);
-                               $first = "$words[0] $words[1] $words[2] 
$words[3] .....";
- 
                                $content[] = array
                                (
                                        'property_id'                           
=> $building['property_id'],
                                        'building_id'                           
=> $building['building_id'],
!                                       'first'                                 
        => $first,
                                        'date'                                  
        => $building['date'],
                                        'owner'                                 
        => $building['owner'],
--- 84,92 ----
                        while (is_array($building_list) && list(,$building) = 
each($building_list))
                        {
                                $content[] = array
                                (
                                        'property_id'                           
=> $building['property_id'],
                                        'building_id'                           
=> $building['building_id'],
!                                       'name'                                  
        => $building['name'],
                                        'date'                                  
        => $building['date'],
                                        'owner'                                 
        => $building['owner'],
***************
*** 181,186 ****
                        );
  
- //print_r($data).'<br>';
- //print_($menu);
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
                        $this->save_sessiondata();
--- 179,182 ----
***************
*** 189,198 ****
                function edit()
                {
!                       $property_id = get_var('property_id',array('GET'));
!                       $building_id = 
get_var('building_id',array('POST','GET'));
!                       $err            = get_var('err',array('POST','GET'));
!                       $values         = get_var('values',array('POST','GET'));
!                       $values_attribute       = 
get_var('values_attribute',array('POST','GET'));
! 
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('building',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
--- 185,195 ----
                function edit()
                {
!                       $property_id                    = 
get_var('property_id',array('GET'));
!                       $building_id                    = 
get_var('building_id',array('POST','GET'));
!                       $err                                    = 
get_var('err',array('POST','GET'));
!                       $values                                 = 
get_var('values',array('POST','GET'));
!                       $values['property_id']  = 
get_var('property_id',array('POST'));
!                       $values['property_name']        = 
get_var('property_name',array('POST'));
!                       $values_attribute               = 
get_var('values_attribute',array('POST','GET'));
  
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('building',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
***************
*** 200,209 ****
                        if ($values['save'])
                        {
!                               if($building_id)
                                {
!                                       if(!$err)
                                        {
!                                               
$values['property_id']=$property_id;
                                        }
                                        $values['building_id']=$building_id;
                                        $action='edit';
--- 197,227 ----
                        if ($values['save'])
                        {
!                               if(!$values['property_id']  && !$property_id)
!                               {
!                                       
$receipt['error'][]=array('msg'=>lang('Please select a Property ID !'));
!                                       $error_property_id=true;
!                                       $error_id=true;
!                               }
! 
!                               if(!$values['building_id']  && !$building_id)
!                               {
!                                       
$receipt['error'][]=array('msg'=>lang('Please enter a Building ID !'));
!                                       $error_building_id=true;
!                                       $error_id=true;
!                               }
! 
!                               if($values['property_id']  && 
$values['building_id'])
                                {
!                                       
if($this->socommon->check_building($values['property_id'],$values['building_id']))
                                        {
!                                               
$receipt['error'][]=array('msg'=>lang('This building is already registered!') . 
'[ '.$values['property_id'].'-'.$values['building_id'].' ]');
!                                               $error_building_id=true;
!                                               $error_id=true;
                                        }
+                               }
+ 
+                               if($building_id)
+                               {
+                                       $values['property_id']=$property_id;
                                        $values['building_id']=$building_id;
                                        $action='edit';
***************
*** 216,223 ****
  
  //_debug_array($values);
!                               $receipt = 
$this->bo->save($values,$action,$err);
!                               if($values_attribute)
                                {
!                                       
$this->bocommon->save_attributes($values_attribute,'location');
                                }
                        }
--- 234,244 ----
  
  //_debug_array($values);
!                               if(!$receipt['error'])
                                {
!                                       $receipt = 
$this->bo->save($values,$action,$err);
!                                       if($values_attribute)
!                                       {
!                                               
$this->bocommon->save_attributes($values_attribute,'location');
!                                       }
                                }
                        }
***************
*** 226,235 ****
                                $values['property_id']= $property_id;
                                $values['building_id']= $building_id;
! 
                        }
  
!                       if ($building_id && !$err)
                        {
-                               $building = 
$this->bo->read_single($property_id,$building_id);
                                $function_msg = lang('edit building');
                        }
--- 247,255 ----
                                $values['property_id']= $property_id;
                                $values['building_id']= $building_id;
!                               $values = 
$this->bo->read_single($property_id,$building_id);
                        }
  
!                       if ($building_id)
                        {
                                $function_msg = lang('edit building');
                        }
***************
*** 243,254 ****
                                $this->cat_id = $building['cat_id'];
                        }
!                       if ($building['part_of_town_id'] > 0)
                        {
!                               $this->part_of_town_id = 
$building['part_of_town_id'];
                        }
! 
!                       if($receipt['error'] && !$action=='edit')
                        {
!                               $err=true;
                        }
  
--- 263,274 ----
                                $this->cat_id = $building['cat_id'];
                        }
! 
!                       if($error_property_id)
                        {
!                               unset($values['property_id']);
                        }
!                       if($error_building_id)
                        {
!                               unset($values['building_id']);
                        }
  
***************
*** 257,266 ****
                                'menuaction'    => 
$this->currentapp.'.uibuilding.edit',
                                'property_id'   => $property_id,
!                               'building_id'   => $building_id,
!                               'err'                   => $err
                        );
- //_debug_array($link_data);
  
!                       if($building_id)
                        {
                                $attributes_values              = 
$this->bocommon->read_attibutes(array('form'=>true,'type'=>location,'type_id'=>2,'id'=>$property_id
 . '-' . $building_id));
--- 277,284 ----
                                'menuaction'    => 
$this->currentapp.'.uibuilding.edit',
                                'property_id'   => $property_id,
!                               'building_id'   => $building_id
                        );
  
!                       if($values['building_id'])
                        {
                                $attributes_values              = 
$this->bocommon->read_attibutes(array('form'=>true,'type'=>location,'type_id'=>2,'id'=>$property_id
 . '-' . $building_id));
***************
*** 272,279 ****
--- 290,309 ----
                                        'lang_value'    => lang('Value')
                                        );
+                               $location_type='view';
+                       }
+                       else
+                       {
+                               $location_type='form';
                        }
  
+                       
$location_data=$this->bocommon->initiate_ui_location(array(
+                                               'location_type' => 
$location_type,
+                                               'property_id'   => 
$values['property_id'],
+                                               'property_name' => 
$values['property_name']));
+ 
                        $data = array
                        (
+                               'location_type'                                 
=> $location_type,
+                               'location_data'                                 
=> $location_data,
                                'lang_attributes'                               
=> lang('Attributes'),
                                'attributes_header'                             
=> $attributes_header,
***************
*** 283,307 ****
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
                                'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.index'),
-                               'lang_property_id'                              
=> lang('Property ID'),
                                'lang_building_id'                              
=> lang('Building ID'),
                                'lang_name'                                     
        => lang('name'),
!                               'lang_generaladdress'                   => 
lang('General Address'),
!                               'lang_generellinfo'                             
=> lang('General Info'),
                                'lang_category'                                 
=> lang('category'),
                                'lang_access'                                   
=> lang('private'),
                                'lang_save'                                     
        => lang('save'),
                                'lang_done'                                     
        => lang('done'),
!                               'value_property_id'                             
=> $values['property_id'],
                                'value_building_id'                             
=> $values['building_id'],
!                               'value_name'                                    
=> $building['name'],
!                               'value_generaladdress'                  => 
$building['generaladdress'],
!                               'value_access'                                  
=> $building['access'],
!                               'value_cat'                                     
        => $building['cat'],
                                'error'                                         
        => $receipt['error'],
                                'message'                                       
        => $receipt['message'],
                                'lang_name_statustext'                  => 
lang('Enter the name of the building'),
                                'lang_property_id_statustext'   => lang('Enter 
Property ID'),
                                'lang_building_id_statustext'   => lang('Enter 
Building ID'),
!                               'lang_generaladdress_statustext'=> lang('Enter 
the general address'),
                                'lang_done_statustext'                  => 
lang('Back to the list'),
                                'lang_save_statustext'                  => 
lang('Save the building'),
--- 313,336 ----
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
                                'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.index'),
                                'lang_building_id'                              
=> lang('Building ID'),
                                'lang_name'                                     
        => lang('name'),
!                               'lang_general_address'                  => 
lang('General Address'),
                                'lang_category'                                 
=> lang('category'),
                                'lang_access'                                   
=> lang('private'),
                                'lang_save'                                     
        => lang('save'),
                                'lang_done'                                     
        => lang('done'),
!                               'lang_remark'                                   
=> lang('remark'),
                                'value_building_id'                             
=> $values['building_id'],
!                               'value_name'                                    
=> $values['name'],
!                               'value_general_address'                 => 
$values['general_address'],
!                               'value_access'                                  
=> $values['access'],
!                               'value_remark'                                  
=> $values['remark'],
                                'error'                                         
        => $receipt['error'],
+                               'error_flag'                                    
=> $error_id,
                                'message'                                       
        => $receipt['message'],
                                'lang_name_statustext'                  => 
lang('Enter the name of the building'),
                                'lang_property_id_statustext'   => lang('Enter 
Property ID'),
                                'lang_building_id_statustext'   => lang('Enter 
Building ID'),
!                               'lang_general_address_statustext'=> lang('Enter 
the general address'),
                                'lang_done_statustext'                  => 
lang('Back to the list'),
                                'lang_save_statustext'                  => 
lang('Save the building'),
***************
*** 311,327 ****
                                'lang_cat_statustext'                   => 
lang('Select the category the building belongs to. To do not use a category 
select NO CATEGORY'),
                                'select_name'                                   
=> 'values[cat_id]',
!                               'lang_town_statustext'                  => 
lang('Select the part of town the building belongs to. To do not use a part of 
town -  select NO PART OF TOWN'),
!                               'lang_part_of_town'                             
=> lang('Part of town'),
!                               'lang_no_part_of_town'                  => 
lang('No part of town'),
!                               'cat_list'                                      
        => 
$this->bocommon->select_category_building_list('select',$this->cat_id),
!                               'part_of_town_list'                             
=> $this->bocommon->select_part_of_town('select',$this->part_of_town_id),
!                               'select_name_part_of_town'              => 
'values[part_of_town_id]',
!                               'district_id'                                   
=> $building['district_id'],
!                               'part_of_town'                                  
=> $building['part_of_town'],
!                               'building_type_id'                              
=> $building['building_type_id'],
!                               'location_code'                                 
=> $building['location_code'],
!                               'value_generellinfo'                    => 
$building['generellinfo']
! 
! 
                        );
  
--- 340,345 ----
                                'lang_cat_statustext'                   => 
lang('Select the category the building belongs to. To do not use a category 
select NO CATEGORY'),
                                'select_name'                                   
=> 'values[cat_id]',
!                               'lang_remark_statustext'                => 
lang('Enter any remarks regarding this building'),
!                               'cat_list'                                      
        => 
$this->bocommon->select_category_building_list('select',$values['cat_id'])
                        );
  
***************
*** 372,391 ****
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('building',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
  
!                       $building = 
$this->bo->read_single($property_id,$building_id);
  
                        $data = array
                        (
!                               'appname'                       => 
lang('building'),
!                               'function_msg'          => lang('view 
building'),
!                               'done_action'           => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.index'),
!                               'lang_name'                     => lang('name'),
!                               'lang_category'         => lang('category'),
!                               'lang_access'           => lang('access'),
!                               'lang_time_created'     => lang('time created'),
!                               'lang_done'                     => lang('done'),
!                               'value_name'            => $building['name'],
!                               'value_access'          => 
lang(ucfirst($building['access'])),
!                               'value_cat'                     => 
$this->cats->id2name($building['cat']),
!                               'value_date'            => 
$GLOBALS['phpgw']->common->show_date($building['date'])
                        );
  
--- 390,436 ----
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('building',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header'));
  
!                       $values = 
$this->bo->read_single($property_id,$building_id);
! 
!                       $attributes_values              = 
$this->bocommon->read_attibutes(array('form'=>true,'type'=>location,'type_id'=>2,'id'=>$property_id
 . '-' . $building_id));
!                       $attributes_header[]    = array
!                               (
!                                       'lang_name'             => lang('Name'),
!                                       'lang_descr'    => lang('Description'),
!                                       'lang_datatype' => lang('Datatype'),
!                                       'lang_value'    => lang('Value')
!                                       );
!                       $location_type='view';
! 
!                       
$location_data=$this->bocommon->initiate_ui_location(array(
!                                               'location_type' => 
$location_type,
!                                               'property_id'   => 
$values['property_id'],
!                                               'property_name' => 
$values['property_name']));
  
                        $data = array
                        (
!                               'location_type'                                 
=> $location_type,
!                               'location_data'                                 
=> $location_data,
!                               'lang_attributes'                               
=> lang('Attributes'),
!                               'attributes_header'                             
=> $attributes_header,
!                               'attributes_values'                             
=> $attributes_values,
!                               'appname'                                       
        => lang('building'),
!                               'function_msg'                                  
=> lang('view building'),
!                               'value_building_id'                             
=> $values['building_id'],
!                               'value_name'                                    
=> $values['name'],
!                               'value_general_address'                 => 
$values['general_address'],
!                               'value_access'                                  
=> $values['access'],
!                               'value_remark'                                  
=> $values['remark'],
!                               'lang_remark'                                   
=> lang('remark'),
!                               'value_category'                                
=> $this->bo->read_category_name($values['cat_id']),
!                               'lang_building_id'                              
=> lang('Building ID'),
!                               'lang_name'                                     
        => lang('name'),
!                               'lang_general_address'                  => 
lang('General Address'),
!                               'lang_category'                                 
=> lang('category'),
!                               'lang_done'                                     
=> lang('done'),
!                               'lang_edit'                                     
=> lang('Edit'),
!                               'edit_action'                           => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.edit&property_id='
 . $property_id . '&building_id=' . $building_id),
!                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibuilding.index'),
!                               'lang_done_statustext'          => lang('Back 
to the list'),
!                               'lang_edit_statustext'          => lang('Edit 
this entry equipment'),
                        );
  

Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uiequipment.inc.php   18 Feb 2003 20:38:18 -0000      1.7
--- class.uiequipment.inc.php   21 Feb 2003 10:28:59 -0000      1.8
***************
*** 288,292 ****
                                if ($id)
                                {
!                                       $values                 = 
$this->bo->read_single($id);
                                }
                        }
--- 288,292 ----
                                if ($id)
                                {
!                                       $values = $this->bo->read_single($id);
                                }
                        }
***************
*** 294,298 ****
                        if ($id)
                        {
!                               $function_msg   = lang('edit equipment');
                        }
                        else
--- 294,298 ----
                        if ($id)
                        {
!                               $function_msg = lang('edit equipment');
                        }
                        else
***************
*** 306,311 ****
                        }
  
                        
$location_data=$this->bocommon->initiate_ui_location(array(
!                                               'form'                  => true,
                                                'equipment'             => 
false,
                                                'tenant'                => 
false,
--- 306,312 ----
                        }
  
+ 
                        
$location_data=$this->bocommon->initiate_ui_location(array(
!                                               'location_type' => 'form',
                                                'equipment'             => 
false,
                                                'tenant'                => 
false,
***************
*** 377,381 ****
                                'vendor_data'                                   
=> $vendor_data,
                                'location_data'                                 
=> $location_data,
!                               'location_type'                                 
=> 'form',
                                'appname'                                       
        => lang('equipment'),
                                'function_msg'                                  
=> $function_msg,
--- 378,382 ----
                                'vendor_data'                                   
=> $vendor_data,
                                'location_data'                                 
=> $location_data,
!                               'location_type'                                 
=> $location_type,
                                'appname'                                       
        => lang('equipment'),
                                'function_msg'                                  
=> $function_msg,
***************
*** 464,468 ****
  
                        
$location_data=$this->bocommon->initiate_ui_location(array(
!                                               'form'                  => 
false,
                                                'equipment'             => 
false,
                                                'tenant'                => 
false,
--- 465,469 ----
  
                        
$location_data=$this->bocommon->initiate_ui_location(array(
!                                               'location_type' => 'view',
                                                'equipment'             => 
false,
                                                'tenant'                => 
false,

Index: class.uiinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uiinvestment.inc.php  15 Feb 2003 19:51:39 -0000      1.8
--- class.uiinvestment.inc.php  21 Feb 2003 10:28:59 -0000      1.9
***************
*** 442,446 ****
  
                        
$location_data=$this->bocommon->initiate_ui_location(array('equipment'          
=> True,
!                                                                               
                                                                'form'          
=> true,
                                                                                
                                                                'tenant'        
        => False,
                                                                                
                                                                'property_id'   
=> $values['property_id'],
--- 442,446 ----
  
                        
$location_data=$this->bocommon->initiate_ui_location(array('equipment'          
=> True,
!                                                                               
                                                                'location_type' 
=> 'form',
                                                                                
                                                                'tenant'        
        => False,
                                                                                
                                                                'property_id'   
=> $values['property_id'],

Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.uiproperty.inc.php    18 Feb 2003 20:38:18 -0000      1.9
--- class.uiproperty.inc.php    21 Feb 2003 10:28:59 -0000      1.10
***************
*** 270,274 ****
                                'lang_property_id'                              
=> lang('Property ID'),
                                'lang_name'                                     
        => lang('name'),
!                               'lang_generaladdress'                   => 
lang('General Address'),
                                'lang_generellinfo'                             
=> lang('General Info'),
                                'lang_category'                                 
=> lang('category'),
--- 270,274 ----
                                'lang_property_id'                              
=> lang('Property ID'),
                                'lang_name'                                     
        => lang('name'),
!                               'lang_general_address'                  => 
lang('General Address'),
                                'lang_generellinfo'                             
=> lang('General Info'),
                                'lang_category'                                 
=> lang('category'),
***************
*** 278,282 ****
                                'value_property_id'                             
=> $property_id,
                                'value_name'                                    
=> $property['name'],
!                               'value_generaladdress'                  => 
$property['generaladdress'],
                                'value_access'                                  
=> $property['access'],
                                'value_cat'                                     
        => $property['cat'],
--- 278,282 ----
                                'value_property_id'                             
=> $property_id,
                                'value_name'                                    
=> $property['name'],
!                               'value_general_address'                 => 
$property['general_address'],
                                'value_access'                                  
=> $property['access'],
                                'value_cat'                                     
        => $property['cat'],
***************
*** 285,289 ****
                                'lang_property_id_statustext'   => lang('Enter 
the Property ID'),
                                'lang_name_statustext'                  => 
lang('Enter the name of the property'),
!                               'lang_generaladdress_statustext'=> lang('Enter 
the general address'),
                                'lang_done_statustext'                  => 
lang('Back to the list'),
                                'lang_save_statustext'                  => 
lang('Save the property'),
--- 285,289 ----
                                'lang_property_id_statustext'   => lang('Enter 
the Property ID'),
                                'lang_name_statustext'                  => 
lang('Enter the name of the property'),
!                               'lang_general_address_statustext'=> lang('Enter 
the general address'),
                                'lang_done_statustext'                  => 
lang('Back to the list'),
                                'lang_save_statustext'                  => 
lang('Save the property'),
***************
*** 353,357 ****
  
                        $property = $this->bo->read_single($property_id);
!       _debug_array($property);
  
                        $attributes_values              = 
$this->bocommon->read_attibutes(array('form'=>false,'type'=>location,'type_id'=>1,'id'=>$property_id));
--- 353,357 ----
  
                        $property = $this->bo->read_single($property_id);
! //    _debug_array($property);
  
                        $attributes_values              = 
$this->bocommon->read_attibutes(array('form'=>false,'type'=>location,'type_id'=>1,'id'=>$property_id));
***************
*** 373,377 ****
                                'lang_part_of_town'                             
=> lang('Part of town'),
                                'lang_district'                                 
=> lang('District'),
!                               'lang_generaladdress'                   => 
lang('General Address'),
                                'lang_generellinfo'                             
=> lang('General Info'),
                                'lang_category'                                 
=> lang('category'),
--- 373,377 ----
                                'lang_part_of_town'                             
=> lang('Part of town'),
                                'lang_district'                                 
=> lang('District'),
!                               'lang_general_address'                  => 
lang('General Address'),
                                'lang_generellinfo'                             
=> lang('General Info'),
                                'lang_category'                                 
=> lang('category'),
***************
*** 381,385 ****
                                'value_property_id'                             
=> $property_id,
                                'value_name'                                    
=> $property['name'],
!                               'value_generaladdress'                  => 
$property['generaladdress'],
                                'value_access'                                  
=> $property['access'],
                                'value_district'                                
=> $property['district_id'],
--- 381,385 ----
                                'value_property_id'                             
=> $property_id,
                                'value_name'                                    
=> $property['name'],
!                               'value_general_address'                 => 
$property['general_address'],
                                'value_access'                                  
=> $property['access'],
                                'value_district'                                
=> $property['district_id'],
***************
*** 387,401 ****
                                'value_category'                                
=> $this->bo->read_category_name($property['cat_id']),
                                'value_generellinfo'                    => 
$property['generellinfo'],
!                               'appname'                       => 
lang('property'),
!                               'function_msg'          => lang('view 
property'),
!                               'done_action'           => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.index'),
!                               'lang_content'          => lang('content'),
!                               'lang_category'         => lang('category'),
!                               'lang_access'           => lang('access'),
!                               'lang_time_created'     => lang('time created'),
!                               'value_content'         => $property['content'],
!                               'value_access'          => 
lang(ucfirst($property['access'])),
!                               'value_cat'                     => 
$this->cats->id2name($property['cat']),
!                               'value_date'            => 
$GLOBALS['phpgw']->common->show_date($property['date']),
                                'edit_action'                           => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.edit&property_id='
 . $property_id),
                                'lang_done_statustext'          => lang('Back 
to the list'),
--- 387,400 ----
                                'value_category'                                
=> $this->bo->read_category_name($property['cat_id']),
                                'value_generellinfo'                    => 
$property['generellinfo'],
!                               'appname'                               => 
lang('property'),
!                               'function_msg'                  => lang('view 
property'),
!                               'done_action'                   => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.index'),
!                               'lang_content'                  => 
lang('content'),
!                               'lang_category'                 => 
lang('category'),
!                               'lang_access'                   => 
lang('access'),
!                               'lang_time_created'             => lang('time 
created'),
!                               'value_content'                 => 
$property['content'],
!                               'value_access'                  => 
lang(ucfirst($property['access'])),
!                               'value_date'                    => 
$GLOBALS['phpgw']->common->show_date($property['date']),
                                'edit_action'                           => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.edit&property_id='
 . $property_id),
                                'lang_done_statustext'          => lang('Back 
to the list'),

Index: class.uistandard_2.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_2.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uistandard_2.inc.php  11 Feb 2003 10:01:57 -0000      1.4
--- class.uistandard_2.inc.php  21 Feb 2003 10:28:59 -0000      1.5
***************
*** 206,210 ****
                                'value_id'                              => $id,
                                'value_name'                                    
=> $standard['name'],
!                               'value_generaladdress'                  => 
$standard['generaladdress'],
                                'message'                                       
        => $message,
                                'lang_id_standardtext'  => lang('Enter the 
standard ID'),
--- 206,210 ----
                                'value_id'                              => $id,
                                'value_name'                                    
=> $standard['name'],
!                               'value_generaladdress'                  => 
$standard['general_address'],
                                'message'                                       
        => $message,
                                'lang_id_standardtext'  => lang('Enter the 
standard ID'),

Index: class.uistandard_3.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_3.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uistandard_3.inc.php  27 Jan 2003 10:40:31 -0000      1.2
--- class.uistandard_3.inc.php  21 Feb 2003 10:28:59 -0000      1.3
***************
*** 206,210 ****
                                'value_id'                              => $id,
                                'value_num'                                     
=> $standard['num'],
!                               'value_generaladdress'                  => 
$standard['generaladdress'],
                                'message'                                       
        => $message,
                                'lang_id_standardtext'  => lang('Enter the 
standard ID'),
--- 206,210 ----
                                'value_id'                              => $id,
                                'value_num'                                     
=> $standard['num'],
!                               'value_generaladdress'                  => 
$standard['general_address'],
                                'message'                                       
        => $message,
                                'lang_id_standardtext'  => lang('Enter the 
standard ID'),

Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uitts.inc.php 15 Feb 2003 19:51:39 -0000      1.10
--- class.uitts.inc.php 21 Feb 2003 10:28:59 -0000      1.11
***************
*** 264,268 ****
  
                        
$location_data=$this->bocommon->initiate_ui_location(array(
!                                                                               
                'form'                  => true,
                                                                                
                'equipment'             => false,
                                                                                
                'tenant'                => true,
--- 264,268 ----
  
                        
$location_data=$this->bocommon->initiate_ui_location(array(
!                                                                               
                'location_type' => 'form',
                                                                                
                'equipment'             => false,
                                                                                
                'tenant'                => true,





reply via email to

[Prev in Thread] Current Thread [Next in Thread]