[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.4,1.5 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php,1.4,1.5 class.uilocation.inc.php,1.5,1.6 |
|
Date: |
Fri, 06 Jun 2003 07:38:19 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv10665/inc
Modified Files:
class.bolocation.inc.php class.uilocation.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.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.bolocation.inc.php 6 Jun 2003 10:23:03 -0000 1.4
--- class.bolocation.inc.php 6 Jun 2003 11:38:17 -0000 1.5
***************
*** 135,139 ****
$config = $this->soadmin_location->read_config('');
! _debug_array($config);
$location_types =
$this->soadmin_location->select_location_type();
//_debug_array($location_types);
--- 135,139 ----
$config = $this->soadmin_location->read_config('');
! //_debug_array($config);
$location_types =
$this->soadmin_location->select_location_type();
//_debug_array($location_types);
***************
*** 146,153 ****
$location['location'][$i]['input_type']
= 'text';
$location['location'][$i]['input_name']
= 'loc' . ($i+1);
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' . ($i+1)
. '()';
$location['location'][$i]['lookup_link']
= True;
$location['location'][$i]['name']
= $location_types[($i)]['name'];
! $location['location'][$i]['value']
= $data['location']['value'][$i];
$location['location'][$i]['statustext']
= lang('Klick this link to select') .
$location_types[($i)]['name'];
--- 146,154 ----
$location['location'][$i]['input_type']
= 'text';
$location['location'][$i]['input_name']
= 'loc' . ($i+1);
+ $location['location'][$i]['size']
= 5;
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' . ($i+1)
. '()';
$location['location'][$i]['lookup_link']
= True;
$location['location'][$i]['name']
= $location_types[($i)]['name'];
! $location['location'][$i]['value']
= $data['values']['loc' . ($i+1)];
$location['location'][$i]['statustext']
= lang('Klick this link to select') .
$location_types[($i)]['name'];
***************
*** 158,162 ****
$location['location'][$i]['extra'][0]['size'] = 30;
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
!
$location['location'][$i]['extra'][0]['value'] =
$data['location']['loc1_name'];
}
--- 159,163 ----
$location['location'][$i]['extra'][0]['size'] = 30;
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
!
$location['location'][$i]['extra'][0]['value'] =
$data['values']['loc' . ($i+1).'_name'];
}
***************
*** 171,182 ****
for ($j=0;$j<count($fm_location_colst);$j++)
{
! if($fm_location_colst[$j]['location_form'])
{
$location['location'][$i]['input_type']
= 'text';
$location['location'][$i]['input_name']
= $fm_location_colst[$j]['name'];
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$fm_location_colst[$j]['location_type'] . '()';
$location['location'][$i]['lookup_link'] = True;
$location['location'][$i]['name']
= $fm_location_colst[$j]['descr'];
! $location['location'][$i]['value']
=
$data['location']['value'][$fm_location_colst[$j]['name']];
$location['location'][$i]['statustext']
= lang('Klick this link to select') .
$location_types[($fm_location_colst[$j]['location_type']-1)]['name'];
$i++;
--- 172,184 ----
for ($j=0;$j<count($fm_location_colst);$j++)
{
! if($fm_location_colst[$j]['location_type'] <=
$data['type_id'] && $fm_location_colst[$j]['location_form'])
{
$location['location'][$i]['input_type']
= 'text';
$location['location'][$i]['input_name']
= $fm_location_colst[$j]['name'];
+ $location['location'][$i]['size']
= 5;
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$fm_location_colst[$j]['location_type'] . '()';
$location['location'][$i]['lookup_link'] = True;
$location['location'][$i]['name']
= $fm_location_colst[$j]['descr'];
! $location['location'][$i]['value']
=
$data['values'][$fm_location_colst[$j]['name']];
$location['location'][$i]['statustext']
= lang('Klick this link to select') .
$location_types[($fm_location_colst[$j]['location_type']-1)]['name'];
$i++;
***************
*** 189,197 ****
{
$location['location'][$i]['input_name']
= $config[$j]['column_name'];
$location['location'][$i]['value']
=
$data['location']['value'][$config[$j]['column_name']];
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$fm_location_colst[$j]['location_type'] . '()';
$location['location'][$i]['lookup_link'] = True;
$location['location'][$i]['name']
= $config[$j]['descr'];
! $location['location'][$i]['value']
=
$data['location']['value'][$config[$j]['name']];
$location['location'][$i]['statustext']
= lang('Klick this link to select') .
$location_types[($fm_location_colst[$j]['location_type']-1)]['name'];
$location['location'][$i]['input_type']
= 'text';
--- 191,200 ----
{
$location['location'][$i]['input_name']
= $config[$j]['column_name'];
+ $location['location'][$i]['size']
= 5;
$location['location'][$i]['value']
=
$data['location']['value'][$config[$j]['column_name']];
$location['location'][$i]['lookup_function_call'] = 'lookup_loc' .
$fm_location_colst[$j]['location_type'] . '()';
$location['location'][$i]['lookup_link'] = True;
$location['location'][$i]['name']
= $config[$j]['descr'];
! $location['location'][$i]['value']
= $data['values'][$config[$j]['column_name']];
$location['location'][$i]['statustext']
= lang('Klick this link to select') .
$location_types[($fm_location_colst[$j]['location_type']-1)]['name'];
$location['location'][$i]['input_type']
= 'text';
***************
*** 207,211 ****
$location['location'][$i]['extra'][0]['size']
= 30;
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
!
$location['location'][$i]['extra'][0]['value']
= $data['location']['value']['street_name'];
$location['location'][$i]['extra'][1]['input_type']
= 'text';
--- 210,214 ----
$location['location'][$i]['extra'][0]['size']
= 30;
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
!
$location['location'][$i]['extra'][0]['value']
= $data['values']['street_name'];
$location['location'][$i]['extra'][1]['input_type']
= 'text';
***************
*** 213,309 ****
$location['location'][$i]['extra'][1]['size']
= 6;
$location['location'][$i]['extra'][1]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
!
$location['location'][$i]['extra'][1]['value']
= $data['location']['value']['street_number'];
! $i++;
}
- }
- }
! //_debug_array($location['location']);
! if($data['equipment'])
! {
! $location['equipment']
= True;
! $location['lang_select_location_statustext']=
lang('select either a location or an equipment');
! $location['equipment_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.equipment');
! $location['lang_equipment']
= lang('Equipment');
! $location['value_equipment_id']
= $data['equipment_id'];
! $location['lang_select_equipment_help']
= lang('Klick this link to select equipment');
! if($data['equipment_id'])
! {
! $location['value_equipment_type'] =
$this->socommon->get_equipment_type($data['equipment_id']);
}
-
- }
- else
- {
- $location['lang_select_location_statustext']
= lang('select a location');
- }
-
-
- if($data['tenant'])
- {
- $location['tenant']
= True;
- $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;
- }
- if($data['apartment'])
- {
- $location['apartment']
= True;
- $location['apartment_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=apartment');
- $location['value_apartment_id']
= $data['apartment_id'];
- $location['value_floor']
= $data['floor'];
- $location['lang_select_apartment_help']
= lang('Klick this link to select apartment');
- $location['lang_floor']
= lang('Floor');
- $location['lang_apartment']
= lang('Apartment');
- $data['entrance']
= True;
- $data['address']
= True;
- }
-
- if($data['address'])
- {
- $location['address']
= True;
- $location['lang_address']
= lang('Address');
- $location['value_street_name']
= $data['street_name'];
- $location['value_street_number']
= $data['street_number'];
- }
- if($data['entrance'])
- {
- $location['entrance']
= True;
- $location['value_entrance_id']
= $data['entrance_id'];
- $location['value_street_name']
= $data['street_name'];
- $location['value_street_number']
= $data['street_number'];
- $location['entrance_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=entrance');
- $location['lang_entrance']
= lang('Entrance');
- $location['lang_select_entrance_help']
= lang('Klick this link to select entrance');
- $data['building']
= True;
}
! if($data['building'])
! {
! $location['building']
= True;
! $location['value_building_id']
= $data['building_id'];
! $location['building_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=building');
! $location['lang_building']
= lang('Building');
! $location['lang_select_building_help']
= lang('Klick this link to select building');
! }
!
! $location['overlib_source']
= './'.$this->currentapp.'/inc/overlib.js';
! $location['value_property_id']
= $data['property_id'];
! $location['value_property_name']
= $data['property_name'];
! $location['lang_location']
= lang('Location');
! $location['location_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=property');
! $location['property_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.location&list=property');
! $location['lang_property']
= lang('Property');
! $location['lang_select_property_help']
= lang('Klick this link to select property');
! $location['lang_property_name']
= lang('Property Name');
- //_debug_array($location);
return $location;
--- 216,245 ----
$location['location'][$i]['extra'][1]['size']
= 6;
$location['location'][$i]['extra'][1]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
!
$location['location'][$i]['extra'][1]['value']
= $data['values']['street_number'];
}
!
if($config[$j]['column_name']=='tenant_id')
! {
!
$location['location'][$i]['name'] =
lang('Tenant');
!
$location['location'][$i]['input_type'] = 'hidden';
!
$location['location'][$i]['extra'][0]['input_type']
= 'text';
!
$location['location'][$i]['extra'][0]['input_name']
= 'tenant_name';
!
$location['location'][$i]['extra'][0]['size']
= 30;
!
$location['location'][$i]['extra'][0]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
!
$location['location'][$i]['extra'][0]['value']
= $data['values']['tenant_name'];
!
$location['location'][$i]['extra'][1]['input_type']
= 'text';
!
$location['location'][$i]['extra'][1]['input_name']
= 'tenant_phone';
!
$location['location'][$i]['extra'][1]['size']
= 12;
!
$location['location'][$i]['extra'][1]['lookup_function_call'] = 'lookup_loc'
. ($i+1) . '()';
!
$location['location'][$i]['extra'][1]['value']
= $data['values']['tenant_phone'];
! }
! $i++;
}
}
! //_debug_array($location['location']);
return $location;
Index: class.uilocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uilocation.inc.php 6 Jun 2003 10:23:03 -0000 1.5
--- class.uilocation.inc.php 6 Jun 2003 11:38:17 -0000 1.6
***************
*** 236,239 ****
--- 236,240 ----
$apartment_id = $location[3];
+ // _debug_array($_POST);
$type_id =
get_var('type_id',array('GET'));
***************
*** 353,357 ****
(
'menuaction' =>
$this->currentapp.'.uilocation.edit',
! 'location_code' => $location_code
);
--- 354,359 ----
(
'menuaction' =>
$this->currentapp.'.uilocation.edit',
! 'location_code' => $location_code,
! 'type_id' => $type_id
);
***************
*** 373,394 ****
}
- /*
$location_data=$this->bocommon->initiate_ui_location(array(
- 'location_type' =>
$location_type,
- 'entrance' => True,
- 'property_id' =>
$values['property_id'],
- 'property_name' =>
$values['property_name'],
- 'building_id' =>
$values['building_id'],
- 'entrance_id' =>
$values['entrance_id'],
- ));
-
- */
$location_data=$this->bo->initiate_ui_location(array(
'type_id' =>
$type_id,
! 'location_type' =>
$location_type,
! 'entrance' => True,
! 'property_id' =>
$values['property_id'],
! 'property_name' =>
$values['property_name'],
! 'building_id' =>
$values['building_id'],
! 'entrance_id' =>
$values['entrance_id'],
));
--- 375,382 ----
}
$location_data=$this->bo->initiate_ui_location(array(
+ 'values' =>
$_POST,
'type_id' =>
$type_id,
! 'location_type' =>
$location_type
));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php,1.4,1.5 class.uilocation.inc.php,1.5,1.6,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default location.xsl,1.8,1.9
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default location_form_2.xsl,NONE,1.1 location_view_2.xsl,NONE,1.1
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default location.xsl,1.8,1.9
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default location_form_2.xsl,NONE,1.1 location_view_2.xsl,NONE,1.1
- Index(es):