[Phpgroupware-cvs] property/inc class.uitts.inc.php, 1.8 class.sotts.inc.php, 1.4 class.sorequest.inc.php, 1.4 class.uirequest.inc.php, 1.7

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.uitts.inc.php lines: +16 -1
            class.sotts.inc.php lines: +3 -3
            class.sorequest.inc.php lines: +5 -4
            class.uirequest.inc.php lines: +25 -2

Log Message:
no message

====================================================
Index: property/inc/class.uitts.inc.php
diff -u property/inc/class.uitts.inc.php:1.7 
property/inc/class.uitts.inc.php:1.8
--- property/inc/class.uitts.inc.php:1.7        Mon Jan 24 10:30:56 2005
+++ property/inc/class.uitts.inc.php    Mon Jan 24 11:41:32 2005
@@ -806,6 +806,19 @@
                                                'entity_data'   => $ticket['p']
                                                ));

+
+                       if($ticket['contact_phone'])
+                       {
+                               for 
($i=0;$i<count($location_data['location']);$i++)
+                               {
+                                       
if($location_data['location'][$i]['input_name'] == 'contact_phone')
+                                       {
+                                               
unset($location_data['location'][$i]['value']);
+                                       }
+                               }
+                       }
+
+
                        if ($ticket['cat_id'])
                        {
                                $this->cat_id = $ticket['cat_id'];
@@ -979,6 +992,8 @@
                                'lang_save'                                     
        => lang('save'),
                                'lang_name'                                     
        => lang('name'),
                                'lang_done'                                     
        => lang('done'),
+                               'lang_contact_phone'                    => 
lang('Contact phone'),
+                               'contact_phone'                                 
=> $ticket['contact_phone']
                        );

                        $appname                                                
= lang('helpdesk');

====================================================
Index: property/inc/class.sotts.inc.php
diff -u property/inc/class.sotts.inc.php:1.3 
property/inc/class.sotts.inc.php:1.4
--- property/inc/class.sotts.inc.php:1.3        Thu Jan 13 16:52:48 2005
+++ property/inc/class.sotts.inc.php    Mon Jan 24 11:41:32 2005
@@ -302,7 +302,7 @@
                                $ticket['priority']                     = 
$this->db->f('priority');
                                $ticket['details']                      = 
stripslashes($this->db->f('details'));
                                $ticket['location_code']        = 
$this->db->f('location_code');
-//                             $ticket['contact_phone']        = 
$this->db->f('contact_phone');
+                               $ticket['contact_phone']        = 
$this->db->f('contact_phone');
                                $ticket['address']                      = 
$this->db->f('address');
                                $ticket['tenant_id']            = 
$this->db->f('tenant_id');
                                $ticket['p_num']                        = 
$this->db->f('p_num');
@@ -466,7 +466,7 @@
                                . "VALUES ($values $vals )",__LINE__,__FILE__);

                        $id = 
$this->db->get_last_insert_id('fm_tts_tickets','id');
-                       if($ticket['extra']['contact_phone'])
+                       if($ticket['extra']['contact_phone'] && 
$ticket['extra']['tenant_id'])
                        {
                                $this->db->query("update fm_tenant set 
contact_phone='". $ticket['extra']['contact_phone']. "' where id='". 
$ticket['extra']['tenant_id']. "'",__LINE__,__FILE__);
                        }

====================================================
Index: property/inc/class.sorequest.inc.php
diff -u property/inc/class.sorequest.inc.php:1.3 
property/inc/class.sorequest.inc.php:1.4
--- property/inc/class.sorequest.inc.php:1.3    Thu Jan 13 16:52:48 2005
+++ property/inc/class.sorequest.inc.php        Mon Jan 24 11:41:31 2005
@@ -370,6 +370,7 @@
                                $request['p_num']                               
                = $this->db->f('p_num');
                                $request['p_entity_id']                         
        = $this->db->f('p_entity_id');
                                $request['p_cat_id']                            
        = $this->db->f('p_cat_id');
+                               $request['contact_phone']                       
        = $this->db->f('contact_phone');

                                $request['power_meter'] = 
$this->soproject->get_power_meter($this->db->f('location_code'));
                        }
@@ -528,9 +529,9 @@
                        $this->update_score('',$request['request_id']);


-                       if($request['contact_phone'])
+                       if($request['extra']['contact_phone'] && 
$request['extra']['tenant_id'])
                        {
-                               $this->db->query("update fm_tenant set 
contact_phone='". $request['contact_phone']. "' where id='". 
$request['tenant_id']. "'",__LINE__,__FILE__);
+                               $this->db->query("update fm_tenant set 
contact_phone='". $request['extra']['contact_phone']. "' where id='". 
$request['extra']['tenant_id']. "'",__LINE__,__FILE__);
                        }

                        if ($request['power_meter'] )
@@ -638,7 +639,7 @@

                        $this->update_score('',$request['request_id']);

-                       if($request['extra']['contact_phone'])
+                       if($request['extra']['contact_phone'] && 
$request['extra']['tenant_id'])
                        {
                                $this->db->query("update fm_tenant set 
contact_phone='". $request['extra']['contact_phone']. "' where id='". 
$request['extra']['tenant_id']. "'",__LINE__,__FILE__);
                        }

====================================================
Index: property/inc/class.uirequest.inc.php
diff -u property/inc/class.uirequest.inc.php:1.6 
property/inc/class.uirequest.inc.php:1.7
--- property/inc/class.uirequest.inc.php:1.6    Thu Jan 13 16:52:48 2005
+++ property/inc/class.uirequest.inc.php        Mon Jan 24 11:41:32 2005
@@ -661,6 +661,17 @@
                                                ));


+                       if($values['contact_phone'])
+                       {
+                               for 
($i=0;$i<count($location_data['location']);$i++)
+                               {
+                                       
if($location_data['location'][$i]['input_name'] == 'contact_phone')
+                                       {
+                                               
$location_data['location'][$i]['value'] = $values['contact_phone'];
+                                       }
+                               }
+                       }
+
                        if($values['origin']== 'tts')
                        {
                                $origin_data = array
@@ -958,6 +969,16 @@
                                                'entity_data'   => $values['p']
                                                ));

+                       if($values['contact_phone'])
+                       {
+                               for 
($i=0;$i<count($location_data['location']);$i++)
+                               {
+                                       
if($location_data['location'][$i]['input_name'] == 'contact_phone')
+                                       {
+                                               
unset($location_data['location'][$i]['value']);
+                                       }
+                               }
+                       }


                        $link_data = array
@@ -1104,7 +1125,9 @@
                                'edit_action'                                   
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.edit&id='
 . $id),
                                'lang_edit_statustext'                          
=> lang('Edit this entry request'),
                                'lang_edit'                                     
                => lang('Edit'),
-                               'currency'                                      
                => 
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
+                               'currency'                                      
                => 
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
+                               'lang_contact_phone'                    => 
lang('Contact phone'),
+                               'contact_phone'                                 
=> $values['contact_phone']
                        );

                        $appname                                                
= lang('request');