[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property documentation_detail.php,1.1.2.2,1.1.2.
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property documentation_detail.php,1.1.2.2,1.1.2.3 list_equipment.php,1.4,1.4.2.1 list_equipment_type.php,1.3,1.3.2.1 list_equipment_type_attribute.php,1.3,1.3.2.1 |
|
Date: |
Mon, 02 Dec 2002 13:35:05 -0500 |
Update of /cvsroot/phpgroupware/property
In directory subversions:/tmp/cvs-serv28186
Modified Files:
Tag: Version-0_9_14-branch
documentation_detail.php list_equipment.php
list_equipment_type.php list_equipment_type_attribute.php
Log Message:
no message
Index: documentation_detail.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/documentation_detail.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** documentation_detail.php 20 Nov 2002 18:39:29 -0000 1.1.2.2
--- documentation_detail.php 2 Dec 2002 18:35:02 -0000 1.1.2.3
***************
*** 109,113 ****
//echo 'equipment_id :' .$equipment_id;
! if ($equipment_id && !$location_code)
{
$filtermethod = " where equipment_id = '$equipment_id'";
--- 109,113 ----
//echo 'equipment_id :' .$equipment_id;
! if ($equipment_id)
{
$filtermethod = " where equipment_id = '$equipment_id'";
Index: list_equipment.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_equipment.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -r1.4 -r1.4.2.1
*** list_equipment.php 28 Sep 2002 22:07:12 -0000 1.4
--- list_equipment.php 2 Dec 2002 18:35:03 -0000 1.4.2.1
***************
*** 34,37 ****
--- 34,40 ----
. '<input type="hidden" name="sub" value="' .
$sub . '">' . "\n"
. '<input type="hidden" name="start" value="' .
$start . '">' . "\n"
+ . '<input type="hidden" name="omraade_id"
value="' . $omraade_id . '">' . "\n"
+ . '<input type="hidden" name="type" value="' .
$type . '">' . "\n"
+ . '<input type="hidden" name="attribute"
value="' . $attribute . '">' . "\n"
. '<input type="hidden" name="filter" value="'
. $filter . '">' . "\n";
***************
*** 45,48 ****
--- 48,109 ----
$t->set_var('lang_search',lang('Search'));
$t->set_var('searchurl',$GLOBALS['phpgw']->link('/property/list_equipment.php'));
+ $t->set_var('lang_all',lang('All'));
+
$t->set_var('area_url',$GLOBALS['phpgw']->link('/property/list_equipment.php'));
+ $t->set_var('lang_area',lang('Area'));
+ $t->set_var('lang_type',lang('Type'));
+ $t->set_var('lang_attribute',lang('Attribute'));
+
+ //----------------------- area_list
+
+ $GLOBALS['phpgw']->db->query("SELECT omraade ,omraade_id "
+ . " FROM boei_omraade ORDER BY omraade_id ");
+
+ while ($GLOBALS['phpgw']->db->next_record())
+ {
+ $omraade_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('omraade_id') . '"';
+ if
($GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('omraade_id')) ==
$omraade_id)
+ $omraade_list .= ' selected';
+ $omraade_list .= '>'
+ . $GLOBALS['phpgw']->db->f('omraade_id')
+ . ' ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('omraade')). '] ' .
'</option>';
+ }
+
+ $t->set_var('omraade_list',$omraade_list);
+ //----------------------- end area_list
+ //----------------------- type_list
+
+ $GLOBALS['phpgw']->db->query("SELECT id ,name FROM fm_equipment_type
ORDER BY name ");
+
+ while ($GLOBALS['phpgw']->db->next_record())
+ {
+ $type_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('id') . '"';
+ if ($GLOBALS['phpgw']->db->f('id') == $type)
+ $type_list .= ' selected';
+ $type_list .= '>'
+ . $GLOBALS['phpgw']->db->f('id')
+ . ' ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('name')). '] ' .
'</option>';
+ }
+
+ $t->set_var('type_list',$type_list);
+ //----------------------- end type_list
+ //----------------------- attribute_list
+
+ if ($type)
+ {
+ $GLOBALS['phpgw']->db->query("SELECT id ,name FROM
fm_equipment_type_attrib where equipment_type_id = '$type' ORDER BY name ");
+
+ while ($GLOBALS['phpgw']->db->next_record())
+ {
+ $attribute_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('id') . '"';
+ if ($GLOBALS['phpgw']->db->f('id') ==
$attribute)
+ $attribute_list .= ' selected';
+ $attribute_list .= '>'
+ . $GLOBALS['phpgw']->db->f('id')
+ . ' ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('name')). '] ' .
'</option>';
+ }
+
+ }
+ $t->set_var('attribute_list',$attribute_list);
+ //----------------------- end attribute_list
if (! $start)
***************
*** 57,61 ****
else
{
! $ordermethod = " order by equipment_id asc";
}
--- 118,122 ----
else
{
! $ordermethod = " order by fm_equipment.equipment_id asc";
}
***************
*** 71,79 ****
else { $limit = 15; }
if ($query)
{
! $querymethod = " where (descr like '%$query%' or equipment_id
like '%$query%' or type_descr like '%$query%' or objekt_id like '%$query%')";
}
if ($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
{
--- 132,168 ----
else { $limit = 15; }
+ if ($omraade_id)
+ {
+ $querymethod =" where boei_bydel.omraade_id = '$omraade_id'";
+ $where_1='and';
+ }
+ else
+ {
+ $where_1='where';
+ }
+
+
+ if ($type)
+ {
+ $querymethod .=" $where_1 fm_equipment.equipment_type_id =
'$type'";
+ }
+
+ if ($type || $omraade_id)
+ {
+ $where_2 = 'and';
+ }
+ else
+ {
+ $where_2='where';
+ }
+
+ //echo 'querymethod: '.$querymethod.'<br>';
+
if ($query)
{
! $querymethod .= " $where_2 (fm_equipment.descr like '%$query%'
or fm_equipment.equipment_id like '%$query%' or type_descr like '%$query%' or
fm_equipment.objekt_id like '%$query%' or fm_equipment.street like '%$query%')";
}
+ //echo 'querymethod: '.$querymethod.'<br>';
if ($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
{
***************
*** 94,98 ****
$db2 = $GLOBALS['phpgw']->db;
! $sql = "select * from fm_equipment $join fm_equipment_type on
fm_equipment.equipment_type_id = fm_equipment_type.id $location $querymethod";
$db2->query($sql,__LINE__,__FILE__);
$total_records = $db2->num_rows();
--- 183,222 ----
$db2 = $GLOBALS['phpgw']->db;
! if (!$attribute)
! {
! $sql = "SELECT
fm_equipment.equipment_id,fm_equipment.equipment_type_id, fm_equipment.descr,
fm_equipment.objekt_id, fm_equipment.bygg_id, fm_equipment.seksjons_id,"
! . " fm_equipment_type.type_descr,
boei_bydel.omraade_id, fm_equipment.street "
! . " FROM fm_equipment $join "
! . " boei_objekt ON fm_equipment.objekt_id =
boei_objekt.objekt_id $join "
! . " boei_bydel ON boei_objekt.bydel_id =
boei_bydel.bydel_id $join "
! . " fm_equipment_type ON fm_equipment.equipment_type_id
= fm_equipment_type.id $location $querymethod";
! }
! else
! {
! if ($omraade_id)
! {
! $querymethod_2 =" and boei_bydel.omraade_id =
'$omraade_id'";
! }
! if ($query)
! {
! $querymethod_2 .= " and (fm_equipment.descr like
'%$query%' or fm_equipment.equipment_id like '%$query%' or type_descr like
'%$query%' or fm_equipment.objekt_id like '%$query%' or fm_equipment.street
like '%$query%')";
! }
!
!
! $sql = "SELECT fm_equipment.equipment_id,
fm_equipment_type.name, fm_equipment.equipment_type_id, fm_equipment.descr, "
! . " fm_equipment.objekt_id, fm_equipment.bygg_id,
fm_equipment.seksjons_id, fm_equipment.street, fm_equipment_type_attrib.id, "
! . " fm_equipment_type.type_descr,boei_bydel.omraade_id,
street"
! . " FROM fm_equipment INNER JOIN"
! . " fm_equipment_type_attrib INNER JOIN"
! . " fm_equipment_type INNER JOIN"
! . " fm_equipment_attrib ON fm_equipment_type.id =
fm_equipment_attrib.equipment_type_id ON "
! . " fm_equipment_type_attrib.id =
fm_equipment_attrib.attrib_id ON "
! . " fm_equipment.equipment_id =
fm_equipment_attrib.equipment_id INNER JOIN"
! . " boei_objekt ON fm_equipment.objekt_id =
boei_objekt.objekt_id INNER JOIN"
! . " boei_bydel ON boei_objekt.bydel_id =
boei_bydel.bydel_id where fm_equipment_type_attrib.id= '$attribute'
$querymethod_2 ";
! }
!
!
!
$db2->query($sql,__LINE__,__FILE__);
$total_records = $db2->num_rows();
***************
*** 109,114 ****
// ---------------- nextmatch variable template-declarations
------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('/property/list_equipment.php',$start,$total_records,"&cat_id=$cat_id&location_code=$location_code&query=$query");
! $right =
$GLOBALS['phpgw']->nextmatchs->right('/property/list_equipment.php',$start,$total_records,"&cat_id=$cat_id&location_code=$location_code&query=$query");
$t->set_var('left',$left);
$t->set_var('right',$right);
--- 233,238 ----
// ---------------- nextmatch variable template-declarations
------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('/property/list_equipment.php',$start,$total_records,"&cat_id=$cat_id&location_code=$location_code&query=$query&omraade_id=$omraade_id&type=$type&attribute=$attribute");
! $right =
$GLOBALS['phpgw']->nextmatchs->right('/property/list_equipment.php',$start,$total_records,"&cat_id=$cat_id&location_code=$location_code&query=$query&omraade_id=$omraade_id&type=$type&attribute=$attribute");
$t->set_var('left',$left);
$t->set_var('right',$right);
***************
*** 120,132 ****
$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$t->set_var('currency',$currency);
!
$t->set_var('sort_equipment_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'equipment_id',$order,'/property/list_equipment.php',lang('Equipment
ID')));
!
$t->set_var('sort_descr',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'descr',$order,'/property/list_equipment.php',lang('Description')));
!
$t->set_var('sort_type_descr',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'type_descr',$order,'/property/list_equipment.php',lang('Type
description')));
!
$t->set_var('sort_objekt_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'objekt_id',$order,'/property/list_equipment.php',lang('Property')));
!
$t->set_var('sort_bygg_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'bygg_id',$order,'/property/list_equipment.php',lang('Building')));
$t->set_var('lang_edit',lang('Edit'));
$t->set_var('lang_attribute',lang('Attribute'));
$t->set_var('lang_delete',lang('Delete'));
$t->set_var('lang_event',lang('Event'));
// ---------------------------- end header declaration
-------------------------------------
--- 244,261 ----
$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$t->set_var('currency',$currency);
!
$t->set_var('sort_equipment_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'fm_equipment.equipment_id',$order,'/property/list_equipment.php',lang('Equipment
ID')));
!
$t->set_var('sort_descr',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'fm_equipment.descr',$order,'/property/list_equipment.php',lang('Description')));
!
$t->set_var('sort_type_descr',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'fm_equipment_type.type_descr',$order,'/property/list_equipment.php',lang('Type
description')));
!
$t->set_var('sort_objekt_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'fm_equipment.objekt_id',$order,'/property/list_equipment.php',lang('Property')));
!
$t->set_var('sort_bygg_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'fm_equipment.bygg_id',$order,'/property/list_equipment.php',lang('Building')));
$t->set_var('lang_edit',lang('Edit'));
$t->set_var('lang_attribute',lang('Attribute'));
$t->set_var('lang_delete',lang('Delete'));
$t->set_var('lang_event',lang('Event'));
+ $t->set_var('lang_bygg_id',lang('Building'));
+ $t->set_var('lang_seksjons_id',lang('Entrance'));
+ $t->set_var('lang_street',lang('Street'));
+
+
// ---------------------------- end header declaration
-------------------------------------
***************
*** 151,154 ****
--- 280,291 ----
if (! $bygg_id) $bygg_id = ' ';
+ $seksjons_id = $GLOBALS['phpgw']->db->f('seksjons_id');
+ if (! $seksjons_id) $seksjons_id = ' ';
+
+ $street = $GLOBALS['phpgw']->db->f('street');
+ if (! $street) $street = ' ';
+
+
+
$equipment_type_edit =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('equipment_type_id'));
if (! $equipment_type_edit) $equipment_type_edit = ' ';
***************
*** 164,167 ****
--- 301,306 ----
'objekt_id' => $objekt_id,
'bygg_id' => $bygg_id,
+ 'seksjons_id' => $seksjons_id,
+ 'street' => $street,
'equipment_type_edit' =>
$equipment_type_edit,
'type_descr' => $type_descr));
Index: list_equipment_type.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_equipment_type.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** list_equipment_type.php 3 Sep 2002 22:15:38 -0000 1.3
--- list_equipment_type.php 2 Dec 2002 18:35:03 -0000 1.3.2.1
***************
*** 107,112 ****
// ---------------- nextmatch variable template-declarations
------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('list_equipment.php',$start,$total_records);
! $right =
$GLOBALS['phpgw']->nextmatchs->right('list_equipment.php',$start,$total_records);
$t->set_var('left',$left);
$t->set_var('right',$right);
--- 107,112 ----
// ---------------- nextmatch variable template-declarations
------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('list_equipment.php',$start,$total_records,"&cat_id=$cat_id&query=$query");
! $right =
$GLOBALS['phpgw']->nextmatchs->right('list_equipment.php',$start,$total_records,"&cat_id=$cat_id&query=$query");
$t->set_var('left',$left);
$t->set_var('right',$right);
Index: list_equipment_type_attribute.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_equipment_type_attribute.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -r1.3 -r1.3.2.1
*** list_equipment_type_attribute.php 3 Sep 2002 22:15:38 -0000 1.3
--- list_equipment_type_attribute.php 2 Dec 2002 18:35:03 -0000 1.3.2.1
***************
*** 119,124 ****
// ---------------- nextmatch variable template-declarations
------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('/property/list_equipment_type_attribute.php',$start,$total_records);
! $right =
$GLOBALS['phpgw']->nextmatchs->right('/property/list_equipment_type_attribute.php',$start,$total_records);
$t->set_var('left',$left);
$t->set_var('right',$right);
--- 119,125 ----
// ---------------- nextmatch variable template-declarations
------------------------------
! $left =
$GLOBALS['phpgw']->nextmatchs->left('/property/list_equipment_type_attribute.php',$start,$total_records,"&equipment_type_id=$equipment_type_id&cat_id=$cat_id&query=$query");
! $right =
$GLOBALS['phpgw']->nextmatchs->right('/property/list_equipment_type_attribute.php',$start,$total_records,"&equipment_type_id=$equipment_type_id&cat_id=$cat_id&query=$query");
!
$t->set_var('left',$left);
$t->set_var('right',$right);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property documentation_detail.php,1.1.2.2,1.1.2.3 list_equipment.php,1.4,1.4.2.1 list_equipment_type.php,1.3,1.3.2.1 list_equipment_type_attribute.php,1.3,1.3.2.1,
Sigurd Nes <address@hidden> <=