[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.borequest.inc.php, 1.9, 1.10
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.borequest.inc.php, 1.9, 1.10 class.boworkorder.inc.php, 1.12, 1.13 class.soproject.inc.php, 1.29, 1.30 class.sorequest.inc.php, 1.16, 1.17 class.soworkorder.inc.php, 1.20, 1.21 class.uirequest.inc.php, 1.25, 1.26 class.uiwo_hour.inc.php, 1.33, 1.34 class.uiworkorder.inc.php, 1.32, 1.33 |
|
Date: |
Tue, 26 Aug 2003 15:16:32 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv21813/inc
Modified Files:
class.borequest.inc.php class.boworkorder.inc.php
class.soproject.inc.php class.sorequest.inc.php
class.soworkorder.inc.php class.uirequest.inc.php
class.uiwo_hour.inc.php class.uiworkorder.inc.php
Log Message:
no message
Index: class.borequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.borequest.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.borequest.inc.php 9 Jul 2003 11:12:16 -0000 1.9
--- class.borequest.inc.php 26 Aug 2003 19:16:30 -0000 1.10
***************
*** 503,509 ****
! function increment_request_id()
{
! return $this->so->increment_request_id();
}
--- 503,509 ----
! function next_id()
{
! return $this->so->next_id();
}
Index: class.boworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boworkorder.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.boworkorder.inc.php 9 Jul 2003 11:12:16 -0000 1.12
--- class.boworkorder.inc.php 26 Aug 2003 19:16:30 -0000 1.13
***************
*** 105,108 ****
--- 105,113 ----
}
+ function next_id()
+ {
+ return $this->so->next_id();
+ }
+
function select_status_list($format='',$selected='')
{
***************
*** 397,406 ****
return $record_history;
- }
-
-
- function increment_workorder_id()
- {
- return $this->so->increment_workorder_id();
}
--- 402,405 ----
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** class.soproject.inc.php 8 Aug 2003 17:07:58 -0000 1.29
--- class.soproject.inc.php 26 Aug 2003 19:16:30 -0000 1.30
***************
*** 389,394 ****
}
-
-
function add($project)
{
--- 389,392 ----
***************
*** 491,498 ****
}
- $this->increment_project_id();
if($this->db->transaction_commit())
{
$this->historylog->add('SO',$project['project_id'],$project['status']);
$this->historylog->add('TO',$project['project_id'],$project['cat_id']);
--- 489,496 ----
}
if($this->db->transaction_commit())
{
+ $this->increment_project_id();
$this->historylog->add('SO',$project['project_id'],$project['status']);
$this->historylog->add('TO',$project['project_id'],$project['cat_id']);
***************
*** 511,515 ****
{
! $this->db->query("SELECT count(*) FROM fm_meter where
location_code='$location_code' and type='power_meter'",__LINE__,__FILE__);
$this->db->next_record();
--- 509,513 ----
{
! $this->db->query("SELECT count(*) FROM fm_meter where
location_code='$location_code' and category=1",__LINE__,__FILE__);
$this->db->next_record();
***************
*** 522,533 ****
{
$meter_id = $this->generate_meter_id();
! $this->db->query("insert into fm_meter
(id,name,type,location_code,entry_date,user_id) "
. "VALUES ('"
. $meter_id. "','"
! . $power_meter. "','"
! . "power_meter','"
. $location_code. "','"
. time() . "','"
! . $this->account.
"')",__LINE__,__FILE__);
}
}
--- 520,531 ----
{
$meter_id = $this->generate_meter_id();
! $this->db->query("insert into fm_meter
(num,name,category,location_code,entry_date,user_id $cols) "
. "VALUES ('"
. $meter_id. "','"
! . $power_meter. "',"
! . "1,'"
. $location_code. "','"
. time() . "','"
! . $this->account. " $vals
')",__LINE__,__FILE__);
}
}
Index: class.sorequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sorequest.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.sorequest.inc.php 17 Jul 2003 10:46:22 -0000 1.16
--- class.sorequest.inc.php 26 Aug 2003 19:16:30 -0000 1.17
***************
*** 430,440 ****
{
$this->db->query("update fm_idgenerator set value =
value + 1 where name = 'request'");
$this->db->query("select value from fm_idgenerator
where name = 'request'");
$this->db->next_record();
! $request_id = $this->db->f('value');
! return $request_id;
}
-
function add($request)
{
--- 430,443 ----
{
$this->db->query("update fm_idgenerator set value =
value + 1 where name = 'request'");
+ }
+
+ function next_id()
+ {
$this->db->query("select value from fm_idgenerator
where name = 'request'");
$this->db->next_record();
! $id = $this->db->f('value')+1;
! return $id;
}
function add($request)
{
***************
*** 464,473 ****
}
-
-
$this->historylog->add('SO',$request['request_id'],$request['status']);
-
$this->historylog->add('TO',$request['request_id'],$request['cat_id']);
-
$this->historylog->add('CO',$request['request_id'],$request['coordinator']);
-
-
if($request['street_name'])
{
--- 467,470 ----
***************
*** 485,489 ****
$request['name'] =
$this->db->db_addslashes($request['name']);
$request['title'] =
$this->db->db_addslashes($request['title']);
! //_debug_array($request);
$this->db->query("insert into fm_request
(id,title,owner,category,descr,location_code,equipment_id,"
.
"address,tenant_id,entry_date,budget,status,branch_id,coordinator,"
--- 482,526 ----
$request['name'] =
$this->db->db_addslashes($request['name']);
$request['title'] =
$this->db->db_addslashes($request['title']);
!
!
! $values= array(
! $request['request_id'],
! $request['title'],
! $this->account,
! $request['cat_id'],
! $request['descr'],
! $request['location_code'],
! $request['equipment_id'],
! $address,
! $request['tenant_id'],
! time(),
! $request['budget'],
! $request['status'],
! $request['branch_id'],
! $request['coordinator'],
! $request['d_safety'],
! $request['d_aesthetics'],
! $request['d_indoor_climate'],
! $request['d_consequential_damage'],
! $request['d_user_gratification'],
! $request['d_residential_environment'],
! $request['c_safety'],
! $request['c_aesthetics'],
! $request['c_indoor_climate'],
! $request['c_consequential_damage'],
! $request['c_user_gratification'],
! $request['c_residential_environment'],
! $request['p_safety'],
! $request['p_aesthetics'],
! $request['p_indoor_climate'],
! $request['p_consequential_damage'],
! $request['p_user_gratification'],
! $request['p_residential_environment'],
! $request['authorities_demands']);
!
! $values = $this->bocommon->validate_db_insert($values);
!
! $this->db->transaction_begin();
!
$this->db->query("insert into fm_request
(id,title,owner,category,descr,location_code,equipment_id,"
.
"address,tenant_id,entry_date,budget,status,branch_id,coordinator,"
***************
*** 491,528 ****
.
"c_safety,c_aesthetics,c_indoor_climate,c_consequential_damage,c_user_gratification,c_residential_environment,"
.
"p_safety,p_aesthetics,p_indoor_climate,p_consequential_damage,p_user_gratification,p_residential_environment,authorities_demands
$cols) "
! . "VALUES ('"
! . $request['request_id']. "','"
! . $request['title']. "','"
! . $this->account. "','"
! . $request['cat_id']. "','"
! . $request['descr']. "','"
! . $request['location_code']. "','"
! . $request['equipment_id']. "','"
! . $address. "','"
! . $request['tenant_id']. "','"
! . time(). "','"
! . $request['budget']. "','"
! . $request['status']. "','"
! . $request['branch_id']. "','"
! . $request['coordinator']. "','"
! . $request['d_safety']. "','"
! . $request['d_aesthetics']. "','"
! . $request['d_indoor_climate']. "','"
! . $request['d_consequential_damage']. "','"
! . $request['d_user_gratification']. "','"
! . $request['d_residential_environment']. "','"
! . $request['c_safety']. "','"
! . $request['c_aesthetics']. "','"
! . $request['c_indoor_climate']. "','"
! . $request['c_consequential_damage']. "','"
! . $request['c_user_gratification']. "','"
! . $request['c_residential_environment']. "','"
! . $request['p_safety']. "','"
! . $request['p_aesthetics']. "','"
! . $request['p_indoor_climate']. "','"
! . $request['p_consequential_damage']. "','"
! . $request['p_user_gratification']. "','"
! . $request['p_residential_environment']. "','"
! . $request['authorities_demands']. "' $vals
)",__LINE__,__FILE__);
--- 528,532 ----
.
"c_safety,c_aesthetics,c_indoor_climate,c_consequential_damage,c_user_gratification,c_residential_environment,"
.
"p_safety,p_aesthetics,p_indoor_climate,p_consequential_damage,p_user_gratification,p_residential_environment,authorities_demands
$cols) "
! . "VALUES ($values $vals )",__LINE__,__FILE__);
***************
*** 549,553 ****
}
! $receipt['message'][] = array('msg'=>lang('request %1
has been saved',$request['request_id']));
return $receipt;
}
--- 553,568 ----
}
! if($this->db->transaction_commit())
! {
! $this->increment_request_id();
!
$this->historylog->add('SO',$request['request_id'],$request['status']);
!
$this->historylog->add('TO',$request['request_id'],$request['cat_id']);
!
$this->historylog->add('CO',$request['request_id'],$request['coordinator']);
! $receipt['message'][] =
array('msg'=>lang('request %1 has been saved',$request['request_id']));
! }
! else
! {
! $receipt['error'][] =
array('msg'=>lang('request %1 has not been saved',$request['request_id']));
! }
return $receipt;
}
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.soworkorder.inc.php 7 Aug 2003 16:08:59 -0000 1.20
--- class.soworkorder.inc.php 26 Aug 2003 19:16:30 -0000 1.21
***************
*** 32,35 ****
--- 32,42 ----
}
+ function next_id()
+ {
+ $this->db->query("select value from fm_idgenerator
where name = 'workorder'");
+ $this->db->next_record();
+ $id = $this->db->f('value')+1;
+ return $id;
+ }
function select_category_workorder_list()
***************
*** 377,461 ****
{
$this->db->query("update fm_idgenerator set value =
value + 1 where name = 'workorder'");
- $this->db->query("select value from fm_idgenerator
where name = 'workorder'");
- $this->db->next_record();
- $workorder_id = $this->db->f('value');
- return $workorder_id;
}
function add($workorder)
{
-
-
$this->historylog->add('SO',$workorder['workorder_id'],$workorder['status']);
-
$workorder['descr'] =
$this->db->db_addslashes($workorder['descr']);
$workorder['title'] =
$this->db->db_addslashes($workorder['title']);
- //_debug_array($workorder);
- $this->db->query("INSERT INTO fm_workorder
(id,project_id,title,access,entry_date,start_date,end_date,status,"
- .
"descr,budget,account_id,rig_addition,addition,key_deliver,key_fetch,vendor_id,charge_tenant,user_id)
"
- . "VALUES ('"
- . $workorder['workorder_id']. "','"
- . $workorder['project_id']. "','"
- . $workorder['title']. "','"
- . "public','"
- . time() . "','"
- . $workorder['start_date']. "','"
- . $workorder['end_date']. "','"
- . $workorder['status']. "','"
- . $workorder['descr']. "','"
- . $workorder['budget']. "','"
- . $workorder['b_account_id']. "','"
- . $workorder['addition_rs']. "','"
- . $workorder['addition_percentage']. "','"
- . $workorder['key_deliver']. "','"
- . $workorder['key_fetch']. "','"
- . $workorder['vendor_id']. "','"
- . $workorder['charge_tenant'] . "','"
- . $this->account. "')",__LINE__,__FILE__);
! $receipt['message'][] = array('msg'=>lang('workorder %1
has been saved',$workorder['workorder_id']));
! return $receipt;
! }
! function edit($workorder)
! {
! $this->db->query("SELECT status,budget FROM
fm_workorder where id='" .$workorder['workorder_id']."'",__LINE__,__FILE__);
! $this->db->next_record();
! $old_status = $this->db->f('status');
! $old_budget = $this->db->f('budget');
! if ($old_status != $workorder['status'])
{
!
$this->historylog->add('S',$workorder['workorder_id'],$workorder['status']);
}
! if ($old_budget != $workorder['budget'])
{
!
$this->historylog->add('B',$workorder['workorder_id'],$workorder['budget']);
}
$workorder['descr'] =
$this->db->db_addslashes($workorder['descr']);
$workorder['title'] =
$this->db->db_addslashes($workorder['title']);
//_debug_array($workorder);
! $this->db->query("UPDATE fm_workorder set
! title ='" .
$workorder['title'] . "',
! status ='" .
$workorder['status'] . "',
! start_date ='" .
$workorder['start_date'] . "',
! end_date ='" .
$workorder['end_date'] . "',
! descr ='" .
$workorder['descr'] . "',
! budget ='" .
(int)$workorder['budget'] . "',
! key_deliver ='" .
$workorder['key_deliver'] . "',
! key_fetch ='" .
$workorder['key_fetch'] . "',
! account_id ='" .
$workorder['b_account_id'] . "',
! rig_addition ='" . $workorder['addition_rs']
. "',
! addition ='" .
$workorder['addition_percentage'] . "',
! charge_tenant ='" .
$workorder['charge_tenant'] . "',
! vendor_id ='" .
$workorder['vendor_id']
! . "' WHERE id= '" . $workorder['workorder_id']
."'",__LINE__,__FILE__);
- $receipt['message'][] = array('msg'=>lang('workorder %1
has been edited',$workorder['workorder_id']));
return $receipt;
-
}
--- 384,487 ----
{
$this->db->query("update fm_idgenerator set value =
value + 1 where name = 'workorder'");
}
function add($workorder)
{
$workorder['descr'] =
$this->db->db_addslashes($workorder['descr']);
$workorder['title'] =
$this->db->db_addslashes($workorder['title']);
! $values= array(
! $workorder['workorder_id'],
! $workorder['project_id'],
! $workorder['title'],
! 'public',
! time(),
! $workorder['start_date'],
! $workorder['end_date'],
! $workorder['status'],
! $workorder['descr'],
! $workorder['budget'],
! $workorder['b_account_id'],
! $workorder['addition_rs'],
! $workorder['addition_percentage'],
! $workorder['key_deliver'],
! $workorder['key_fetch'],
! $workorder['vendor_id'],
! $workorder['charge_tenant'],
! $this->account);
! $values = $this->bocommon->validate_db_insert($values);
! $this->db->transaction_begin();
! $this->db->query("INSERT INTO fm_workorder
(id,project_id,title,access,entry_date,start_date,end_date,status,"
! .
"descr,budget,account_id,rig_addition,addition,key_deliver,key_fetch,vendor_id,charge_tenant,user_id)
"
! . "VALUES ( $values )",__LINE__,__FILE__);
!
! if($this->db->transaction_commit())
{
! $this->increment_workorder_id();
!
$this->historylog->add('SO',$workorder['workorder_id'],$workorder['status']);
! $receipt['message'][] =
array('msg'=>lang('workorder %1 has been saved',$workorder['workorder_id']));
}
! else
{
! $receipt['error'][] = array('msg'=>lang('the
workorder has not been saved'));
}
+ return $receipt;
+ }
+ function edit($workorder)
+ {
$workorder['descr'] =
$this->db->db_addslashes($workorder['descr']);
$workorder['title'] =
$this->db->db_addslashes($workorder['title']);
//_debug_array($workorder);
! $value_set=array(
! 'title' => $workorder['title'],
! 'status' => $workorder['status'],
! 'start_date' => $workorder['start_date'],
! 'end_date' =>
$workorder['end_date'],
! 'descr' => $workorder['descr'],
! 'budget' =>
(int)$workorder['budget'],
! 'key_deliver' => $workorder['key_deliver'],
! 'key_fetch' =>
$workorder['key_fetch'],
! 'account_id' => $workorder['b_account_id'],
! 'rig_addition' => $workorder['addition_rs'],
! 'addition' =>
$workorder['addition_percentage'],
! 'charge_tenant' => $workorder['charge_tenant'],
! 'vendor_id' =>
$workorder['vendor_id']
! );
!
! $value_set =
$this->bocommon->validate_db_update($value_set);
!
! $this->db->transaction_begin();
!
! $this->db->query("UPDATE fm_workorder set $value_set
WHERE id=" . $workorder['workorder_id'] ,__LINE__,__FILE__);
!
! if($this->db->transaction_commit())
! {
! $this->db->query("SELECT status,budget FROM
fm_workorder where id='" .$workorder['workorder_id']."'",__LINE__,__FILE__);
! $this->db->next_record();
!
! $old_status = $this->db->f('status');
! $old_budget = $this->db->f('budget');
! if ($old_status != $workorder['status'])
! {
!
$this->historylog->add('S',$workorder['workorder_id'],$workorder['status']);
! }
! if ($old_budget != $workorder['budget'])
! {
!
$this->historylog->add('B',$workorder['workorder_id'],$workorder['budget']);
! }
+ $receipt['message'][] =
array('msg'=>lang('workorder %1 has been edited',$workorder['workorder_id']));
+ }
+ else
+ {
+ $receipt['error'][] =
array('msg'=>lang('workorder %1 has not been
edited',$workorder['workorder_id']));
+ }
return $receipt;
}
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.uirequest.inc.php 18 Jul 2003 09:34:54 -0000 1.25
--- class.uirequest.inc.php 26 Aug 2003 19:16:30 -0000 1.26
***************
*** 516,520 ****
if(!$id)
{
!
$values['request_id']=$this->bo->increment_request_id();
$id = $values['request_id'];
}
--- 516,520 ----
if(!$id)
{
!
$values['request_id']=$this->bo->next_id();
$id = $values['request_id'];
}
***************
*** 523,527 ****
{
$action='add';
! $values['request_id'] =
$this->bo->increment_request_id();
$id = $values['request_id'];
}
--- 523,527 ----
{
$action='add';
! $values['request_id'] =
$this->bo->next_id();
$id = $values['request_id'];
}
***************
*** 547,555 ****
$bcc =
$coordinator_email;
$send =
CreateObject('phpgwapi.send');
! $rcpt =
$send->msg('email', $to_notify_from_email, $subject, stripslashes($message),
'', $cc, $bcc, $coordinator_email, $coordinator_name, 'plain');
}
elseif
($mail_method=='sendmail'):
{
!
$rcpt=mail($to_notify_from_email,$subject,$message, $headers);
}
else:
--- 547,555 ----
$bcc =
$coordinator_email;
$send =
CreateObject('phpgwapi.send');
! $rcpt =
$send->msg('email', $values['mail_address'], $subject, stripslashes($message),
'', $cc, $bcc, $coordinator_email, $coordinator_name, 'plain');
}
elseif
($mail_method=='sendmail'):
{
!
$rcpt=mail($values['mail_address'],$subject,$message, $headers);
}
else:
***************
*** 558,561 ****
--- 558,566 ----
}
endif;
+ }
+
+ if($rcpt)
+ {
+
$receipt['message'][]=array('msg'=>lang('%1 is
notified',$values['mail_address']));
}
}
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** class.uiwo_hour.inc.php 27 Jul 2003 15:53:24 -0000 1.33
--- class.uiwo_hour.inc.php 26 Aug 2003 19:16:30 -0000 1.34
***************
*** 531,534 ****
--- 531,535 ----
{
$this->create_html->add_file(array(PHPGW_SERVER_ROOT . SEP . $this->currentapp
. SEP . 'templates' . SEP . 'default' . SEP . 'wo_hour'));
+
$this->create_html->add_file(array(PHPGW_SERVER_ROOT . SEP . $this->currentapp
. SEP . 'templates' . SEP . 'default' . SEP . 'location_view'));
$this->create_html->set_var('phpgw',array('email_data' => $email_data));
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** class.uiworkorder.inc.php 27 Jul 2003 15:53:24 -0000 1.32
--- class.uiworkorder.inc.php 26 Aug 2003 19:16:30 -0000 1.33
***************
*** 397,401 ****
if(!$id)
{
!
$values['workorder_id']=$this->bo->increment_workorder_id();
$id =
$values['workorder_id'];
}
--- 397,401 ----
if(!$id)
{
!
$values['workorder_id']=$this->bo->next_id();
$id =
$values['workorder_id'];
}
***************
*** 403,407 ****
{
$action='add';
! $values['workorder_id'] =
$this->bo->increment_workorder_id();
$id =
$values['workorder_id'];
}
--- 403,407 ----
{
$action='add';
! $values['workorder_id'] =
$this->bo->next_id();
$id =
$values['workorder_id'];
}
***************
*** 420,424 ****
$subject = lang(Approval).": ".
$values['workorder_id'];
! $message = lang(Workorder) . "
" . $values['workorder_id'] ." ". lang(needs_approval);
$mail_method=
$this->config->config_data['fmwrkorder_mail'];
--- 420,424 ----
$subject = lang(Approval).": ".
$values['workorder_id'];
! $message = lang('Workorder %1
needs approval',$values['workorder_id']);
$mail_method=
$this->config->config_data['fmwrkorder_mail'];
***************
*** 427,435 ****
$bcc =
$coordinator_email;
$send =
CreateObject('phpgwapi.send');
! $rcpt =
$send->msg('email', $to_approval_from_email, $subject, stripslashes($message),
'', $cc, $bcc, $coordinator_email, $coordinator_name, 'plain');
}
elseif
($mail_method=='sendmail'):
{
!
$rcpt=mail($to_approval_from_email,$subject,$message, $headers);
}
else:
--- 427,435 ----
$bcc =
$coordinator_email;
$send =
CreateObject('phpgwapi.send');
! $rcpt =
$send->msg('email', $values['mail_address'], $subject, stripslashes($message),
'', $cc, $bcc, $coordinator_email, $coordinator_name, 'plain');
}
elseif
($mail_method=='sendmail'):
{
!
$rcpt=mail($values['mail_address'],$subject,$message, $headers);
}
else:
***************
*** 438,441 ****
--- 438,446 ----
}
endif;
+ }
+
+ if($rcpt)
+ {
+
$receipt['message'][]=array('msg'=>lang('%1 is
notified',$values['mail_address']));
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.borequest.inc.php, 1.9, 1.10 class.boworkorder.inc.php, 1.12, 1.13 class.soproject.inc.php, 1.29, 1.30 class.sorequest.inc.php, 1.16, 1.17 class.soworkorder.inc.php, 1.20, 1.21 class.uirequest.inc.php, 1.25, 1.26 class.uiwo_hour.inc.php, 1.33, 1.34 class.uiworkorder.inc.php, 1.32, 1.33,
Sigurd Nes <address@hidden> <=