[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php, 1.22, 1.
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php, 1.22, 1.23 class.soadmin_location.inc.php, 1.16, 1.17 class.solocation.inc.php, 1.23, 1.24 class.soproject.inc.php, 1.25, 1.26 class.sorequest.inc.php, 1.15, 1.16 class.soworkorder.inc.php, 1.17, 1.18 class.uiproject.inc.php, 1.34, 1.35 class.uitts.inc.php, 1.33, 1.34 class.uiworkorder.inc.php, 1.28, 1.29 |
|
Date: |
Thu, 17 Jul 2003 06:46:26 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv24841/inc
Modified Files:
class.bolocation.inc.php class.soadmin_location.inc.php
class.solocation.inc.php class.soproject.inc.php
class.sorequest.inc.php class.soworkorder.inc.php
class.uiproject.inc.php class.uitts.inc.php
class.uiworkorder.inc.php
Log Message:
no message
Index: class.bolocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.bolocation.inc.php 14 Jul 2003 10:36:43 -0000 1.22
--- class.bolocation.inc.php 17 Jul 2003 10:46:22 -0000 1.23
***************
*** 332,336 ****
$input_name[]
= 'street_id';
$location['location'][$i]['lookup_link'] = True;
!
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$fm_location_cols[$j]['location_type'] . '()';
$location['location'][$i]['name'] =
lang('address');
$location['location'][$i]['input_type'] = 'hidden';
--- 332,336 ----
$input_name[]
= 'street_id';
$location['location'][$i]['lookup_link'] = True;
!
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$config[$j]['location_type'] . '()';
$location['location'][$i]['name'] =
lang('address');
$location['location'][$i]['input_type'] = 'hidden';
***************
*** 342,346 ****
$input_name[]
= $location['location'][$i]['extra'][0]['input_name'];
$location['location'][$i]['extra'][0]['size']
= 30;
!
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. $fm_location_cols[$j]['location_type'] . '()';
$location['location'][$i]['extra'][0]['value']
= $data['values']['street_name'];
--- 342,346 ----
$input_name[]
= $location['location'][$i]['extra'][0]['input_name'];
$location['location'][$i]['extra'][0]['size']
= 30;
!
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. $config[$j]['location_type'] . '()';
$location['location'][$i]['extra'][0]['value']
= $data['values']['street_name'];
***************
*** 350,354 ****
$input_name[]
= $location['location'][$i]['extra'][1]['input_name'];
$location['location'][$i]['extra'][1]['size']
= 6;
!
$location['location'][$i]['extra'][1]['lookup_function_call'] = 'lookup_loc'
. $fm_location_cols[$j]['location_type'] . '()';
$location['location'][$i]['extra'][1]['value']
= $data['values']['street_number'];
}
--- 350,354 ----
$input_name[]
= $location['location'][$i]['extra'][1]['input_name'];
$location['location'][$i]['extra'][1]['size']
= 6;
!
$location['location'][$i]['extra'][1]['lookup_function_call'] = 'lookup_loc'
. $config[$j]['location_type'] . '()';
$location['location'][$i]['extra'][1]['value']
= $data['values']['street_number'];
}
Index: class.soadmin_location.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin_location.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.soadmin_location.inc.php 16 Jul 2003 10:38:31 -0000 1.16
--- class.soadmin_location.inc.php 17 Jul 2003 10:46:22 -0000 1.17
***************
*** 540,543 ****
--- 540,549 ----
if($this->oProc->AddColumn('fm_location'.$values[$column_name],$column_name,
$column_info))
{
+ if($column_name=='street_id')
+ {
+
$this->oProc->AddColumn('fm_location'.$values[$column_name],'street_number',
array('type'=>'varchar','precision'=>10));
+
$this->oProc->DropColumn('fm_location' .$location_type ,'','street_number');
+ }
+
$this->oProc->DropColumn('fm_location'
.$location_type ,'', $column_name);
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.solocation.inc.php 16 Jul 2003 10:38:31 -0000 1.23
--- class.solocation.inc.php 17 Jul 2003 10:46:22 -0000 1.24
***************
*** 444,448 ****
if($config[$i]['column_name']=='street_id'):
{
! $cols.= ',fm_streetaddress.id
as street_name';
$cols_return[]
= 'street_name';
$uicols['input_type'][]
= 'text';
--- 444,448 ----
if($config[$i]['column_name']=='street_id'):
{
! $cols.=
',fm_streetaddress.descr as street_name';
$cols_return[]
= 'street_name';
$uicols['input_type'][]
= 'text';
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.soproject.inc.php 9 Jul 2003 11:12:17 -0000 1.25
--- class.soproject.inc.php 17 Jul 2003 10:46:22 -0000 1.26
***************
*** 254,260 ****
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
{
! $project['request_id'][]['id'] =
$this->db->f('origin_id');
}
--- 254,262 ----
$this->db->query($sql,__LINE__,__FILE__);
+ $i=0;
while ($this->db->next_record())
{
! $project['request_id'][$i]['id'] =
$this->db->f('origin_id');
! $i++;
}
***************
*** 265,269 ****
while ($this->db->next_record())
{
! $project['ticket_id'][]['id'] =
$this->db->f('origin_id');
}
--- 267,272 ----
while ($this->db->next_record())
{
! $project['ticket_id'][$i]['id'] =
$this->db->f('origin_id');
! $i++;
}
***************
*** 401,407 ****
$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_project
(id,name,access,category,entry_date,start_date,end_date,coordinator,status,"
! .
"descr,title,budget,location_code,floor,address,key_deliver,key_fetch,other_branch,key_responsible,tenant_id,charge_tenant,user_id
$cols) "
. "VALUES ('"
. $project['project_id']. "','"
--- 404,410 ----
$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_project
(id,name,access,category,entry_date,start_date,end_date,coordinator,status,"
! .
"descr,title,budget,location_code,address,key_deliver,key_fetch,other_branch,key_responsible,tenant_id,charge_tenant,user_id
$cols) "
. "VALUES ('"
. $project['project_id']. "','"
***************
*** 418,422 ****
. $project['budget']. "','"
. $project['location_code']. "','"
- . $project['floor'] . "','"
. $address . "','"
. $project['key_deliver']. "','"
--- 421,424 ----
***************
*** 502,506 ****
function edit($project)
{
! _debug_array($project);
while (is_array($project['location']) &&
list($input_name,$value) = each($project['location']))
{
--- 504,508 ----
function edit($project)
{
! //_debug_array($project);
while (is_array($project['location']) &&
list($input_name,$value) = each($project['location']))
{
Index: class.sorequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sorequest.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.sorequest.inc.php 9 Jul 2003 11:12:17 -0000 1.15
--- class.sorequest.inc.php 17 Jul 2003 10:46:22 -0000 1.16
***************
*** 60,63 ****
--- 60,72 ----
{
+
$values['safety']=str_replace(",",".",$values['safety']);
+
$values['aesthetics']=str_replace(",",".",$values['aesthetics']);
+
$values['indoor_climate']=str_replace(",",".",$values['indoor_climate']);
+
$values['consequential_damage']=str_replace(",",".",$values['consequential_damage']);
+
$values['user_gratification']=str_replace(",",".",$values['user_gratification']);
+
$values['residential_environment']=str_replace(",",".",$values['residential_environment']);
+
$values['authorities_demands']=str_replace(",",".",$values['authorities_demands']);
+
+
$this->db->query("UPDATE fm_request_priority_key set
safety ='" . $values['safety'] . "',
***************
*** 86,96 ****
! $safety=str_replace(",",".",$priority_key['safety']);
!
$aesthetics=str_replace(",",".",$priority_key['aesthetics']);
!
$indoor_climate=str_replace(",",".",$priority_key['indoor_climate']);
!
$consequential_damage=str_replace(",",".",$priority_key['consequential_damage']);
!
$user_gratification=str_replace(",",".",$priority_key['user_gratification']);
!
$residential_environment=str_replace(",",".",$priority_key['residential_environment']);
!
$authorities_demands=str_replace(",",".",$priority_key['authorities_demands']);
if($request_id)
--- 95,105 ----
! $safety =
$priority_key['safety'];
! $aesthetics =
$priority_key['aesthetics'];
! $indoor_climate =
$priority_key['indoor_climate'];
! $consequential_damage =
$priority_key['consequential_damage'];
! $user_gratification =
$priority_key['user_gratification'];
! $residential_environment =
$priority_key['residential_environment'];
! $authorities_demands =
$priority_key['authorities_demands'];
if($request_id)
***************
*** 430,434 ****
function add($request)
{
! while (is_array($project['location']) &&
list($input_name,$value) = each($project['location']))
{
if($value)
--- 439,443 ----
function add($request)
{
! while (is_array($request['location']) &&
list($input_name,$value) = each($request['location']))
{
if($value)
***************
*** 440,444 ****
! while (is_array($project['extra']) &&
list($input_name,$value) = each($project['extra']))
{
if($value)
--- 449,453 ----
! while (is_array($request['extra']) &&
list($input_name,$value) = each($request['extra']))
{
if($value)
***************
*** 475,480 ****
$request['descr'] =
$this->db->db_addslashes($request['descr']);
$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,"
--- 484,489 ----
$request['descr'] =
$this->db->db_addslashes($request['descr']);
$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,"
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.soworkorder.inc.php 9 Jul 2003 11:12:17 -0000 1.17
--- class.soworkorder.inc.php 17 Jul 2003 10:46:22 -0000 1.18
***************
*** 21,24 ****
--- 21,25 ----
$this->join = $this->socommon->join;
+ $this->left_join = $this->socommon->left_join;
}
***************
*** 244,248 ****
function read_single($workorder_id)
{
! $sql = "SELECT fm_workorder.*, fm_chapter.descr as
chapter from fm_workorder $this->join fm_chapter on "
. " fm_workorder.chapter_id = fm_chapter.id
where fm_workorder.id='$workorder_id'";
--- 245,249 ----
function read_single($workorder_id)
{
! $sql = "SELECT fm_workorder.*, fm_chapter.descr as
chapter from fm_workorder $this->left_join fm_chapter on "
. " fm_workorder.chapter_id = fm_chapter.id
where fm_workorder.id='$workorder_id'";
***************
*** 267,271 ****
$workorder['act_mtrl_cost']
= $this->db->f('act_mtrl_cost');
$workorder['act_vendor_cost'] =
$this->db->f('act_vendor_cost');
! $workorder['owner']
= $this->db->f('owner');
$workorder['vendor_id'] =
$this->db->f('vendor_id');
$workorder['coordinator'] =
$this->db->f('coordinator');
--- 268,272 ----
$workorder['act_mtrl_cost']
= $this->db->f('act_mtrl_cost');
$workorder['act_vendor_cost'] =
$this->db->f('act_vendor_cost');
! $workorder['user_id']
= $this->db->f('user_id');
$workorder['vendor_id'] =
$this->db->f('vendor_id');
$workorder['coordinator'] =
$this->db->f('coordinator');
***************
*** 365,369 ****
//_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,owner)
"
. "VALUES ('"
. $workorder['workorder_id']. "','"
--- 366,370 ----
//_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']. "','"
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** class.uiproject.inc.php 30 Jun 2003 10:49:14 -0000 1.34
--- class.uiproject.inc.php 17 Jul 2003 10:46:22 -0000 1.35
***************
*** 323,326 ****
--- 323,328 ----
$values =
get_var('values',array('POST'));
$add_request =
get_var('add_request',array('POST'));
+ $add_request =
get_var('add_request',array('POST'));
+
$insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp);
***************
*** 366,369 ****
--- 368,372 ----
$values['descr'] =
get_var('descr',array('POST','GET'));
$ticket_id
= get_var('ticket_id',array('POST','GET'));
+ $request_id =
get_var('request_id',array('POST','GET'));
if($ticket_id)
***************
*** 373,376 ****
--- 376,385 ----
}
+ if($request_id)
+ {
+ $values['origin']= 'request';
+ $values['origin_id']= $request_id;
+ }
+
if($location_code)
{
***************
*** 566,569 ****
--- 575,581 ----
'link_ticket'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.view'),
'value_ticket_id'
=> $values['ticket_id'],
+
+ 'value_origin'
=> $values['origin'],
+ 'value_origin_id'
=> $values['origin_id'],
'lang_request'
=> lang('request'),
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** class.uitts.inc.php 4 Jul 2003 09:56:25 -0000 1.33
--- class.uitts.inc.php 17 Jul 2003 10:46:22 -0000 1.34
***************
*** 554,557 ****
--- 554,558 ----
'lang_additional_notes' =>
lang('Additional notes'),
+ 'lang_new_note'
=> lang('New Note'),
'lang_opendate'
=> lang('Open Date'),
'value_opendate'
=> $ticket['timestampopened'],
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** class.uiworkorder.inc.php 15 Jul 2003 12:03:04 -0000 1.28
--- class.uiworkorder.inc.php 17 Jul 2003 10:46:22 -0000 1.29
***************
*** 448,452 ****
}
! //_debug_array($project);
}
--- 448,452 ----
}
! //_debug_array($values);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php, 1.22, 1.23 class.soadmin_location.inc.php, 1.16, 1.17 class.solocation.inc.php, 1.23, 1.24 class.soproject.inc.php, 1.25, 1.26 class.sorequest.inc.php, 1.15, 1.16 class.soworkorder.inc.php, 1.17, 1.18 class.uiproject.inc.php, 1.34, 1.35 class.uitts.inc.php, 1.33, 1.34 class.uiworkorder.inc.php, 1.28, 1.29,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup phpgw_en.lang, 1.13, 1.14 phpgw_no.lang, 1.7, 1.8
- Next by Date:
[Phpgroupware-cvs] CVS: property/inc class.sotemplate.inc.php, 1.5, 1.6 class.sowo_hour.inc.php, 1.11, 1.12 class.uidocument.inc.php, 1.14, 1.15 class.uidrawing.inc.php, 1.22, 1.23 class.uiequipment.inc.php, 1.30, 1.31 class.uigab.inc.php, 1.12, 1.13 class.uiinvestment.inc.php, 1.24, 1.25 class.uiinvoice.inc.php, 1.29, 1.30 class.uilocation.inc.php, 1.20, 1.21 class.uimeter.inc.php, 1.14, 1.15 class.uipricebook.inc.php, 1.16, 1.17 class.uiproject.inc.php, 1.35, 1.36 class.uireport.inc.php, 1.11, 1.12 class.uirequest.inc.php, 1.23, 1.24 class.uitemplate.inc.php, 1.12, 1.13 class.uitts.inc.php, 1.34, 1.35 class.uiworkorder.inc.php, 1.29, 1.30
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup phpgw_en.lang, 1.13, 1.14 phpgw_no.lang, 1.7, 1.8
- Next by thread:
[Phpgroupware-cvs] CVS: property/inc class.sotemplate.inc.php, 1.5, 1.6 class.sowo_hour.inc.php, 1.11, 1.12 class.uidocument.inc.php, 1.14, 1.15 class.uidrawing.inc.php, 1.22, 1.23 class.uiequipment.inc.php, 1.30, 1.31 class.uigab.inc.php, 1.12, 1.13 class.uiinvestment.inc.php, 1.24, 1.25 class.uiinvoice.inc.php, 1.29, 1.30 class.uilocation.inc.php, 1.20, 1.21 class.uimeter.inc.php, 1.14, 1.15 class.uipricebook.inc.php, 1.16, 1.17 class.uiproject.inc.php, 1.35, 1.36 class.uireport.inc.php, 1.11, 1.12 class.uirequest.inc.php, 1.23, 1.24 class.uitemplate.inc.php, 1.12, 1.13 class.uitts.inc.php, 1.34, 1.35 class.uiworkorder.inc.php, 1.29, 1.30
- Index(es):