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

[Sigurd Nes <address@hidden>]

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

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

Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.soworkorder.inc.php   13 Mar 2003 10:25:06 -0000      1.3
--- class.soworkorder.inc.php   13 Mar 2003 18:25:51 -0000      1.4
***************
*** 237,241 ****
                                $project['descr']                               
= $this->db->f('descr');
                                $project['status']                              
= $this->db->f('status');
!                               $project['budget']                              
= $this->db->f('budget');
                                $project['actual_cost']                 = 
$this->db->f('actual_cost');
                                $project['tenant_id']                   = 
$this->db->f('tenant_id');
--- 237,241 ----
                                $project['descr']                               
= $this->db->f('descr');
                                $project['status']                              
= $this->db->f('status');
!                               $project['budget']                              
= (int)$this->db->f('budget');
                                $project['actual_cost']                 = 
$this->db->f('actual_cost');
                                $project['tenant_id']                   = 
$this->db->f('tenant_id');
***************
*** 393,421 ****
                }
  
!               function edit($equipment)
                {
!                       $equipment['descr'] = 
$this->db->db_addslashes($equipment['descr']);
  
!                       $this->db->query("UPDATE fm_equipment set
!                               lifetime='" . $equipment['lifetime'] . "',
!                               status='" . $equipment['status'] . "',
!                               equipment_type_id='"    . $equipment['cat_id'] 
. "',
!                               cost='" . $equipment['cost'] . "',
!                               date='" . $equipment['date'] . "',
!                               descr='" . $equipment['descr'] . "',
!                               location_code='" . $equipment['location_code'] 
. "',
!                               property_id='" . $equipment['property_id'] . "',
!                               property_name='" . $equipment['property_name'] 
. "',
!                               building_id='" . $equipment['building_id'] . "',
!                               entrance_id='" . $equipment['entrance_id'] . "',
!                               floor='" . $equipment['floor'] . "',
!                               apartment_id='" . $equipment['apartment_id'] . 
"',
!                               street_name='" . $equipment['street_name'] . "',
!                               street_number='" . $equipment['street_number'] 
. "',
!                               vendor_id='" . $equipment['vendor_id']
!                               . "' WHERE equipment_id= '" . 
$equipment['equipment_id'] ."'",__LINE__,__FILE__);
  
!                       $receipt['message'][] = array('msg'=>lang('equipment 
has been edited'));
                        return $receipt;
                }
  
--- 393,464 ----
                }
  
!               function p_edit($project)
                {
!                       $project['descr'] = 
$this->db->db_addslashes($project['descr']);
!                       $project['name'] = 
$this->db->db_addslashes($project['name']);
!                       $project['title'] = 
$this->db->db_addslashes($project['title']);
! //_debug_array($project);
! 
!                       $this->db->query("UPDATE fm_wo_project set
!                               name                    ='" . $project['name'] 
. "',
!                               status                  ='" . 
$project['status'] . "',
!                               category                ='" . 
$project['cat_id'] . "',
!                               start_date              ='" . 
$project['start_date'] . "',
!                               end_date                ='" . 
$project['end_date'] . "',
!                               coordinator             ='" . 
$project['coordinator'] . "',
!                               descr                   ='" . $project['descr'] 
. "',
!                               title                   ='"     . 
$project['title'] . "',
!                               budget                  ='" . 
(int)$project['budget'] . "',
!                               key_deliver             ='" . 
$project['key_deliver'] . "',
!                               key_fetch               ='" . 
$project['key_fetch'] . "',
!                               other_branch    ='" . $project['other_branch'] 
. "',
!                               key_responsible ='" . 
$project['key_responsible'] . "',
!                               tenant_id               ='" . 
$project['tenant_id'] . "',
!                               charge_tenant   ='" . $project['charge_tenant'] 
. "',
!                               location_code   ='" . $project['location_code'] 
. "',
!                               property_id             ='" . 
$project['property_id'] . "',
!                               property_name   ='" . $project['property_name'] 
. "',
!                               building_id             ='" . 
$project['building_id'] . "',
!                               entrance_id             ='" . 
$project['entrance_id'] . "',
!                               floor                   ='" . $project['floor'] 
. "',
!                               apartment_id    ='" . $project['apartment_id'] 
. "',
!                               street_name             ='" . 
$project['street_name'] . "',
!                               street_number   ='" . $project['street_number']
!                               . "' WHERE id= '" . $project['project_id'] 
."'",__LINE__,__FILE__);
  
!                       if($project['tenant_phone'])
!                       {
!                               $this->db->query("update fm_tenant set 
contact_phone='". $project['tenant_phone']. "' where tenant_id='". 
$project['tenant_id']. "'",__LINE__,__FILE__);
!                       }
  
!                       if ($project['power_meter'] &&($project['apartment_id'] 
|| $project['entrance_id']))
!                       {
!                               if($project['entrance_id'])
!                               {
!                                       $el_meter_table='fm_entrance';
!                               }
!                               if($project['apartment_id'])
!                               {
!                                       $el_meter_table='fm_apartment';
!                               }
! 
!                               $this->db->query("update $el_meter_table set 
power_meter_id='" . $project['power_meter']. "' where location_code='" . 
$project['location_code']. "'",__LINE__,__FILE__);
!                       }
! 
!       // -----------------which branch is represented
!                       $this->db->query("delete from fm_wo_projectbranch where 
project_id='" . $project['project_id'] ."'",__LINE__,__FILE__);
! 
!                       if (count($project['branch']) != 0)
!                       {
!                               while($branch=each($project['branch']))
!                               {
!                                       $this->db->query("insert into 
fm_wo_projectbranch (project_id,branch_id) values ('" . $project['project_id']. 
"','$branch[1]')",__LINE__,__FILE__);
!                               }
!                       }
! 
! 
!                       $receipt['message'][] = array('msg'=>lang('project %1 
has been edited',$project['project_id']));
                        return $receipt;
+ 
                }