|
| From: | Sigurd Nes <address@hidden> |
| Subject: | [Phpgroupware-cvs] CVS: property/inc class.boequipment.inc.php,1.10,1.11 class.uiequipment.inc.php,1.22,1.23class.uilookup.inc.php,1.20,1.21 |
| Date: | Mon, 16 Jun 2003 11:30:28 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv27486/inc
Modified Files:
class.boequipment.inc.php class.uiequipment.inc.php
class.uilookup.inc.php
Log Message:
no message
Index: class.boequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boequipment.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.boequipment.inc.php 16 Jun 2003 12:44:48 -0000 1.10
--- class.boequipment.inc.php 16 Jun 2003 15:30:26 -0000 1.11
***************
*** 207,210 ****
--- 207,211 ----
$this->total_records = $this->so->total_records;
+ $this->uicols = $this->so->uicols;
return $equipment;
}
Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uiequipment.inc.php 23 May 2003 08:40:19 -0000 1.22
--- class.uiequipment.inc.php 16 Jun 2003 15:30:26 -0000 1.23
***************
*** 82,169 ****
$equipment_list = $this->bo->read();
! //_debug_array($equipment_list);
! while (is_array($equipment_list) && list(,$equipment) =
each($equipment_list))
{
! $value_attribute =
(isset($equipment['attribute'])?$equipment['attribute']:'');
! $location = split("-",
$equipment['location_code']);
! $content[] = array
! (
! 'equipment_id'
=> $equipment['equipment_id'],
! 'descr'
=> $equipment['descr'],
! 'property_id'
=> $location[0],
! 'building_id'
=> $location[1],
! 'entrance_id'
=> $location[2],
! 'floor'
=> $equipment['floor'],
! 'apartment_id'
=> $location[3],
! 'address'
=> $equipment['address'],
! 'category'
=> $equipment['category'],
! 'date'
=> $equipment['date'],
! 'owner'
=> $equipment['owner'],
! 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.view&id='
. $equipment['equipment_id']),
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.edit&id='
. $equipment['equipment_id']),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.delete&equipment_id='
. $equipment['equipment_id']),
! 'lang_view_statustext' =>
lang('view the equipment'),
! 'lang_edit_statustext' =>
lang('edit the equipment'),
! 'lang_delete_statustext' =>
lang('delete this equipment'),
! 'text_view'
=> lang('view'),
! 'value_attribute'
=> $value_attribute,
! 'text_edit'
=> lang('edit'),
! 'text_delete'
=> lang('delete')
! );
}
! $table_header[] = array
! (
! 'sort_equipment' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'equipment_id',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiequipment.index',
!
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'filter'
=>$this->filter,
!
'query'
=>$this->query)
!
)),
! 'lang_equipment' => lang('Equipment'),
! 'lang_descr' => lang('Descr'),
! 'sort_property' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'property_id',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiequipment.index',
!
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'filter'
=>$this->filter,
!
'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.'.uiequipment.index',
!
'cat_id'
=>$this->cat_id,
'district_id' =>
$this->district_id,
!
'filter'
=>$this->filter,
!
'query'
=>$this->query)
!
)),
! 'lang_address' => lang('Address'),
! 'lang_category' => lang('Category'),
! 'attribute' =>
$value_attribute,
! 'lang_attribute' => lang('Attribute'),
! 'lang_view' => lang('view'),
! 'lang_edit' => lang('edit'),
! 'lang_delete' => lang('delete')
! );
$table_add[] = array
--- 82,183 ----
$equipment_list = $this->bo->read();
! $uicols = $this->bo->uicols;
! $j=0;
! while (is_array($equipment_list) &&
list(,$equipment_entry) = each($equipment_list))
{
! for ($i=0;$i<count($uicols['name']);$i++)
! {
! 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');
! $content[$j]['row'][$i++]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.view&id='
. $equipment_entry['equipment_id']);
! $content[$j]['row'][$i]['statustext']
= lang('edit the equipment');
! $content[$j]['row'][$i]['text']
= lang('edit');
! $content[$j]['row'][$i++]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.edit&id='
. $equipment_entry['equipment_id']);
! $content[$j]['row'][$i]['statustext']
= lang('delete the equipment');
! $content[$j]['row'][$i]['text']
= lang('delete');
! $content[$j]['row'][$i++]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.delete&id='
. $equipment_entry['equipment_id']);
! $j++;
}
!
! for ($i=0;$i<count($uicols['descr']);$i++)
! {
! if($uicols['input_type'][$i]!='hidden')
! {
! $table_header[$i]['header'] =
$uicols['descr'][$i];
! $table_header[$i]['width']
= '5%';
! $table_header[$i]['align']
= 'center';
! if($uicols['name'][$i]=='loc1')
! {
! $table_header[$i]['sort_link']
=true;
! $table_header[$i]['sort']
= $this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'loc1',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiequipment.index',
!
'type_id'
=>$type_id,
!
'query'
=>$this->query,
!
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
!
));
! }
! if($uicols['name'][$i]=='equipment_id')
! {
! $table_header[$i]['sort_link']
=true;
! $table_header[$i]['sort']
= $this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'equipment_id',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiequipment.index',
!
'type_id'
=>$type_id,
!
'query'
=>$this->query,
!
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
!
));
! }
! if($uicols['name'][$i]=='street_name')
! {
! $table_header[$i]['sort_link']
=true;
! $table_header[$i]['sort']
= $this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'street_name',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uiequipment.index',
!
'type_id'
=>$type_id,
!
'query'
=>$this->query,
!
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
!
'cat_id'
=>$this->cat_id)
!
));
! }
! }
! }
!
! $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
Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.uilookup.inc.php 13 Jun 2003 11:05:30 -0000 1.20
--- class.uilookup.inc.php 16 Jun 2003 15:30:26 -0000 1.21
***************
*** 803,806 ****
--- 803,807 ----
'type_id'
=>$type_id,
'query'
=>$this->query,
+
'district_id' =>
$this->district_id,
'lookup'
=>$lookup,
'cat_id'
=>$this->cat_id)
***************
*** 819,822 ****
--- 820,824 ----
'query'
=>$this->query,
'lookup'
=>$lookup,
+
'district_id' =>
$this->district_id,
'cat_id'
=>$this->cat_id)
));
***************
*** 834,837 ****
--- 836,840 ----
'query'
=>$this->query,
'lookup'
=>$lookup,
+
'district_id' =>
$this->district_id,
'cat_id'
=>$this->cat_id)
));
| [Prev in Thread] | Current Thread | [Next in Thread] |