[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.boworkorder.inc.php,1.1,1.2 c
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.boworkorder.inc.php,1.1,1.2 class.soworkorder.inc.php,1.1,1.2 class.uiworkorder.inc.php,1.1,1.2 |
|
Date: |
Thu, 13 Mar 2003 04:55:55 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv26019/inc
Modified Files:
class.boworkorder.inc.php class.soworkorder.inc.php
class.uiworkorder.inc.php
Log Message:
no message
Index: class.boworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boworkorder.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.boworkorder.inc.php 12 Mar 2003 21:39:57 -0000 1.1
--- class.boworkorder.inc.php 13 Mar 2003 09:54:49 -0000 1.2
***************
*** 343,347 ****
$project['workorder_budget'][$i]['budget']=number_format($workorder_budget[$i]['budget'],
2, ',', ' ');
}
! $project['sum_workorder_budget']=
number_format($sum_workorder_budget, 2, ',', ' ');
//_debug_array($project);
--- 343,350 ----
$project['workorder_budget'][$i]['budget']=number_format($workorder_budget[$i]['budget'],
2, ',', ' ');
}
! if($sum_workorder_budget)
! {
! $project['sum_workorder_budget']=
number_format($sum_workorder_budget, 2, ',', ' ');
! }
//_debug_array($project);
***************
*** 356,362 ****
function p_save($project,$action='')
{
! $date = $this->bocommon->date_array($project['date']);
! $project['date'] = mktime
(2,0,0,$date['month'],$date['day'],$date['year']);
if ($action=='edit')
--- 359,367 ----
function p_save($project,$action='')
{
! $start_date =
$this->bocommon->date_array($project['start_date']);
! $end_date =
$this->bocommon->date_array($project['end_date']);
! $project['start_date'] = mktime
(2,0,0,$start_date['month'],$start_date['day'],$start_date['year']);
! $project['end_date'] = mktime
(2,0,0,$end_date['month'],$end_date['day'],$end_date['year']);
if ($action=='edit')
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.soworkorder.inc.php 12 Mar 2003 21:39:57 -0000 1.1
--- class.soworkorder.inc.php 13 Mar 2003 09:54:54 -0000 1.2
***************
*** 323,337 ****
$project['descr'] =
$this->db->db_addslashes($project['descr']);
! //_debug_array($project);
! $this->db->query("INSERT INTO fm_wo_project
(id,equipment_id,lifetime,status,equipment_type_id,cost,date,descr,location_code,
property_id,property_name,building_id,entrance_id,floor,apartment_id,street_name,street_number,vendor_id,owner)
"
. "VALUES ('"
. $project['project_id']. "','"
. $project['equipment_id']. "','"
! . $project['lifetime']. "','"
! . $project['status']. "','"
. $project['cat_id']. "','"
! . $project['cost']. "','"
! . $project['date']. "','"
. $project['descr']. "','"
. $project['location_code']. "','"
. $project['property_id']. "','"
--- 323,346 ----
$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("INSERT INTO fm_wo_project
(id,name,equipment_id,access,category,entry_date,start_date,end_date,coordinator,status,"
! .
"descr,title,budget,location_code,property_id,property_name,building_id,entrance_id,floor,apartment_id,"
! .
"street_name,street_number,key_deliver,key_fetch,other_branch,key_responsible,tenant_id,charge_tenant,owner)
"
. "VALUES ('"
. $project['project_id']. "','"
+ . $project['name']. "','"
. $project['equipment_id']. "','"
! . "public','"
. $project['cat_id']. "','"
! . time() . "','"
! . $project['start_date']. "','"
! . $project['end_date']. "','"
! . $project['coordinator']. "','"
! . $project['status']. "','"
. $project['descr']. "','"
+ . $project['title']. "','"
+ . $project['budget']. "','"
. $project['location_code']. "','"
. $project['property_id']. "','"
***************
*** 343,350 ****
. $project['street_name'] . "','"
. $project['street_number'] . "','"
! . $project['vendor_id'] . "','"
. $this->account. "')",__LINE__,__FILE__);
! $receipt['message'][] = array('msg'=>lang('project has
been saved'));
return $receipt;
}
--- 352,394 ----
. $project['street_name'] . "','"
. $project['street_number'] . "','"
! . $project['key_deliver']. "','"
! . $project['key_fetch']. "','"
! . $project['other_branch']. "','"
! . $project['key_responsible']. "','"
! . $project['tenant_id']. "','"
! . $project['charge_tenant'] . "','"
. $this->account. "')",__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
! 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 saved',$project['project_id']));
return $receipt;
}
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uiworkorder.inc.php 12 Mar 2003 21:39:57 -0000 1.1
--- class.uiworkorder.inc.php 13 Mar 2003 09:54:57 -0000 1.2
***************
*** 241,246 ****
$values['street_name'] =
get_var('street_name',array('POST'));
$values['street_number'] =
get_var('street_number',array('POST'));
! // $values['vendor_id'] =
get_var('vendor_id',array('POST'));
! // $values['vendor_name'] =
get_var('vendor_name',array('POST'));
$values['start_date'] =
get_var('start_date',array('POST'));
$values['end_date'] =
get_var('end_date',array('POST'));
--- 241,247 ----
$values['street_name'] =
get_var('street_name',array('POST'));
$values['street_number'] =
get_var('street_number',array('POST'));
! $values['tenant_id'] =
get_var('tenant_id',array('POST'));
! $values['tenant_name'] =
get_var('tenant_name',array('POST'));
! $values['tenant_phone'] =
get_var('tenant_phone',array('POST'));
$values['start_date'] =
get_var('start_date',array('POST'));
$values['end_date'] =
get_var('end_date',array('POST'));
***************
*** 279,282 ****
--- 280,289 ----
if(!$receipt['error'])
{
+ if($values['copy_project'])
+ {
+ $action='add';
+ $values['project_id'] =
$this->socommon->next_id('fm_wo_project');
+ $id = $values['project_id'];
+ }
$receipt =
$this->bo->p_save($values,$action);
$id = $values['project_id'];
***************
*** 351,355 ****
'street_name' =>
$values['street_name'],
'street_number' =>
$values['street_number'],
! 'tenant_phone' =>
$values['contact_phone'],
'apartment_id' =>
$values['apartment_id']));
--- 358,364 ----
'street_name' =>
$values['street_name'],
'street_number' =>
$values['street_number'],
! 'tenant_id' =>
$values['tenant_id'],
! 'tenant_name' =>
$values['tenant_name'],
! 'tenant_phone' =>
$values['tenant_phone'],
'apartment_id' =>
$values['apartment_id']));
***************
*** 405,409 ****
$data = array
(
- 'copy_project'
=> $values['copy_project'],
'calendar_gif'
=> './'.$this->currentapp.'/templates/default/images/calendar.gif',
'calendar_source'
=> './'.$this->currentapp.'/inc/calendar.js',
--- 414,417 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.boworkorder.inc.php,1.1,1.2 class.soworkorder.inc.php,1.1,1.2 class.uiworkorder.inc.php,1.1,1.2,
Sigurd Nes <address@hidden> <=