[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.13,1.14 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.13,1.14 class.boequipment.inc.php,1.1,1.2class.bostandard_entity.inc.php,1.4,1.5 class.socommon.inc.php,1.7,1.8 class.soequipment.inc.php,1.1,1.2 class.soinvestment.inc.php,1.4,1.5 class.solookup.inc.php,1.6,1.7 class.sostandard_entity.inc.php,1.5,1.6class.uiequipment.inc.php,1.1,1.2 class.uistandard_entity.inc.php,1.4,1.5 |
|
Date: |
Wed, 12 Feb 2003 14:33:40 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv14940/inc
Modified Files:
class.bocommon.inc.php class.boequipment.inc.php
class.bostandard_entity.inc.php class.socommon.inc.php
class.soequipment.inc.php class.soinvestment.inc.php
class.solookup.inc.php class.sostandard_entity.inc.php
class.uiequipment.inc.php class.uistandard_entity.inc.php
Log Message:
no message
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.bocommon.inc.php 11 Feb 2003 20:41:19 -0000 1.13
--- class.bocommon.inc.php 12 Feb 2003 19:33:36 -0000 1.14
***************
*** 824,828 ****
}
-
$categories=
$this->socommon->select_category_equipment_list();
--- 824,827 ----
Index: class.boequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boequipment.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.boequipment.inc.php 11 Feb 2003 20:41:19 -0000 1.1
--- class.boequipment.inc.php 12 Feb 2003 19:33:37 -0000 1.2
***************
*** 57,60 ****
--- 57,61 ----
$filter = get_var('filter',array('POST','GET'));
$cat_id = get_var('cat_id',array('POST','GET'));
+ $district_id =
get_var('district_id',array('POST','GET'));
if ($start)
***************
*** 87,104 ****
$this->cat_id = $cat_id;
}
}
function read()
{
$equipment = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'filter' => $this->filter,'cat_id' => $this->cat_id));
$this->total_records = $this->so->total_records;
- for ($i=0; $i<count($equipment); $i++)
- {
- $equipment[$i]['date'] =
$GLOBALS['phpgw']->common->show_date($equipment[$i]['date']);
- $equipment[$i]['owner'] =
$GLOBALS['phpgw']->accounts->id2name($equipment[$i]['owner']);
- }
return $equipment;
}
--- 88,140 ----
$this->cat_id = $cat_id;
}
+ if(isset($district_id))
+ {
+ $this->district_id = $district_id;
+ }
}
+ function filter($selected='')
+ {
+
+
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_filter'));
+
+ if($this->cat_id)
+ {
+ $filters=
$this->so->get_filter_list($this->cat_id);
+ }
+
+ while (is_array($filters) && list(,$filter) =
each($filters))
+ {
+ $sel_filter = '';
+ if ($filter['id']==$selected)
+ {
+ $sel_filter = 'selected';
+ }
+
+ $filter_list[] = array
+ (
+ 'id' => $filter['id'],
+ 'name' => $filter['name'],
+ 'selected' => $sel_filter
+ );
+ }
+
+ for ($i=0;$i<count($filter_list);$i++)
+ {
+ if ($filter_list[$i]['selected'] != 'selected')
+ {
+ unset($filter_list[$i]['selected']);
+ }
+ }
+
+ return $filter_list;
+ }
function read()
{
$equipment = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'filter' => $this->filter,'cat_id' => $this->cat_id,'district_id' =>
$this->district_id));
$this->total_records = $this->so->total_records;
return $equipment;
}
Index: class.bostandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bostandard_entity.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.bostandard_entity.inc.php 11 Feb 2003 20:41:19 -0000 1.4
--- class.bostandard_entity.inc.php 12 Feb 2003 19:33:37 -0000 1.5
***************
*** 96,99 ****
--- 96,100 ----
$this->total_records = $this->so->total_records;
+
return $standard;
}
***************
*** 134,141 ****
$this->total_records = $this->so->total_records;
return $attrib;
}
-
function read_single_attrib($id,$type)
{
--- 135,153 ----
$this->total_records = $this->so->total_records;
+ $datatype_text = array(
+ 'I' => 'Integer',
+ 'C' => 'Character',
+ 'N' => 'Float',
+ 'T' => 'Datetime'
+ );
+
+ for ($i=0; $i<count($attrib); $i++)
+ {
+ $attrib[$i]['datatype'] =
lang($datatype_text[$attrib[$i]['datatype']]);
+ }
+
return $attrib;
}
function read_single_attrib($id,$type)
{
***************
*** 176,180 ****
(
'id' => $type['id'],
! 'num' => $type['num'],
'selected' => $sel_type
);
--- 188,192 ----
(
'id' => $type['id'],
! 'name' => $type['name'],
'selected' => $sel_type
);
***************
*** 195,205 ****
{
$datatypes[0]['id']= 'C';
! $datatypes[0]['num']= lang('Character');
$datatypes[1]['id']= 'I';
! $datatypes[1]['num']= lang('Integer');
$datatypes[2]['id']= 'N';
! $datatypes[2]['num']= lang('Decimal');
$datatypes[3]['id']= 'T';
! $datatypes[3]['num']= lang('Datetime');
while (is_array($datatypes) && list(,$type) =
each($datatypes))
--- 207,217 ----
{
$datatypes[0]['id']= 'C';
! $datatypes[0]['name']= lang('Character');
$datatypes[1]['id']= 'I';
! $datatypes[1]['name']= lang('Integer');
$datatypes[2]['id']= 'N';
! $datatypes[2]['name']= lang('Decimal');
$datatypes[3]['id']= 'T';
! $datatypes[3]['name']= lang('Datetime');
while (is_array($datatypes) && list(,$type) =
each($datatypes))
***************
*** 214,218 ****
(
'id' => $type['id'],
! 'num' => $type['num'],
'selected' => $sel_type
);
--- 226,230 ----
(
'id' => $type['id'],
! 'name' => $type['name'],
'selected' => $sel_type
);
Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.socommon.inc.php 10 Feb 2003 22:33:01 -0000 1.7
--- class.socommon.inc.php 12 Feb 2003 19:33:37 -0000 1.8
***************
*** 153,157 ****
{
! $this->db->query("SELECT id, num FROM fm_equipment_type
ORDER BY num ");
$i = 0;
--- 153,157 ----
{
! $this->db->query("SELECT id, name FROM
fm_equipment_type ORDER BY name ");
$i = 0;
***************
*** 159,163 ****
{
$categories[$i]['id']
= $this->db->f('id');
! $categories[$i]['name']
= stripslashes($this->db->f('num'));
$i++;
}
--- 159,163 ----
{
$categories[$i]['id']
= $this->db->f('id');
! $categories[$i]['name']
= stripslashes($this->db->f('name'));
$i++;
}
Index: class.soequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soequipment.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.soequipment.inc.php 11 Feb 2003 20:41:19 -0000 1.1
--- class.soequipment.inc.php 12 Feb 2003 19:33:37 -0000 1.2
***************
*** 27,31 ****
--- 27,49 ----
$this->join = " LEFT JOIN ";
}
+ }
+
+ function get_filter_list($cat_id='')
+ {
+ $sql = "SELECT id ,name FROM fm_equipment_type_attrib
where type_id = '$cat_id' ORDER BY name DESC";
+
+ $this->db->query($sql .
$ordermethod,$start,__LINE__,__FILE__);
+ while ($this->db->next_record())
+ {
+ $ngrants =
(int)$this->grants[$this->db->f('fm_equipment.owner')];
+ $filter_list[] = array
+ (
+ 'id' => $this->db->f('id'),
+ 'name' => $this->db->f('name'),
+ );
+ }
+
+ return $filter_list;
}
***************
*** 43,51 ****
$start=0;
}
! $filter =
(isset($data['filter'])?$data['filter']:'none');
$query =
(isset($data['query'])?$data['query']:'');
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
$order =
(isset($data['order'])?$data['order']:'');
$cat_id =
(isset($data['cat_id'])?$data['cat_id']:0);
}
--- 61,70 ----
$start=0;
}
! $filter =
(isset($data['filter'])?$data['filter']:'');
$query =
(isset($data['query'])?$data['query']:'');
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
$order =
(isset($data['order'])?$data['order']:'');
$cat_id =
(isset($data['cat_id'])?$data['cat_id']:0);
+ $district_id =
(isset($data['district_id'])?$data['district_id']:0);
}
***************
*** 56,92 ****
else
{
! $ordermethod = ' order by objekt_id DESC';
}
! if ($filter == 'none')
{
! $filtermethod = ' ( owner=' . $this->account;
! if (is_array($this->grants))
{
! $grants = $this->grants;
! while (list($user) = each($grants))
! {
! $public_user_list[] = $user;
! }
! reset($public_user_list);
! $filtermethod .= " OR (access='public'
OR owner IN(" . implode(',',$public_user_list) . ")))";
! }
! else
! {
! $filtermethod .= ' )';
}
! }
! elseif ($filter == 'yours')
! {
! $filtermethod = " owner='" . $this->account .
"'";
}
else
{
! $filtermethod = " owner='" . $this->account .
"' AND access='private'";
}
if ($cat_id > 0)
{
! $filtermethod .= " AND cat_id='$cat_id' ";
}
--- 75,105 ----
else
{
! $ordermethod = ' order by equipment_id ASC';
}
! $filtermethod = ' ( fm_equipment.owner=' .
$this->account;
! if (is_array($this->grants))
{
! $grants = $this->grants;
! while (list($user) = each($grants))
{
! $public_user_list[] = $user;
}
! reset($public_user_list);
! $filtermethod .= " OR
(fm_equipment.access='public' OR fm_equipment.owner IN(" .
implode(',',$public_user_list) . ")))";
}
else
{
! $filtermethod .= ' )';
}
if ($cat_id > 0)
{
! $filtermethod .= " AND
fm_equipment.equipment_type_id='$cat_id' ";
! }
!
! if ($district_id > 0)
! {
! $filtermethod .= " AND
omraade_id='$district_id' ";
}
***************
*** 96,125 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND objekt_id LIKE '%$query%'
or byggnavn LIKE '%$query%'";
}
! $sql = "SELECT * FROM boei_bygg WHERE $filtermethod
$querymethod";
- $this->db2->query($sql,__LINE__,__FILE__);
- $this->total_records = $this->db2->num_rows();
$this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
while ($this->db->next_record())
{
! $ngrants =
(int)$this->grants[$this->db->f('equipment_owner')];
! $equipment[] = array
(
'property_id' =>
$this->db->f('objekt_id'),
! 'equipment_id' =>
$this->db->f('bygg_id'),
! 'owner' =>
$this->db->f('owner'),
! 'owner_id' =>
(int)$this->db->f('owner'),
! 'access' =>
$this->db->f('access'),
! 'date' =>
$this->db->f('entry_date'),
! 'cat_id' =>
(int)$this->db->f('cat_id'),
! 'name' =>
stripslashes($this->db->f('byggnavn')),
! 'grants' => $ngrants
! );
}
! return $equipment;
}
--- 109,183 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND fm_equipment.objekt_id
LIKE '%$query%' or fm_equipment.descr LIKE '%$query%'";
}
! $sql = "SELECT equipment_id,fm_equipment.descr,
boei_objekt.navn,fm_equipment.objekt_id,bygg_id,seksjons_id,etasje,leie_id,street,
fm_equipment_type.name as category"
! . " FROM fm_equipment $this->join"
! . " boei_objekt ON fm_equipment.objekt_id =
boei_objekt.objekt_id $this->join"
! . " boei_bydel ON boei_objekt.bydel_id =
boei_bydel.bydel_id $this->join"
! . " fm_equipment_type ON fm_equipment.equipment_type_id
= fm_equipment_type.id "
! . " WHERE $filtermethod $querymethod ";
$this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
while ($this->db->next_record())
{
! $ngrants =
(int)$this->grants[$this->db->f('fm_equipment.owner')];
! $equipment_list[] = array
(
+ 'equipment_id' =>
$this->db->f('equipment_id'),
'property_id' =>
$this->db->f('objekt_id'),
! 'property_name' => $this->db->f('navn'),
! 'building_id' =>
$this->db->f('bygg_id'),
! 'entrance_id' =>
$this->db->f('seksjons_id'),
! 'floor' =>
$this->db->f('etasje'),
! 'apartment_id' =>
$this->db->f('leie_id'),
! 'street' =>
$this->db->f('street'),
! 'category' =>
$this->db->f('category'),
! 'descr' =>
$this->db->f('descr'),
! 'grants' => $ngrants
! );
! }
!
! if($filter)
! {
! while (is_array($equipment_list) &&
list(,$equipment) = each($equipment_list))
! {
! $sql = "SELECT c,i,n,t from
fm_equipment_attrib where equipment_id ='" . $equipment['equipment_id'] . "'
and attrib_id='$filter'";
!
$this->db->query($sql,__LINE__,__FILE__);
! $this->db->next_record();
!
! $char_value = $this->db->f('c');
! $int_value = $this->db->f('i');
! $num_value = $this->db->f('n');
! $date_value = $this->db->f('t');
! $attribute = $char_value .$int_value .
$num_value . $date_value;
!
! if ($attribute)
! {
! $equipment_list2[] = array
! (
! 'equipment_id' =>
$equipment['equipment_id'],
! 'property_id' =>
$equipment['property_id'],
! 'property_name' =>
$equipment['property_name'],
! 'building_id' =>
$equipment['building_id'],
! 'entrance_id' =>
$equipment['entrance_id'],
! 'floor'
=> $equipment['floor'],
! 'apartment_id' =>
$equipment['apartment_id'],
! 'street'
=> $equipment['street'],
! 'category'
=> $equipment['category'],
! 'descr'
=> $equipment['descr'],
! 'grants'
=> $equipment['grants'],
! 'attribute'
=> $attribute
! );
! }
! }
!
! $this->total_records = count($equipment_list2);
! return $equipment_list2;
}
!
! $this->total_records = count($equipment_list);
! return $equipment_list;
}
***************
*** 139,143 ****
$equipment['access']
= $this->db->f('access');
$equipment['date']
= $this->db->f('entry_date');
! $equipment['cat_id']
= (int)$this->db->f('cat_id');
$equipment['omraade_id']
= $this->db->f('omraade_id');
$equipment['part_of_town'] =
$this->db->f('bydel');
--- 197,201 ----
$equipment['access']
= $this->db->f('access');
$equipment['date']
= $this->db->f('entry_date');
! $equipment['cat_id']
= (int)$this->db->f('fm_equipment.equipment_type_id');
$equipment['omraade_id']
= $this->db->f('omraade_id');
$equipment['part_of_town'] =
$this->db->f('bydel');
***************
*** 152,156 ****
{
! $this->db->query("INSERT INTO boei_bygg (location_code,
objekt_id,bygg_id,owner,access,entry_date,byggnavn,generelladresse,cat_id) "
. "VALUES ('" . $equipment['location_code'].
"','" . $equipment['property_id'] . "','" . $equipment['equipment_id'] . "','"
. $this->account . "','" . $equipment['access'] . "','" . time() . "','" .
$equipment['name']
. "','" . $equipment['generaladdress'] ."','" .
$equipment['cat_id']. "')",__LINE__,__FILE__);
--- 210,214 ----
{
! $this->db->query("INSERT INTO boei_bygg (location_code,
objekt_id,bygg_id,owner,access,entry_date,byggnavn,generelladresse,equipment_type_id)
"
. "VALUES ('" . $equipment['location_code'].
"','" . $equipment['property_id'] . "','" . $equipment['equipment_id'] . "','"
. $this->account . "','" . $equipment['access'] . "','" . time() . "','" .
$equipment['name']
. "','" . $equipment['generaladdress'] ."','" .
$equipment['cat_id']. "')",__LINE__,__FILE__);
***************
*** 168,172 ****
$this->db->query("UPDATE boei_bygg set byggnavn='" .
$equipment['name'] . "', entry_date='" . time()
! . "', cat_id='" .
$equipment['cat_id'] . "', generelladresse='" . $equipment['generaladdress'] .
"', access='" . $equipment['access']
. "' WHERE objekt_id= '" .
$equipment['property_id']
. "' AND bygg_id=" .
$equipment['equipment_id'],__LINE__,__FILE__);
--- 226,230 ----
$this->db->query("UPDATE boei_bygg set byggnavn='" .
$equipment['name'] . "', entry_date='" . time()
! . "', equipment_type_id='"
. $equipment['cat_id'] . "', generelladresse='" . $equipment['generaladdress']
. "', access='" . $equipment['access']
. "' WHERE objekt_id= '" .
$equipment['property_id']
. "' AND bygg_id=" .
$equipment['equipment_id'],__LINE__,__FILE__);
Index: class.soinvestment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvestment.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.soinvestment.inc.php 26 Jan 2003 12:27:49 -0000 1.4
--- class.soinvestment.inc.php 12 Feb 2003 19:33:37 -0000 1.5
***************
*** 107,111 ****
{
$sql = "SELECT
fm_investment.location_code,fm_investment.entity_id, fm_investment.descr as
descr, fm_investment_value.invest_id,initial_value,"
! . " fm_investment_value.value,
fm_investment_value.date, fm_investment_value.this_index,fm_equipment.descr as
equipment_descr, fm_equipment_type.num as equipment_name, "
. " fm_investment_value.index_count "
. " FROM fm_investment $this->join "
--- 107,111 ----
{
$sql = "SELECT
fm_investment.location_code,fm_investment.entity_id, fm_investment.descr as
descr, fm_investment_value.invest_id,initial_value,"
! . " fm_investment_value.value,
fm_investment_value.date, fm_investment_value.this_index,fm_equipment.descr as
equipment_descr, fm_equipment_type.name as equipment_name, "
. " fm_investment_value.index_count "
. " FROM fm_investment $this->join "
Index: class.solookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.solookup.inc.php 10 Feb 2003 22:33:01 -0000 1.6
--- class.solookup.inc.php 12 Feb 2003 19:33:37 -0000 1.7
***************
*** 198,202 ****
! $sql = "SELECT
boei_leieobjekt.objekt_id,bygg_id,seksjons_id,etasje,leie_id,gatenr,gatenavn,num,boei_leieobjekt.leietaker_id,
fornavn, etternavn"
. " FROM boei_leieobjekt $this->join"
. " boei_objekt ON boei_leieobjekt.objekt_id =
boei_objekt.objekt_id $this->join"
--- 198,202 ----
! $sql = "SELECT
boei_leieobjekt.objekt_id,bygg_id,seksjons_id,etasje,leie_id,gatenr,gatenavn,fm_apartment_category.descr
as category,boei_leieobjekt.leietaker_id, fornavn, etternavn"
. " FROM boei_leieobjekt $this->join"
. " boei_objekt ON boei_leieobjekt.objekt_id =
boei_objekt.objekt_id $this->join"
***************
*** 223,227 ****
'street_name' =>
$this->db->f('gatenavn'),
'street_number' =>
$this->db->f('gatenr'),
! 'category' =>
$this->db->f('num'),
'tenant_id' =>
$this->db->f('leietaker_id'),
'firstname' =>
$this->db->f('fornavn'),
--- 223,227 ----
'street_name' =>
$this->db->f('gatenavn'),
'street_number' =>
$this->db->f('gatenr'),
! 'category' =>
$this->db->f('category'),
'tenant_id' =>
$this->db->f('leietaker_id'),
'firstname' =>
$this->db->f('fornavn'),
***************
*** 323,327 ****
(
'property_id' =>
$this->db->f('objekt_id'),
- 'category' =>
$this->db->f('num'),
'property_name' =>
$this->db->f('navn')
);
--- 323,326 ----
***************
*** 426,431 ****
'property_id' =>
$this->db->f('objekt_id'),
'property_name' => $this->db->f('navn'),
! 'building_id' =>
$this->db->f('bygg_id'),
! 'category' =>
$this->db->f('num'),
);
}
--- 425,429 ----
'property_id' =>
$this->db->f('objekt_id'),
'property_name' => $this->db->f('navn'),
! 'building_id' =>
$this->db->f('bygg_id')
);
}
***************
*** 532,538 ****
'building_id' =>
$this->db->f('bygg_id'),
'entrance_id' =>
$this->db->f('seksjons_id'),
! 'floor' =>
$this->db->f('etasje'),
! 'street_name' =>
$this->db->f('beskrivelse'),
! 'category' =>
$this->db->f('num'),
);
}
--- 530,534 ----
'building_id' =>
$this->db->f('bygg_id'),
'entrance_id' =>
$this->db->f('seksjons_id'),
! 'street_name' =>
$this->db->f('beskrivelse')
);
}
***************
*** 645,649 ****
'street_name' =>
$this->db->f('gatenavn'),
'street_number' =>
$this->db->f('gatenr'),
! 'category' =>
$this->db->f('num')
);
}
--- 641,645 ----
'street_name' =>
$this->db->f('gatenavn'),
'street_number' =>
$this->db->f('gatenr'),
! 'category' =>
$this->db->f('descr')
);
}
***************
*** 757,761 ****
'street_name' =>
$this->db->f('gatenavn'),
'street_number' =>
$this->db->f('gatenr'),
! 'category' =>
$this->db->f('num'),
'tenant_id' =>
$this->db->f('leietaker_id'),
'tenant_phone' =>
$this->db->f('contact_phone'),
--- 753,757 ----
'street_name' =>
$this->db->f('gatenavn'),
'street_number' =>
$this->db->f('gatenr'),
! 'category' =>
$this->db->f('descr'),
'tenant_id' =>
$this->db->f('leietaker_id'),
'tenant_phone' =>
$this->db->f('contact_phone'),
***************
*** 843,847 ****
! $sql = "SELECT equipment_id,fm_equipment.descr
,fm_equipment.objekt_id,bygg_id,seksjons_id,etasje,leie_id,street,
fm_equipment_type.num as category"
. " FROM fm_equipment $this->join"
. " boei_objekt ON fm_equipment.objekt_id =
boei_objekt.objekt_id $this->join"
--- 839,843 ----
! $sql = "SELECT equipment_id,fm_equipment.descr
,fm_equipment.objekt_id,bygg_id,seksjons_id,etasje,leie_id,street,
fm_equipment_type.name as category"
. " FROM fm_equipment $this->join"
. " boei_objekt ON fm_equipment.objekt_id =
boei_objekt.objekt_id $this->join"
Index: class.sostandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_entity.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.sostandard_entity.inc.php 11 Feb 2003 20:41:19 -0000 1.5
--- class.sostandard_entity.inc.php 12 Feb 2003 19:33:37 -0000 1.6
***************
*** 67,71 ****
$query = ereg_replace('"','',$query);
! $querymethod = " where num LIKE '%$query%' or
descr LIKE '%$query%'";
}
--- 67,71 ----
$query = ereg_replace('"','',$query);
! $querymethod = " where name LIKE '%$query%' or
descr LIKE '%$query%'";
}
***************
*** 81,85 ****
(
'id' => $this->db->f('id'),
! 'num' => $this->db->f('num'),
'descr' => $this->db->f('descr')
);
--- 81,85 ----
(
'id' => $this->db->f('id'),
! 'name' => $this->db->f('name'),
'descr' => $this->db->f('descr')
);
***************
*** 134,138 ****
{
$standard['id'] =
$this->db->f('id');
! $standard['num'] =
$this->db->f('num');
$standard['descr'] =
$this->db->f('descr');
--- 134,138 ----
{
$standard['id'] =
$this->db->f('id');
! $standard['name'] =
$this->db->f('name');
$standard['descr'] =
$this->db->f('descr');
***************
*** 145,149 ****
$errorcount = 0;
! if (!$standard['num'])
{
$error[$errorcount++] = array('msg'=>lang('Name
not entered!'));
--- 145,149 ----
$errorcount = 0;
! if (!$standard['name'])
{
$error[$errorcount++] = array('msg'=>lang('Name
not entered!'));
***************
*** 155,163 ****
$standard['id'] =
$this->socommon->next_id($table);
! $standard['num'] =
$this->db->db_addslashes($standard['num']);
$standard['descr'] =
$this->db->db_addslashes($standard['descr']);
! $this->db->query("INSERT INTO $table (id, num,
descr) "
! . "VALUES ('" . $standard['id'] . "','"
. $standard['num'] . "','" . $standard['descr']. "')",__LINE__,__FILE__);
$receipt = array(
--- 155,163 ----
$standard['id'] =
$this->socommon->next_id($table);
! $standard['name'] =
$this->db->db_addslashes($standard['name']);
$standard['descr'] =
$this->db->db_addslashes($standard['descr']);
! $this->db->query("INSERT INTO $table (id, name,
descr) "
! . "VALUES ('" . $standard['id'] . "','"
. $standard['name'] . "','" . $standard['descr']. "')",__LINE__,__FILE__);
$receipt = array(
***************
*** 182,186 ****
$errorcount = 0;
! if (!$standard['num'])
{
$error[$errorcount++] = array('msg'=>lang('Name
not entered!'));
--- 182,186 ----
$errorcount = 0;
! if (!$standard['name'])
{
$error[$errorcount++] = array('msg'=>lang('Name
not entered!'));
***************
*** 191,198 ****
$table = $this->select_table($type);
! $standard['num'] =
$this->db->db_addslashes($standard['num']);
$standard['descr'] =
$this->db->db_addslashes($standard['descr']);
! $this->db->query("UPDATE $table set descr='" .
$standard['descr'] . "', num='". $standard['num']
. "' WHERE id='" .
$standard['id']. "'",__LINE__,__FILE__);
--- 191,198 ----
$table = $this->select_table($type);
! $standard['name'] =
$this->db->db_addslashes($standard['name']);
$standard['descr'] =
$this->db->db_addslashes($standard['descr']);
! $this->db->query("UPDATE $table set descr='" .
$standard['descr'] . "', name='". $standard['name']
. "' WHERE id='" .
$standard['id']. "'",__LINE__,__FILE__);
***************
*** 268,275 ****
$query = ereg_replace('"','',$query);
! $querymethod = " and ($table.num LIKE
'%$query%' or $table.descr LIKE '%$query%')";
}
! $sql = "SELECT $table.id ,$table.num ,$table.descr,
$table.datatype ,$type_table.num as type FROM $type_table $this->join $table on
$table.type_id = $type_table.id where $table.type_id= '$type_id' $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
--- 268,275 ----
$query = ereg_replace('"','',$query);
! $querymethod = " and ($table.name LIKE
'%$query%' or $table.descr LIKE '%$query%')";
}
! $sql = "SELECT $table.id ,$table.name ,$table.descr,
$table.datatype ,$type_table.name as type FROM $type_table $this->join $table
on $table.type_id = $type_table.id where $table.type_id= '$type_id'
$querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 282,288 ****
(
'id' => $this->db->f('id'),
! 'num' => $this->db->f('num'),
'descr' => $this->db->f('descr'),
! 'type_num' => $this->db->f('type'),
'datatype' =>
$this->db->f('datatype')
);
--- 282,288 ----
(
'id' => $this->db->f('id'),
! 'name' => $this->db->f('name'),
'descr' => $this->db->f('descr'),
! 'type_name' => $this->db->f('type'),
'datatype' =>
$this->db->f('datatype')
);
***************
*** 297,301 ****
$type_table = $this->select_table($type);
! $sql = "SELECT $table.id ,$table.num ,$table.descr,
$table.datatype,$type_table.id as type_id ,$type_table.num as type_num FROM
$type_table $this->join $table on $table.type_id = $type_table.id where
$table.id= '$id' $querymethod";
$this->db->query($sql,__LINE__,__FILE__);
--- 297,301 ----
$type_table = $this->select_table($type);
! $sql = "SELECT $table.id ,$table.name ,$table.descr,
$table.datatype,$type_table.id as type_id ,$type_table.name as type_name FROM
$type_table $this->join $table on $table.type_id = $type_table.id where
$table.id= '$id' $querymethod";
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 304,311 ****
{
$attrib['id'] = $this->db->f('id');
! $attrib['num'] = $this->db->f('num');
$attrib['descr'] = $this->db->f('descr');
$attrib['type_id'] =
$this->db->f('type_id');
! $attrib['type_num'] =
$this->db->f('type_num');
$attrib['datatype'] =
$this->db->f('datatype');
//_debug_array($attrib);
--- 304,311 ----
{
$attrib['id'] = $this->db->f('id');
! $attrib['name'] = $this->db->f('name');
$attrib['descr'] = $this->db->f('descr');
$attrib['type_id'] =
$this->db->f('type_id');
! $attrib['type_name'] =
$this->db->f('type_name');
$attrib['datatype'] =
$this->db->f('datatype');
//_debug_array($attrib);
***************
*** 330,334 ****
}
! if (!$attrib['num'])
{
$error[$errorcount++] = array('msg'=>lang('Name
not entered!'));
--- 330,334 ----
}
! if (!$attrib['name'])
{
$error[$errorcount++] = array('msg'=>lang('Name
not entered!'));
***************
*** 341,349 ****
$attrib['id'] =
$this->socommon->next_id($table);
! $attrib['num'] =
$this->db->db_addslashes($attrib['num']);
$attrib['descr'] =
$this->db->db_addslashes($attrib['descr']);
! $this->db->query("INSERT INTO $table (id,
type_id, num, descr, datatype) "
! . "VALUES ('" . $attrib['id'] . "','" .
$attrib['type_id'] . "','" . $attrib['num'] . "','" . $attrib['descr'] . "','"
. $attrib['datatype']. "')",__LINE__,__FILE__);
$receipt = array(
--- 341,349 ----
$attrib['id'] =
$this->socommon->next_id($table);
! $attrib['name'] =
$this->db->db_addslashes($attrib['name']);
$attrib['descr'] =
$this->db->db_addslashes($attrib['descr']);
! $this->db->query("INSERT INTO $table (id,
type_id, name, descr, datatype) "
! . "VALUES ('" . $attrib['id'] . "','" .
$attrib['type_id'] . "','" . $attrib['name'] . "','" . $attrib['descr'] . "','"
. $attrib['datatype']. "')",__LINE__,__FILE__);
$receipt = array(
***************
*** 379,383 ****
}
! if (!$attrib['num'])
{
$error[$errorcount++] = array('msg'=>lang('Name
not entered!'));
--- 379,383 ----
}
! if (!$attrib['name'])
{
$error[$errorcount++] = array('msg'=>lang('Name
not entered!'));
***************
*** 389,396 ****
$table = $this->select_table_attrib($type);
! $attrib['num'] =
$this->db->db_addslashes($attrib['num']);
$attrib['descr'] =
$this->db->db_addslashes($attrib['descr']);
! $this->db->query("UPDATE $table set descr='" .
$attrib['descr'] . "', num='". $attrib['num'] . "', type_id='".
$attrib['type_id'] . "', datatype='". $attrib['datatype']
. "' WHERE id='" . $attrib['id'].
"'",__LINE__,__FILE__);
--- 389,396 ----
$table = $this->select_table_attrib($type);
! $attrib['name'] =
$this->db->db_addslashes($attrib['name']);
$attrib['descr'] =
$this->db->db_addslashes($attrib['descr']);
! $this->db->query("UPDATE $table set descr='" .
$attrib['descr'] . "', name='". $attrib['name'] . "', type_id='".
$attrib['type_id'] . "', datatype='". $attrib['datatype']
. "' WHERE id='" . $attrib['id'].
"'",__LINE__,__FILE__);
***************
*** 416,420 ****
$table = $this->select_table($type);
! $this->db->query("SELECT * FROM $table ORDER BY num ");
$i = 0;
--- 416,420 ----
$table = $this->select_table($type);
! $this->db->query("SELECT * FROM $table ORDER BY name ");
$i = 0;
***************
*** 422,426 ****
{
$entity_type[$i]['id'] =
$this->db->f('id');
! $entity_type[$i]['num'] =
stripslashes($this->db->f('num'));
$entity_type[$i]['descr'] =
stripslashes($this->db->f('descr'));
$i++;
--- 422,426 ----
{
$entity_type[$i]['id'] =
$this->db->f('id');
! $entity_type[$i]['name'] =
stripslashes($this->db->f('name'));
$entity_type[$i]['descr'] =
stripslashes($this->db->f('descr'));
$i++;
Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uiequipment.inc.php 11 Feb 2003 20:41:19 -0000 1.1
--- class.uiequipment.inc.php 12 Feb 2003 19:33:37 -0000 1.2
***************
*** 46,49 ****
--- 46,50 ----
$this->cat_id =
$this->bo->cat_id;
$this->part_of_town_id =
$this->bocommon->part_of_town_id;
+ $this->district_id =
$this->bocommon->district_id;
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'equipment');
***************
*** 71,75 ****
'nextmatchs',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'app_header',
-
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 72,75 ----
***************
*** 79,100 ****
$equipment_list = $this->bo->read();
while (is_array($equipment_list) && list(,$equipment) =
each($equipment_list))
{
! $words = split(' ',$equipment['name']);
! $first = "$words[0] $words[1] $words[2]
$words[3] .....";
$content[] = array
(
- 'property_id'
=> $equipment['property_id'],
'equipment_id'
=> $equipment['equipment_id'],
! 'first'
=> $first,
'date'
=> $equipment['date'],
'owner'
=> $equipment['owner'],
! 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.view&property_id='
. $equipment['property_id'].'&equipment_id=' . $equipment['equipment_id']),
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.edit&property_id='
. $equipment['property_id'].'&equipment_id=' . $equipment['equipment_id']),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.delete&property_id='
. $equipment['property_id'].'&equipment_id=' . $equipment['equipment_id']),
'lang_view_statustext' =>
lang('view the equipment'),
'lang_edit_statustext' =>
lang('edit the equipment'),
'lang_delete_statustext' =>
lang('delete the equipment'),
'text_view'
=> lang('view'),
'text_edit'
=> lang('edit'),
--- 79,110 ----
$equipment_list = $this->bo->read();
+ //_debug_array($equipment_list);
+
while (is_array($equipment_list) && list(,$equipment) =
each($equipment_list))
{
! $text_attribute =
(isset($equipment['attribute'])?$equipment['attribute']:lang('Attribute'));
$content[] = array
(
'equipment_id'
=> $equipment['equipment_id'],
! 'descr'
=> $equipment['descr'],
! 'property_id'
=> $equipment['property_id'],
! 'building_id'
=> $equipment['building_id'],
! 'entrance_id'
=> $equipment['entrance_id'],
! 'floor'
=> $equipment['floor'],
! 'apartment_id'
=> $equipment['apartment_id'],
! 'street'
=> $equipment['street'],
! 'category'
=> $equipment['category'],
'date'
=> $equipment['date'],
'owner'
=> $equipment['owner'],
! 'link_attribute'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.attribute&equipment_id='
. $equipment['equipment_id']),
! 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.view&equipment_id='
. $equipment['equipment_id']),
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.edit&equipment_id='
. $equipment['equipment_id']),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.delete&equipment_id='
. $equipment['equipment_id']),
! 'lang_attribute_statustext' =>
lang('view the attributes for this selection'),
'lang_view_statustext' =>
lang('view the equipment'),
'lang_edit_statustext' =>
lang('edit the equipment'),
'lang_delete_statustext' =>
lang('delete the equipment'),
+ 'text_attribute'
=> $text_attribute,
'text_view'
=> lang('view'),
'text_edit'
=> lang('edit'),
***************
*** 103,117 ****
}
$table_header[] = array
(
! 'lang_name' => lang('name'),
! 'lang_time_created' => lang('time created'),
'lang_view' => lang('view'),
'lang_edit' => lang('edit'),
! 'lang_delete' => lang('delete'),
! 'lang_property_id' =>
lang('property id'),
! 'lang_equipment_id' =>
lang('equipment id'),
! 'lang_owner' => lang('owner')
! );
$table_add[] = array
--- 113,167 ----
}
+
$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' => 'objekt_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_street_name' =>
$this->nextmatchs->show_sort_order(array
!
(
!
'sort' => $this->sort,
!
'var' => 'street',
!
'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_street_name' => lang('Street Name'),
! 'lang_street_num' => lang('Num'),
! 'lang_category' => lang('Category'),
! 'lang_attribute' => lang('Attribute'),
'lang_view' => lang('view'),
'lang_edit' => lang('edit'),
! 'lang_delete' => lang('delete')
! );
$table_add[] = array
***************
*** 122,125 ****
--- 172,186 ----
);
+ $link_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uiequipment.index',
+ 'sort'
=>$this->sort,
+ 'order'
=>$this->order,
+ 'cat_id'
=>$this->cat_id,
+ 'district_id'
=>$this->district_id,
+ // 'filter'
=>$this->filter,
+ 'query'
=>$this->query
+ );
+
$data = array
***************
*** 138,144 ****
'lang_cat_statustext' =>
lang('Select the category the equipment belongs to. To do not use a category
select NO CATEGORY'),
'select_name'
=> 'cat_id',
! 'cat_list'
=>
$this->bocommon->select_category_building_list('filter',$this->cat_id),
! 'select_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiequipment.index'),
! 'filter_list'
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' =>
'yes')),
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
--- 199,213 ----
'lang_cat_statustext' =>
lang('Select the category the equipment belongs to. To do not use a category
select NO CATEGORY'),
'select_name'
=> 'cat_id',
! 'cat_list'
=>
$this->bocommon->select_category_equipment_list('filter',$this->cat_id),
! 'district_list'
=> $this->bocommon->select_district_list('filter',$this->district_id),
! 'lang_no_district'
=> lang('no district'),
! 'lang_district_statustext' =>
lang('Select the district the selection belongs to. To do not use a district
select NO DISTRICT'),
! 'select_district_name' =>
'district_id',
! 'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
!
! 'filter_list'
=> $this->bo->filter($this->filter),
! 'filter_name'
=> 'filter',
! 'lang_show_all'
=> lang('Show all'),
!
'lang_filter_statustext' =>
lang('Select the filter. To show all entries select SHOW ALL'),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
***************
*** 151,155 ****
);
! //print_r($data).'<br>';
//print_($menu);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
--- 220,224 ----
);
! //_debug_array($data).'<br>';
//print_($menu);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
Index: class.uistandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_entity.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uistandard_entity.inc.php 27 Jan 2003 10:40:31 -0000 1.4
--- class.uistandard_entity.inc.php 12 Feb 2003 19:33:37 -0000 1.5
***************
*** 77,81 ****
(
'id'
=> $standard['id'],
! 'num'
=> $standard['num'],
'first'
=> $first,
'link_attribute'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.list_attribute&type_id='
. $standard['id'].'&type='.$type),
--- 77,81 ----
(
'id'
=> $standard['id'],
! 'name'
=> $standard['name'],
'first'
=> $first,
'link_attribute'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.list_attribute&type_id='
. $standard['id'].'&type='.$type),
***************
*** 110,122 ****
)),
'lang_id' => lang('standard id'),
! 'sort_num' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'num',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uistandard_entity.index',
'type' =>$type)
)),
! 'lang_num' => lang('Name'),
);
--- 110,122 ----
)),
'lang_id' => lang('standard id'),
! 'sort_name' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uistandard_entity.index',
'type' =>$type)
)),
! 'lang_name' => lang('Name'),
);
***************
*** 174,178 ****
{
// $id =
$values['id'];
! $standard['num'] =
$values['num'];
$standard['descr'] =
$values['descr'];
}
--- 174,178 ----
{
// $id =
$values['id'];
! $standard['name'] =
$values['name'];
$standard['descr'] =
$values['descr'];
}
***************
*** 214,223 ****
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.index&type='.$type),
'lang_id'
=> lang('standard ID'),
! 'lang_num'
=> lang('Name'),
'lang_descr'
=> lang('Descr'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
'value_id'
=> $id,
! 'value_num'
=> $standard['num'],
'message'
=> $receipt['message'],
'error'
=> $receipt['error'],
--- 214,223 ----
'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.index&type='.$type),
'lang_id'
=> lang('standard ID'),
! 'lang_name'
=> lang('Name'),
'lang_descr'
=> lang('Descr'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
'value_id'
=> $id,
! 'value_name'
=> $standard['name'],
'message'
=> $receipt['message'],
'error'
=> $receipt['error'],
***************
*** 306,311 ****
$content[] = array
(
! 'num'
=> $attrib['num'],
! 'type_num'
=> $attrib['type_num'],
'datatype'
=> $attrib['datatype'],
'first'
=> $first,
--- 306,311 ----
$content[] = array
(
! 'name'
=> $attrib['name'],
! 'type_name'
=> $attrib['type_name'],
'datatype'
=> $attrib['datatype'],
'first'
=> $first,
***************
*** 326,338 ****
$table_header[] = array
(
! 'lang_type_num' => lang('Type'),
'lang_descr' => lang('Descr'),
'lang_datatype' => lang('Datatype'),
'lang_edit' => lang('edit'),
'lang_delete' => lang('delete'),
! 'sort_num' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'num',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uistandard_entity.list_attribute',
--- 326,338 ----
$table_header[] = array
(
! 'lang_type_name' => lang('Type'),
'lang_descr' => lang('Descr'),
'lang_datatype' => lang('Datatype'),
'lang_edit' => lang('edit'),
'lang_delete' => lang('delete'),
! 'sort_name' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
!
'var' => 'name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uistandard_entity.list_attribute',
***************
*** 340,344 ****
'type_id'
=>$type_id)
)),
! 'lang_num' => lang('Name'),
);
--- 340,344 ----
'type_id'
=>$type_id)
)),
! 'lang_name' => lang('Name'),
);
***************
*** 395,399 ****
$action='edit';
}
! $attrib['num'] = $values['num'];
$attrib['descr'] = $values['descr'];
$type_id =
$values['type_id'];
--- 395,399 ----
$action='edit';
}
! $attrib['name'] = $values['name'];
$attrib['descr'] = $values['descr'];
$type_id =
$values['type_id'];
***************
*** 412,417 ****
{
$attrib =
$this->bo->read_single_attrib($id,$type);
! $type_num=$attrib['type_num'];
! $function_msg = lang('edit attribute'). ' ' .
lang($type_num);
$action='edit';
}
--- 412,417 ----
{
$attrib =
$this->bo->read_single_attrib($id,$type);
! $type_name=$attrib['type_name'];
! $function_msg = lang('edit attribute'). ' ' .
lang($type_name);
$action='edit';
}
***************
*** 437,441 ****
'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.list_attribute&type='.$type.'&type_id='.$type_id),
'lang_id'
=> lang('Attribute ID'),
! 'lang_num'
=> lang('Name'),
'lang_descr' =>
lang('Descr'),
'lang_entity_type' =>
lang('Type'),
--- 437,441 ----
'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uistandard_entity.list_attribute&type='.$type.'&type_id='.$type_id),
'lang_id'
=> lang('Attribute ID'),
! 'lang_name'
=> lang('Name'),
'lang_descr' =>
lang('Descr'),
'lang_entity_type' =>
lang('Type'),
***************
*** 444,448 ****
'lang_done'
=> lang('done'),
'value_id'
=> $id,
! 'value_num'
=> $attrib['num'],
'message'
=> $receipt['message'],
'error'
=> $receipt['error'],
--- 444,448 ----
'lang_done'
=> lang('done'),
'value_id'
=> $id,
! 'value_name'
=> $attrib['name'],
'message'
=> $receipt['message'],
'error'
=> $receipt['error'],
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.13,1.14 class.boequipment.inc.php,1.1,1.2class.bostandard_entity.inc.php,1.4,1.5 class.socommon.inc.php,1.7,1.8 class.soequipment.inc.php,1.1,1.2 class.soinvestment.inc.php,1.4,1.5 class.solookup.inc.php,1.6,1.7 class.sostandard_entity.inc.php,1.5,1.6class.uiequipment.inc.php,1.1,1.2 class.uistandard_entity.inc.php,1.4,1.5,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.31,1.32
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default equipment.xsl,1.1,1.2 standard_entity.xsl,1.4,1.5
- Previous by thread:
[Phpgroupware-cvs] CVS: property/setup tables_current.inc.php,1.31,1.32
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default equipment.xsl,1.1,1.2 standard_entity.xsl,1.4,1.5
- Index(es):