[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.uiworkorder.inc.php,1.22,1.23
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.uiworkorder.inc.php,1.22,1.23 class.uitts.inc.php,1.27,1.28 class.uirequest.inc.php,1.18,1.19 class.uireport.inc.php,1.6,1.7 class.uiproject.inc.php,1.25,1.26 class.uimeter.inc.php,1.10,1.11 class.uilookup.inc.php,1.22,1.23 class.uilocation.inc.php,1.13,1.14 class.uiequipment.inc.php,1.26,1.27 class.sotts.inc.php,1.16,1.17 class.sorequest.inc.php,1.9,1.10 class.soproject.inc.php,1.15,1.16 class.solookup.inc.php,1.20,1.21 class.solocation.inc.php,1.9,1.10 class.soequipment.inc.php,1.16,1.17 class.socommon.inc.php,1.27,1.28 class.botts.inc.php,1.11,1.12 class.borequest.inc.php,1.4,1.5 class.boproject.inc.php,1.6,1.7 class.boequipment.inc.php,1.13,1.14class.bocommon.inc.php,1.55,1.56 |
|
Date: |
Thu, 19 Jun 2003 16:03:13 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv22244/inc
Modified Files:
class.uiworkorder.inc.php class.uitts.inc.php
class.uirequest.inc.php class.uireport.inc.php
class.uiproject.inc.php class.uimeter.inc.php
class.uilookup.inc.php class.uilocation.inc.php
class.uiequipment.inc.php class.sotts.inc.php
class.sorequest.inc.php class.soproject.inc.php
class.solookup.inc.php class.solocation.inc.php
class.soequipment.inc.php class.socommon.inc.php
class.botts.inc.php class.borequest.inc.php
class.boproject.inc.php class.boequipment.inc.php
class.bocommon.inc.php
Log Message:
no message
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uiworkorder.inc.php 12 Jun 2003 20:51:13 -0000 1.22
--- class.uiworkorder.inc.php 19 Jun 2003 20:03:09 -0000 1.23
***************
*** 409,413 ****
'tenant_id' =>
$project['tenant_id'],
'tenant_name' =>
$project['tenant_name'],
! 'tenant_phone' =>
$project['tenant_phone'],
'apartment_id' =>
$project['apartment_id']));
--- 409,413 ----
'tenant_id' =>
$project['tenant_id'],
'tenant_name' =>
$project['tenant_name'],
! 'contact_phone' =>
$project['contact_phone'],
'apartment_id' =>
$project['apartment_id']));
***************
*** 712,716 ****
'tenant_id' =>
$project['tenant_id'],
'tenant_name' =>
$project['tenant_name'],
! 'tenant_phone' =>
$project['tenant_phone'],
'apartment_id' =>
$project['apartment_id']));
--- 712,716 ----
'tenant_id' =>
$project['tenant_id'],
'tenant_name' =>
$project['tenant_name'],
! 'contact_phone' =>
$project['contact_phone'],
'apartment_id' =>
$project['apartment_id']));
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.uitts.inc.php 23 May 2003 08:40:19 -0000 1.27
--- class.uitts.inc.php 19 Jun 2003 20:03:09 -0000 1.28
***************
*** 265,269 ****
'tenant_id' => $values['tenant_id'],
'tenant_name' => $values['tenant_name'],
!
'tenant_phone' => $values['tenant_phone'],
'equipment_id' => $values['equipment_id']));
--- 265,269 ----
'tenant_id' => $values['tenant_id'],
'tenant_name' => $values['tenant_name'],
!
'contact_phone' => $values['contact_phone'],
'equipment_id' => $values['equipment_id']));
***************
*** 490,494 ****
'tenant_id' =>
$ticket['tenant_id'],
'tenant_name' =>
$ticket['tenant_name'],
! 'tenant_phone' =>
$ticket['contact_phone'],
'apartment_id' =>
$ticket['apartment_id']));
--- 490,494 ----
'tenant_id' =>
$ticket['tenant_id'],
'tenant_name' =>
$ticket['tenant_name'],
! 'contact_phone' =>
$ticket['contact_phone'],
'apartment_id' =>
$ticket['apartment_id']));
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.uirequest.inc.php 12 Jun 2003 20:51:13 -0000 1.18
--- class.uirequest.inc.php 19 Jun 2003 20:03:09 -0000 1.19
***************
*** 342,346 ****
{
$tenant_data=$this->bocommon->read_single_tenant($values['tenant_id']);
! $values['tenant_phone']=
$tenant_data['tenant_phone'];
$values['tenant_name']=
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
}
--- 342,346 ----
{
$tenant_data=$this->bocommon->read_single_tenant($values['tenant_id']);
! $values['contact_phone']=
$tenant_data['contact_phone'];
$values['tenant_name']=
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
}
***************
*** 481,485 ****
'tenant_id' =>
$values['tenant_id'],
'tenant_name' =>
$values['tenant_name'],
! 'tenant_phone' =>
$values['tenant_phone'],
'apartment_id' =>
$values['apartment_id']));
--- 481,485 ----
'tenant_id' =>
$values['tenant_id'],
'tenant_name' =>
$values['tenant_name'],
! 'contact_phone' =>
$values['contact_phone'],
'apartment_id' =>
$values['apartment_id']));
***************
*** 778,782 ****
'tenant_id' =>
$values['tenant_id'],
'tenant_name' =>
$values['tenant_name'],
! 'tenant_phone' =>
$values['tenant_phone'],
'apartment_id' =>
$values['apartment_id']));
--- 778,782 ----
'tenant_id' =>
$values['tenant_id'],
'tenant_name' =>
$values['tenant_name'],
! 'contact_phone' =>
$values['contact_phone'],
'apartment_id' =>
$values['apartment_id']));
Index: class.uireport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uireport.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uireport.inc.php 23 May 2003 10:11:48 -0000 1.6
--- class.uireport.inc.php 19 Jun 2003 20:03:09 -0000 1.7
***************
*** 300,304 ****
{
$tenant_data=$this->bocommon->read_single_tenant($values['tenant_id']);
! $values['tenant_phone']=
$tenant_data['tenant_phone'];
$values['tenant_name']=
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
}
--- 300,304 ----
{
$tenant_data=$this->bocommon->read_single_tenant($values['tenant_id']);
! $values['contact_phone']=
$tenant_data['contact_phone'];
$values['tenant_name']=
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
}
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.uiproject.inc.php 19 Jun 2003 12:09:59 -0000 1.25
--- class.uiproject.inc.php 19 Jun 2003 20:03:09 -0000 1.26
***************
*** 41,44 ****
--- 41,45 ----
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->config =
CreateObject('phpgwapi.config');
+ $this->bolocation =
CreateObject($this->currentapp.'.bolocation');
$this->start =
$this->bo->start;
***************
*** 85,175 ****
//_debug_array($project_list);
- /* while (is_array($project_list) && list(,$project) =
each($project_list))
- {
- $location = split("-",
$project['location_code']);
-
- $content[] = array
- (
- 'name'
=> $project['name'],
- 'project_id'
=> $project['project_id'],
- 'descr'
=> $project['descr'],
- 'property_id'
=> $location[0],
- 'building_id'
=> $location[1],
- 'entrance_id'
=> $location[2],
- 'floor'
=> $project['floor'],
- 'apartment_id'
=> $location[3],
- 'address'
=> $project['address'],
- 'start_date'
=> $project['start_date'],
- 'coordinator'
=> $project['coordinator'],
- 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.view&id='
. $project['project_id']),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $project['project_id']),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.delete&project_id='
. $project['project_id']),
- 'lang_view_statustext' =>
lang('view the project'),
- 'lang_edit_statustext' =>
lang('edit the project'),
- 'lang_delete_statustext' =>
lang('delete this project'),
- 'text_view'
=> lang('view'),
- 'text_edit'
=> lang('edit'),
- 'text_delete'
=> lang('delete')
- );
- }
-
-
- $table_header[] = array
- (
- 'sort_project' =>
$this->nextmatchs->show_sort_order(array
-
(
-
'sort' => $this->sort,
-
'var' => 'id',
-
'order' => $this->order,
-
'extra' => array('menuaction' =>
$this->currentapp.'.uiproject.index',
-
'cat_id'
=>$this->cat_id,
-
'district_id' =>
$this->district_id,
-
'filter'
=>$this->filter,
-
'lookup'
=>$lookup,
-
'query'
=>$this->query)
-
)),
- 'lang_project' => lang('project'),
- 'lang_name' => lang('Name'),
- 'sort_property' =>
$this->nextmatchs->show_sort_order(array
-
(
-
'sort' => $this->sort,
-
'var' => 'property_id',
-
'order' => $this->order,
-
'extra' => array('menuaction' =>
$this->currentapp.'.uiproject.index',
-
'cat_id'
=>$this->cat_id,
-
'district_id' =>
$this->district_id,
-
'filter'
=>$this->filter,
-
'lookup'
=>$lookup,
-
'query'
=>$this->query)
-
)),
- 'lang_property' => lang('Property'),
- 'lang_building' => lang('Building'),
- 'lang_entrance' => lang('Entrance'),
- 'lang_floor' => lang('Floor'),
- 'lang_apartment' => lang('Apartment'),
- 'sort_address' =>
$this->nextmatchs->show_sort_order(array
-
(
-
'sort' => $this->sort,
-
'var' => 'address',
-
'order' => $this->order,
-
'extra' => array('menuaction' =>
$this->currentapp.'.uiproject.index',
-
'cat_id'
=>$this->cat_id,
-
'district_id' =>
$this->district_id,
-
'filter'
=>$this->filter,
-
'lookup'
=>$lookup,
-
'query'
=>$this->query)
-
)),
- 'lang_address' => lang('Address'),
- 'lang_start_date' => lang('Start date'),
- 'lang_coordinator' => lang('Coordinator'),
- 'lang_view' => lang('view'),
- 'lang_edit' => lang('edit'),
- 'lang_delete' => lang('delete'),
- 'lang_select' => lang('Select')
- );
-
-
- */
-
$uicols = $this->bo->uicols;
//_debug_array($uicols);
--- 86,89 ----
***************
*** 181,198 ****
if($uicols['input_type'][$i]!='hidden')
{
!
$content[$j]['row'][$i]['value'] =
$project_entry[$uicols['name'][$i]];
! $content[$j]['row'][$i]['name']
= $uicols['name'][$i];
}
}
! $content[$j]['row'][$i]['statustext']
= lang('view the project');
! $content[$j]['row'][$i]['text']
= lang('view');
! $content[$j]['row'][$i++]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.view&id='
. $project_entry['project_id']);
! $content[$j]['row'][$i]['statustext']
= lang('edit the project');
! $content[$j]['row'][$i]['text']
= lang('edit');
! $content[$j]['row'][$i++]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $project_entry['project_id']);
! $content[$j]['row'][$i]['statustext']
= lang('delete the project');
! $content[$j]['row'][$i]['text']
= lang('delete');
! $content[$j]['row'][$i++]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.delete&id='
. $project_entry['project_id']);
$j++;
--- 95,130 ----
if($uicols['input_type'][$i]!='hidden')
{
!
!
if($project_entry['query_location'][$uicols['name'][$i]])
! {
!
$content[$j]['row'][$i]['statustext'] = lang('search');
!
$content[$j]['row'][$i]['text'] =
$project_entry[$uicols['name'][$i]];
!
$content[$j]['row'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&query='
. $project_entry['query_location'][$uicols['name'][$i]] . '&lookup=' .
$lookup);
! }
! else
! {
!
$content[$j]['row'][$i]['value'] =
$project_entry[$uicols['name'][$i]];
!
$content[$j]['row'][$i]['name'] = $uicols['name'][$i];
! }
!
}
+
+ if($lookup &&
$i==(count($uicols['name'])-2))
+
$content[$j]['row'][$i]['lookup_action'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&project_id='
. $project_entry['project_id']);
+
}
! if(!$lookup)
! {
! $content[$j]['row'][$i]['statustext']
= lang('view the project');
! $content[$j]['row'][$i]['text']
= lang('view');
! $content[$j]['row'][$i++]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.view&id='
. $project_entry['project_id']);
! $content[$j]['row'][$i]['statustext']
= lang('edit the project');
! $content[$j]['row'][$i]['text']
= lang('edit');
! $content[$j]['row'][$i++]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $project_entry['project_id']);
! $content[$j]['row'][$i]['statustext']
= lang('delete the project');
! $content[$j]['row'][$i]['text']
= lang('delete');
! $content[$j]['row'][$i++]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.delete&id='
. $project_entry['project_id']);
! }
$j++;
***************
*** 258,273 ****
}
! $table_header[$i]['width'] = '5%';
! $table_header[$i]['align'] =
'center';
! $table_header[$i]['header'] = lang('view');
! $i++;
! $table_header[$i]['width'] = '5%';
! $table_header[$i]['align'] =
'center';
! $table_header[$i]['header'] = lang('edit');
! $i++;
! $table_header[$i]['width'] = '5%';
! $table_header[$i]['align'] =
'center';
! $table_header[$i]['header'] =
lang('delete');
! $i++;
$table_add[] = array
--- 190,214 ----
}
! if(!$lookup)
! {
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header'] =
lang('view');
! $i++;
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header'] =
lang('edit');
! $i++;
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header'] =
lang('delete');
! $i++;
! }
! else
! {
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! $table_header[$i]['header'] =
lang('select');
! }
$table_add[] = array
***************
*** 362,366 ****
if($values && !$bypass)
{
! $values = $values +
$this->bocommon->get_location();
}
else
--- 303,313 ----
if($values && !$bypass)
{
! // $values = $values +
$this->bocommon->get_location();
!
! for ($i=0; $i<count($insert_record); $i++)
! {
!
$values['location'][$insert_record[$i]]= $_POST[$insert_record[$i]];
! }
!
}
else
***************
*** 381,385 ****
{
$tenant_data=$this->bocommon->read_single_tenant($values['tenant_id']);
! $values['tenant_phone']=
$tenant_data['tenant_phone'];
$values['tenant_name']=
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
}
--- 328,332 ----
{
$tenant_data=$this->bocommon->read_single_tenant($values['tenant_id']);
! $values['contact_phone']=
$tenant_data['contact_phone'];
$values['tenant_name']=
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
}
***************
*** 472,475 ****
--- 419,431 ----
endif;
}
+ else
+ {
+ if($values['location'])
+ {
+
$location_code=implode("-", $values['location']);
+
$values['location_data'] = $this->bolocation->read_single($location_code);
+ }
+ }
+
}
***************
*** 512,534 ****
}
-
$location_data=$this->bocommon->initiate_ui_location(array(
- 'location_type' => 'form',
- 'equipment' => true,
- 'tenant' => true,
- 'address' => true,
- 'equipment_id' =>
$values['equipment_id'],
- 'property_id' =>
$values['property_id'],
- 'property_name' =>
$values['property_name'],
- 'building_id' =>
$values['building_id'],
- 'entrance_id' =>
$values['entrance_id'],
- 'floor' =>
$values['floor'],
- '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']));
$link_data = array
--- 468,482 ----
}
+ $lookup_type='form';
+
$location_data=$this->bolocation->initiate_ui_location(array(
+ 'values' =>
$values['location_data'],
+ 'type_id' => -1,
// calculated from location_types
+ 'no_link' =>
False, // disable lookup links for location type less than type_id
+ 'tenant' => True,
+ 'equipment' => True,
+ 'lookup_type' => $lookup_type
+ ));
$link_data = array
***************
*** 777,798 ****
}
!
!
$location_data=$this->bocommon->initiate_ui_location(array(
! 'location_type' => 'view',
! 'equipment' =>
$values['equipment_id'],
! 'tenant' =>
$values['tenant_id'],
! 'address' => true,
! 'equipment_id' =>
$values['equipment_id'],
! 'property_id' =>
$values['property_id'],
! 'property_name' =>
$values['property_name'],
! 'building_id' =>
$values['building_id'],
! 'entrance_id' =>
$values['entrance_id'],
! 'floor' =>
$values['floor'],
! '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']));
if($values['origin']== 'ticket')
--- 725,736 ----
}
!
$location_data=$this->bolocation->initiate_ui_location(array(
! 'values' =>
$values['location_data'],
! 'type_id' => -1,
// calculated from location_types
! 'no_link' =>
False, // disable lookup links for location type less than type_id
! 'tenant' => True,
! 'equipment' => True,
! 'lookup_type' => 'view'
! ));
if($values['origin']== 'ticket')
Index: class.uimeter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uimeter.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uimeter.inc.php 23 May 2003 08:40:19 -0000 1.10
--- class.uimeter.inc.php 19 Jun 2003 20:03:09 -0000 1.11
***************
*** 276,280 ****
'tenant_id' =>
$values['tenant_id'],
'tenant_name' =>
$values['tenant_name'],
! 'tenant_phone' =>
$values['tenant_phone'],
'apartment_id' =>
$values['apartment_id']));
--- 276,280 ----
'tenant_id' =>
$values['tenant_id'],
'tenant_name' =>
$values['tenant_name'],
! 'contact_phone' =>
$values['contact_phone'],
'apartment_id' =>
$values['apartment_id']));
***************
*** 387,391 ****
'tenant_id' =>
$values['tenant_id'],
'tenant_name' =>
$values['tenant_name'],
! 'tenant_phone' =>
$values['tenant_phone'],
'apartment_id' =>
$values['apartment_id']
)
--- 387,391 ----
'tenant_id' =>
$values['tenant_id'],
'tenant_name' =>
$values['tenant_name'],
! 'contact_phone' =>
$values['contact_phone'],
'apartment_id' =>
$values['apartment_id']
)
Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uilookup.inc.php 19 Jun 2003 12:09:59 -0000 1.22
--- class.uilookup.inc.php 19 Jun 2003 20:03:09 -0000 1.23
***************
*** 630,634 ****
'tenant_name'
=> $location_entry['lastname'].', '.$location_entry['firstname'],
'category'
=> $location_entry['category'],
! 'tenant_phone'
=> $location_entry['tenant_phone']
);
}
--- 630,634 ----
'tenant_name'
=> $location_entry['lastname'].', '.$location_entry['firstname'],
'category'
=> $location_entry['category'],
! 'contact_phone'
=> $location_entry['contact_phone']
);
}
Index: class.uilocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uilocation.inc.php 18 Jun 2003 11:21:17 -0000 1.13
--- class.uilocation.inc.php 19 Jun 2003 20:03:10 -0000 1.14
***************
*** 585,593 ****
'lang_tenant'
=> lang('tenant'),
'value_tenant_id'
=> $values['tenant_id'],
! 'value_tenant_last_name' =>
$values['tenant_last_name'],
! 'value_tenant_first_name' =>
$values['tenant_first_name'],
'lang_tenant_statustext' =>
lang('Select a tenant'),
! 'size_last_name'
=> strlen($values['tenant_last_name']),
! 'size_first_name'
=> strlen($values['tenant_first_name']),
'lookup_type'
=> $lookup_type,
'location_data'
=> $location_data,
--- 585,593 ----
'lang_tenant'
=> lang('tenant'),
'value_tenant_id'
=> $values['tenant_id'],
! 'value_last_name'
=> $values['last_name'],
! 'value_first_name'
=> $values['first_name'],
'lang_tenant_statustext' =>
lang('Select a tenant'),
! 'size_last_name'
=> strlen($values['last_name']),
! 'size_first_name'
=> strlen($values['first_name']),
'lookup_type'
=> $lookup_type,
'location_data'
=> $location_data,
***************
*** 793,801 ****
'lang_tenant'
=> lang('tenant'),
'value_tenant_id'
=> $values['tenant_id'],
! 'value_tenant_last_name' =>
$values['tenant_last_name'],
! 'value_tenant_first_name' =>
$values['tenant_first_name'],
'lang_tenant_statustext' =>
lang('Select a tenant'),
! 'size_last_name'
=> strlen($values['tenant_last_name']),
! 'size_first_name'
=> strlen($values['tenant_first_name']),
'lookup_type'
=> $lookup_type,
'location_data'
=> $location_data,
--- 793,801 ----
'lang_tenant'
=> lang('tenant'),
'value_tenant_id'
=> $values['tenant_id'],
! 'value_last_name'
=> $values['last_name'],
! 'value_first_name'
=> $values['first_name'],
'lang_tenant_statustext' =>
lang('Select a tenant'),
! 'size_last_name'
=> strlen($values['last_name']),
! 'size_first_name'
=> strlen($values['first_name']),
'lookup_type'
=> $lookup_type,
'location_data'
=> $location_data,
Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.uiequipment.inc.php 19 Jun 2003 12:09:59 -0000 1.26
--- class.uiequipment.inc.php 19 Jun 2003 20:03:10 -0000 1.27
***************
*** 94,102 ****
if($uicols['input_type'][$i]!='hidden')
{
!
$content[$j]['row'][$i]['value'] =
$equipment_entry[$uicols['name'][$i]];
! $content[$j]['row'][$i]['name']
= $uicols['name'][$i];
}
}
$content[$j]['row'][$i]['statustext']
= lang('view the equipment');
$content[$j]['row'][$i]['text']
= lang('view');
--- 94,118 ----
if($uicols['input_type'][$i]!='hidden')
{
!
if($equipment_entry['query_location'][$uicols['name'][$i]])
! {
!
$content[$j]['row'][$i]['statustext'] = lang('search');
!
$content[$j]['row'][$i]['text'] =
$equipment_entry[$uicols['name'][$i]];
!
$content[$j]['row'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.index&query='
. $equipment_entry['query_location'][$uicols['name'][$i]]);
! }
! else
! {
!
$content[$j]['row'][$i]['value'] =
$equipment_entry[$uicols['name'][$i]];
!
$content[$j]['row'][$i]['name'] = $uicols['name'][$i];
! }
}
}
+ while
(is_array($equipment_entry['query_location']) && list($key,$query_location) =
each($equipment_entry['query_location']))
+ {
+ // _debug_array($key);
+
+ }
+
+
$content[$j]['row'][$i]['statustext']
= lang('view the equipment');
$content[$j]['row'][$i]['text']
= lang('view');
***************
*** 112,115 ****
--- 128,132 ----
}
+ //_debug_array($content);
for ($i=0;$i<count($uicols['descr']);$i++)
***************
*** 313,317 ****
$values['location_data'] =
$this->bolocation->read_single($location_code);
}
-
}
}
--- 330,333 ----
Index: class.sotts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.sotts.inc.php 15 May 2003 09:08:02 -0000 1.16
--- class.sotts.inc.php 19 Jun 2003 20:03:10 -0000 1.17
***************
*** 262,268 ****
$this->historylog->add('O',$id,mktime(),'');
! if($ticket['tenant_phone'])
{
! $this->db->query("update fm_tenant set
contact_phone='". $ticket['tenant_phone']. "' where tenant_id='".
$ticket['tenant_id']. "'",__LINE__,__FILE__);
}
--- 262,268 ----
$this->historylog->add('O',$id,mktime(),'');
! if($ticket['contact_phone'])
{
! $this->db->query("update fm_tenant set
contact_phone='". $ticket['contact_phone']. "' where tenant_id='".
$ticket['tenant_id']. "'",__LINE__,__FILE__);
}
Index: class.sorequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sorequest.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.sorequest.inc.php 26 May 2003 18:18:17 -0000 1.9
--- class.sorequest.inc.php 19 Jun 2003 20:03:10 -0000 1.10
***************
*** 452,458 ****
! if($request['tenant_phone'])
{
! $this->db->query("update fm_tenant set
contact_phone='". $request['tenant_phone']. "' where tenant_id='".
$request['tenant_id']. "'",__LINE__,__FILE__);
}
--- 452,458 ----
! if($request['contact_phone'])
{
! $this->db->query("update fm_tenant set
contact_phone='". $request['contact_phone']. "' where tenant_id='".
$request['tenant_id']. "'",__LINE__,__FILE__);
}
***************
*** 550,556 ****
$this->update_score('',$request['request_id']);
! if($request['tenant_phone'])
{
! $this->db->query("update fm_tenant set
contact_phone='". $request['tenant_phone']. "' where tenant_id='".
$request['tenant_id']. "'",__LINE__,__FILE__);
}
--- 550,556 ----
$this->update_score('',$request['request_id']);
! if($request['contact_phone'])
{
! $this->db->query("update fm_tenant set
contact_phone='". $request['contact_phone']. "' where tenant_id='".
$request['tenant_id']. "'",__LINE__,__FILE__);
}
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.soproject.inc.php 19 Jun 2003 12:09:59 -0000 1.15
--- class.soproject.inc.php 19 Jun 2003 20:03:10 -0000 1.16
***************
*** 224,238 ****
}
! if($max_location_join<$type_id)
{
! $location_code=
$this->db->f('location_code');
! $location = split('-',$location_code);
! $diff = $type_id - $max_location_join;
! $next = $type_id - $diff + 1;
! for ($m=0;$m<$diff;$m++)
! {
! $project_list[$j]['loc' .
$next] = $location[($next-1)];
! $next++;
! }
}
--- 224,233 ----
}
! $location_code= $this->db->f('location_code');
! $location = split('-',$location_code);
! for ($m=0;$m<count($location);$m++)
{
! $project_list[$j]['loc' . ($m+1)] =
$location[$m];
!
$project_list[$j]['query_location']['loc' . ($m+1)]=implode("-",
array_slice($location, 0, ($m+1)));
}
***************
*** 433,439 ****
! if($project['tenant_phone'])
{
! $this->db->query("update fm_tenant set
contact_phone='". $project['tenant_phone']. "' where tenant_id='".
$project['tenant_id']. "'",__LINE__,__FILE__);
}
--- 428,434 ----
! if($project['contact_phone'])
{
! $this->db->query("update fm_tenant set
contact_phone='". $project['contact_phone']. "' where tenant_id='".
$project['tenant_id']. "'",__LINE__,__FILE__);
}
***************
*** 561,567 ****
. "' 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__);
}
--- 556,562 ----
. "' WHERE id= '" . $project['project_id']
."'",__LINE__,__FILE__);
! if($project['contact_phone'])
{
! $this->db->query("update fm_tenant set
contact_phone='". $project['contact_phone']. "' where tenant_id='".
$project['tenant_id']. "'",__LINE__,__FILE__);
}
Index: class.solookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.solookup.inc.php 19 Jun 2003 12:09:59 -0000 1.20
--- class.solookup.inc.php 19 Jun 2003 20:03:10 -0000 1.21
***************
*** 975,979 ****
'category' =>
$this->db->f('descr'),
'tenant_id' =>
$this->db->f('tenant_id'),
! 'tenant_phone' =>
$this->db->f('contact_phone'),
'firstname' =>
$this->db->f('first_name'),
'lastname' =>
$this->db->f('last_name')
--- 975,979 ----
'category' =>
$this->db->f('descr'),
'tenant_id' =>
$this->db->f('tenant_id'),
! 'contact_phone' =>
$this->db->f('contact_phone'),
'firstname' =>
$this->db->f('first_name'),
'lastname' =>
$this->db->f('last_name')
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.solocation.inc.php 18 Jun 2003 11:21:17 -0000 1.9
--- class.solocation.inc.php 19 Jun 2003 20:03:10 -0000 1.10
***************
*** 460,474 ****
$uicols['statustext'][]
= 'dummy';
! $cols.= ',fm_tenant.last_name
as tenant_last_name';
! $cols_return[]
= 'tenant_last_name';
$uicols['input_type'][]
= 'text';
! $uicols['name'][]
= 'tenant_last_name';
$uicols['descr'][]
= lang('last name');
$uicols['statustext'][]
= lang('last name');
! $cols.= ',fm_tenant.first_name
as tenant_first_name';
! $cols_return[]
= 'tenant_first_name';
$uicols['input_type'][]
= 'text';
! $uicols['name'][]
= 'tenant_first_name';
$uicols['descr'][]
= lang('first name');
$uicols['statustext'][]
= lang('first name');
--- 460,474 ----
$uicols['statustext'][]
= 'dummy';
! $cols.= ',fm_tenant.last_name
as last_name';
! $cols_return[]
= 'last_name';
$uicols['input_type'][]
= 'text';
! $uicols['name'][]
= 'last_name';
$uicols['descr'][]
= lang('last name');
$uicols['statustext'][]
= lang('last name');
! $cols.= ',fm_tenant.first_name
as first_name';
! $cols_return[]
= 'first_name';
$uicols['input_type'][]
= 'text';
! $uicols['name'][]
= 'first_name';
$uicols['descr'][]
= lang('first name');
$uicols['statustext'][]
= lang('first name');
Index: class.soequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soequipment.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.soequipment.inc.php 19 Jun 2003 12:09:59 -0000 1.16
--- class.soequipment.inc.php 19 Jun 2003 20:03:10 -0000 1.17
***************
*** 203,221 ****
$equipment_list[$j]['attribute']=$attribute;
}
! if($max_location_join<$type_id)
{
! $location_code=
$this->db->f('location_code');
! $location = split('-',$location_code);
! $diff = $type_id - $max_location_join;
! $next = $type_id - $diff + 1;
! for ($m=0;$m<$diff;$m++)
! {
! $equipment_list[$j]['loc' .
$next] = $location[($next-1)];
! $next++;
! }
}
$j++;
}
return $equipment_list;
--- 203,217 ----
$equipment_list[$j]['attribute']=$attribute;
}
! $location_code= $this->db->f('location_code');
! $location = split('-',$location_code);
! for ($m=0;$m<count($location);$m++)
{
! $equipment_list[$j]['loc' . ($m+1)] =
$location[$m];
!
$equipment_list[$j]['query_location']['loc' . ($m+1)]=implode("-",
array_slice($location, 0, ($m+1)));
}
$j++;
}
+ //_debug_array($equipment_list);
return $equipment_list;
Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.socommon.inc.php 19 Jun 2003 12:09:59 -0000 1.27
--- class.socommon.inc.php 19 Jun 2003 20:03:10 -0000 1.28
***************
*** 240,244 ****
'first_name' =>
$this->db->f('first_name'),
'last_name' =>
$this->db->f('last_name'),
! 'tenant_phone' =>
$this->db->f('contact_phone')
);
--- 240,244 ----
'first_name' =>
$this->db->f('first_name'),
'last_name' =>
$this->db->f('last_name'),
! 'contact_phone' =>
$this->db->f('contact_phone')
);
Index: class.botts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.botts.inc.php 23 May 2003 08:40:19 -0000 1.11
--- class.botts.inc.php 19 Jun 2003 20:03:10 -0000 1.12
***************
*** 330,334 ****
$tenant_data=$this->socommon->read_single_tenant($ticket['tenant_id']);
$ticket['tenant_name']=
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
! $ticket['tenant_phone']=
$tenant_data['tenant_phone'];
}
--- 330,334 ----
$tenant_data=$this->socommon->read_single_tenant($ticket['tenant_id']);
$ticket['tenant_name']=
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
! $ticket['contact_phone']=
$tenant_data['contact_phone'];
}
Index: class.borequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.borequest.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.borequest.inc.php 26 May 2003 12:15:20 -0000 1.4
--- class.borequest.inc.php 19 Jun 2003 20:03:10 -0000 1.5
***************
*** 398,402 ****
{
$tenant_data=$this->socommon->read_single_tenant($request['tenant_id']);
! $request['tenant_phone']=
$tenant_data['tenant_phone'];
$request['tenant_name']=
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
}
--- 398,402 ----
{
$tenant_data=$this->socommon->read_single_tenant($request['tenant_id']);
! $request['contact_phone']=
$tenant_data['contact_phone'];
$request['tenant_name']=
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
}
Index: class.boproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boproject.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.boproject.inc.php 19 Jun 2003 12:09:59 -0000 1.6
--- class.boproject.inc.php 19 Jun 2003 20:03:10 -0000 1.7
***************
*** 334,351 ****
}
if($project['tenant_id'])
{
$tenant_data=$this->bocommon->read_single_tenant($project['tenant_id']);
! $project['tenant_phone']=
$tenant_data['tenant_phone'];
! $project['tenant_name']=
$tenant_data['last_name'] . ', ' . $tenant_data['first_name'];
}
-
$location_data=$this->socommon->read_location_data($project['location_code']);
-
- $project=$project + $location_data;
-
- //
$project['power_meter']=$location_data['power_meter_id'];
! //_debug_array($location_data);
return $project;
}
--- 334,354 ----
}
+ if($project['location_code'])
+ {
+
$location_data=$this->solocation->read_single($project['location_code']);
+ $project['location_data'] = $location_data;
+ }
+
if($project['tenant_id'])
{
$tenant_data=$this->bocommon->read_single_tenant($project['tenant_id']);
! $project['location_data']['tenant_id']=
$project['tenant_id'];
! $project['location_data']['contact_phone']=
$tenant_data['contact_phone'];
! $project['location_data']['last_name'] =
$tenant_data['last_name'];
! $project['location_data']['first_name'] =
$tenant_data['first_name'];
}
! //_debug_array($project);
return $project;
}
Index: class.boequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boequipment.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.boequipment.inc.php 19 Jun 2003 12:09:59 -0000 1.13
--- class.boequipment.inc.php 19 Jun 2003 20:03:10 -0000 1.14
***************
*** 49,53 ****
$this->so =
CreateObject($this->currentapp.'.soequipment');
$this->solocation =
CreateObject($this->currentapp.'.solocation');
- $this->socommon =
CreateObject($this->currentapp.'.socommon');
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
--- 49,52 ----
***************
*** 239,247 ****
//_debug_array($equipment);
return $equipment;
- }
-
- function select_part_of_town($part_of_town_id)
- {
- return
$this->socommon->select_part_of_town($part_of_town_id);
}
--- 238,241 ----
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** class.bocommon.inc.php 19 Jun 2003 12:09:58 -0000 1.55
--- class.bocommon.inc.php 19 Jun 2003 20:03:10 -0000 1.56
***************
*** 211,215 ****
$location['tenant_id'] =
get_var('tenant_id',array('POST','GET'));
$location['tenant_name'] =
get_var('tenant_name',array('POST','GET'));
! $location['tenant_phone'] =
get_var('tenant_phone',array('POST','GET'));
//_debug_array($location);
--- 211,215 ----
$location['tenant_id'] =
get_var('tenant_id',array('POST','GET'));
$location['tenant_name'] =
get_var('tenant_name',array('POST','GET'));
! $location['contact_phone'] =
get_var('contact_phone',array('POST','GET'));
//_debug_array($location);
***************
*** 257,265 ****
$location['lang_tenant']
= lang('Tenant');
$location['tenant_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=tenant');
! $location['lang_tenant_phone']
= lang('Tenant phone');
$location['lang_select_tenant_help']
= lang('Klick this link to select tenant');
$location['value_tenant_id']
= $data['tenant_id'];
$location['value_tenant_name']
= $data['tenant_name'];
! $location['value_tenant_phone']
= $data['tenant_phone'];
$data['apartment']
= True;
}
--- 257,265 ----
$location['lang_tenant']
= lang('Tenant');
$location['tenant_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=tenant');
! $location['lang_contact_phone']
= lang('Tenant phone');
$location['lang_select_tenant_help']
= lang('Klick this link to select tenant');
$location['value_tenant_id']
= $data['tenant_id'];
$location['value_tenant_name']
= $data['tenant_name'];
! $location['value_contact_phone']
= $data['contact_phone'];
$data['apartment']
= True;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.uiworkorder.inc.php,1.22,1.23 class.uitts.inc.php,1.27,1.28 class.uirequest.inc.php,1.18,1.19 class.uireport.inc.php,1.6,1.7 class.uiproject.inc.php,1.25,1.26 class.uimeter.inc.php,1.10,1.11 class.uilookup.inc.php,1.22,1.23 class.uilocation.inc.php,1.13,1.14 class.uiequipment.inc.php,1.26,1.27 class.sotts.inc.php,1.16,1.17 class.sorequest.inc.php,1.9,1.10 class.soproject.inc.php,1.15,1.16 class.solookup.inc.php,1.20,1.21 class.solocation.inc.php,1.9,1.10 class.soequipment.inc.php,1.16,1.17 class.socommon.inc.php,1.27,1.28 class.botts.inc.php,1.11,1.12 class.borequest.inc.php,1.4,1.5 class.boproject.inc.php,1.6,1.7 class.boequipment.inc.php,1.13,1.14class.bocommon.inc.php,1.55,1.56,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default location_view_2.xsl,1.1,NONE location_form_2.xsl,1.2,NONE
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default values.xsl,1.1,1.2 project.xsl,1.12,1.13 lookup.xsl,1.19,1.20 location.xsl,1.15,1.16 invoice.xsl,1.26,1.27
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default location_view_2.xsl,1.1,NONE location_form_2.xsl,1.2,NONE
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default values.xsl,1.1,1.2 project.xsl,1.12,1.13 lookup.xsl,1.19,1.20 location.xsl,1.15,1.16 invoice.xsl,1.26,1.27
- Index(es):