[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property invoice_paid.php,1.4,1.5 list_invoice.p
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property invoice_paid.php,1.4,1.5 list_invoice.php,1.4,1.5 list_workorder.php,1.3,1.4 add_equipment.php,1.2,1.3 addactivity.php,1.2,1.3 edit_equipment.php,1.2,1.3 list_equipment.php,1.2,1.3 list_equipment_type.php,1.2,1.3 list_equipment_type_attribute.php,1.2,1.3 viewticket_details.php,1.2,1.3 workorder_archive.php,1.2,1.3 add_equipment_attribute.php,1.1.1.1,1.2 add_equipment_type.php,1.1.1.1,1.2 add_equipment_type_attribute.php,1.1.1.1,1.2 delete_equipment_type.php,1.1.1.1,1.2 delete_equipment_type_attribute.php,1.1.1.1,1.2 edit_equipment_type.php,1.1.1.1,1.2 edit_equipment_type_attribute.php,1.1.1.1,1.2 invoice_consume.php,1.1,1.2 |
|
Date: |
Tue, 03 Sep 2002 18:15:41 -0400 |
Update of /cvsroot/phpgroupware/property
In directory subversions:/tmp/cvs-serv30475
Modified Files:
invoice_paid.php list_invoice.php list_workorder.php
add_equipment.php addactivity.php edit_equipment.php
list_equipment.php list_equipment_type.php
list_equipment_type_attribute.php viewticket_details.php
workorder_archive.php add_equipment_attribute.php
add_equipment_type.php add_equipment_type_attribute.php
delete_equipment_type.php delete_equipment_type_attribute.php
edit_equipment_type.php edit_equipment_type_attribute.php
invoice_consume.php
Log Message:
no message
Index: invoice_paid.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_paid.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** invoice_paid.php 2 Sep 2002 15:22:23 -0000 1.4
--- invoice_paid.php 3 Sep 2002 22:15:38 -0000 1.5
***************
*** 57,61 ****
*/
$t->set_var('check','check.gif');
!
$t->set_var('coordinator_list',select_coordinator_list('',$coordinator_lid,
invoice));
$t->set_var('lang_action',lang('Paid'));
$t->set_var('coordinator_url',$GLOBALS['phpgw']->link('/property/invoice_paid.php',"sort=$sort&order=$order&filter=$filter&start=$start&ab_id=$ab_id&cat_id=$cat_id"));
--- 57,61 ----
*/
$t->set_var('check','check.gif');
!
$t->set_var('coordinator_list',select_coordinator_list(account_lid,$coordinator_lid,
invoice));
$t->set_var('lang_action',lang('Paid'));
$t->set_var('coordinator_url',$GLOBALS['phpgw']->link('/property/invoice_paid.php',"sort=$sort&order=$order&filter=$filter&start=$start&ab_id=$ab_id&cat_id=$cat_id"));
Index: list_invoice.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_invoice.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** list_invoice.php 2 Sep 2002 15:22:23 -0000 1.4
--- list_invoice.php 3 Sep 2002 22:15:38 -0000 1.5
***************
*** 51,55 ****
*/
$t->set_var('check','check.gif');
!
$t->set_var('coordinator_list',select_coordinator_list('',$coordinator_lid,
invoice));
$t->set_var('lang_action',lang('invoice list'));
$t->set_var('coordinator_url',$GLOBALS['phpgw']->link('/property/list_invoice.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
--- 51,55 ----
*/
$t->set_var('check','check.gif');
!
$t->set_var('coordinator_list',select_coordinator_list(account_lid,$coordinator_lid,
invoice));
$t->set_var('lang_action',lang('invoice list'));
$t->set_var('coordinator_url',$GLOBALS['phpgw']->link('/property/list_invoice.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));
Index: list_workorder.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_workorder.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** list_workorder.php 2 Sep 2002 15:22:23 -0000 1.3
--- list_workorder.php 3 Sep 2002 22:15:38 -0000 1.4
***************
*** 26,30 ****
$t->set_var('add_url',$GLOBALS['phpgw']->link('/property/add_workorder.php'));
$t->set_var('search_url',$GLOBALS['phpgw']->link('/property/list_workorder.php'));
!
$t->set_var('cat_url',$GLOBALS['phpgw']->link('/property/list_workorder.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id&coordinator_id=$coordinator_id"));
$c = CreateObject('phpgwapi.categories');
--- 26,30 ----
$t->set_var('add_url',$GLOBALS['phpgw']->link('/property/add_workorder.php'));
$t->set_var('search_url',$GLOBALS['phpgw']->link('/property/list_workorder.php'));
!
$t->set_var('cat_url',$GLOBALS['phpgw']->link('/property/list_workorder.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));//&coordinator_id=$coordinator_id"));
$c = CreateObject('phpgwapi.categories');
***************
*** 33,37 ****
!
$t->set_var('coordinator_list',select_coordinator_list($coordinator_id,'',workorder));
$t->set_var('lang_all',lang('All'));
$t->set_var('lang_none',lang('None'));
--- 33,37 ----
!
$t->set_var('coordinator_list',select_coordinator_list(account_id,$coordinator_id,workorder));
$t->set_var('lang_all',lang('All'));
$t->set_var('lang_none',lang('None'));
***************
*** 39,43 ****
$t->set_var('lang_search_location',lang('Location'));
$t->set_var('lang_category',lang('Category'));
!
$t->set_var('coordinator_url',$GLOBALS['phpgw']->link('/property/list_workorder.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id&coordinator_id=$coordinator_id"));
$hidden_vars = '<input type="hidden" name="sort" value="' . $sort .
'">' . "\n"
--- 39,43 ----
$t->set_var('lang_search_location',lang('Location'));
$t->set_var('lang_category',lang('Category'));
!
$t->set_var('coordinator_url',$GLOBALS['phpgw']->link('/property/list_workorder.php',"sort=$sort&order=$order&filter=$filter&start=$start&query=$query&cat_id=$cat_id"));//&coordinator_id=$coordinator_id"));
$hidden_vars = '<input type="hidden" name="sort" value="' . $sort .
'">' . "\n"
Index: add_equipment.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_equipment.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** add_equipment.php 29 Aug 2002 20:28:05 -0000 1.2
--- add_equipment.php 3 Sep 2002 22:15:38 -0000 1.3
***************
*** 104,116 ****
//----------------------- equipment_type
! $GLOBALS['phpgw']->db->query("SELECT equipment_type_id,type_descr FROM
fm_equipment_type order by equipment_type_id asc");
while ($GLOBALS['phpgw']->db->next_record())
{
! $equipment_type_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('equipment_type_id') . '"';
! if
($GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('equipment_type_id'))
== $equipment_type_id)
$equipment_type_list .= ' selected';
$equipment_type_list .= '>'
! . $GLOBALS['phpgw']->db->f('equipment_type_id')
! . ' ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('type_descr')). '] ' .
'</option>';
}
--- 104,116 ----
//----------------------- equipment_type
! $GLOBALS['phpgw']->db->query("SELECT id,name, type_descr FROM
fm_equipment_type order by name asc");
while ($GLOBALS['phpgw']->db->next_record())
{
! $equipment_type_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('id') . '"';
! if ($GLOBALS['phpgw']->db->f('id') ==
$equipment_type_id)
$equipment_type_list .= ' selected';
$equipment_type_list .= '>'
! . $GLOBALS['phpgw']->db->f('id')
! . ' ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('name')). '] ' .
'</option>';
}
***************
*** 169,176 ****
$t->set_var('lang_action',lang('Add FM Ticket'));
$t->set_var('addressbook_link',$GLOBALS['phpgw']->link('/property/addressbook.php','query='));
!
$t->set_var('property_link',$GLOBALS['phpgw']->link('/property/property.php','query='));
!
$t->set_var('building_link',$GLOBALS['phpgw']->link('/property/building.php','query='));
!
$t->set_var('entrance_link',$GLOBALS['phpgw']->link('/property/entrance.php','query='));
!
$t->set_var('apartment_link',$GLOBALS['phpgw']->link('/property/apartment.php','query='));
// --------------- end lokalisering-------------------
--- 169,176 ----
$t->set_var('lang_action',lang('Add FM Ticket'));
$t->set_var('addressbook_link',$GLOBALS['phpgw']->link('/property/addressbook.php','query='));
!
$t->set_var('property_link',$GLOBALS['phpgw']->link('/property/search_property.php','query='));
!
$t->set_var('building_link',$GLOBALS['phpgw']->link('/property/search_building.php','query='));
!
$t->set_var('entrance_link',$GLOBALS['phpgw']->link('/property/search_entrance.php','query='));
!
$t->set_var('apartment_link',$GLOBALS['phpgw']->link('/property/search_apartment.php','query='));
// --------------- end lokalisering-------------------
Index: addactivity.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/addactivity.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** addactivity.php 29 Aug 2002 20:28:05 -0000 1.2
--- addactivity.php 3 Sep 2002 22:15:38 -0000 1.3
***************
*** 63,68 ****
{
! $table='property';
! $id= next_id($table);
$descr = addslashes($descr);
--- 63,67 ----
{
! $id= next_id(fm_wo_activities);
$descr = addslashes($descr);
Index: edit_equipment.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/edit_equipment.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** edit_equipment.php 29 Aug 2002 20:28:05 -0000 1.2
--- edit_equipment.php 3 Sep 2002 22:15:38 -0000 1.3
***************
*** 219,242 ****
//----------------------- end date
- //----------------------- equipment_type
$GLOBALS['phpgw']->db->query("select equipment_type_id from
fm_equipment where equipment_id='$equipment_id'");
$GLOBALS['phpgw']->db->next_record();
! $equipment_type_edit = $GLOBALS['phpgw']->db->f('equipment_type_id');
! $GLOBALS['phpgw']->db->query("SELECT equipment_type_id,type_descr FROM
fm_equipment_type order by equipment_type_id asc");
while ($GLOBALS['phpgw']->db->next_record())
{
! $equipment_type_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('equipment_type_id') . '"';
! if
($GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('equipment_type_id'))
== $equipment_type_edit)
$equipment_type_list .= ' selected';
$equipment_type_list .= '>'
! . $GLOBALS['phpgw']->db->f('equipment_type_id')
! . ' ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('type_descr')). '] ' .
'</option>';
}
$t->set_var('equipment_type_list',$equipment_type_list);
//----------------------- end equipment_type
--- 219,243 ----
//----------------------- end date
$GLOBALS['phpgw']->db->query("select equipment_type_id from
fm_equipment where equipment_id='$equipment_id'");
$GLOBALS['phpgw']->db->next_record();
! $equipment_type_id = $GLOBALS['phpgw']->db->f('equipment_type_id');
! //----------------------- equipment_type
! $GLOBALS['phpgw']->db->query("SELECT id,name, type_descr FROM
fm_equipment_type order by name asc");
while ($GLOBALS['phpgw']->db->next_record())
{
! $equipment_type_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('id') . '"';
! if ($GLOBALS['phpgw']->db->f('id') ==
$equipment_type_id)
$equipment_type_list .= ' selected';
$equipment_type_list .= '>'
! . $GLOBALS['phpgw']->db->f('id')
! . ' ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('name')). '] ' .
'</option>';
}
$t->set_var('equipment_type_list',$equipment_type_list);
+
//----------------------- end equipment_type
***************
*** 273,277 ****
if ($equipment_id)
{
!
$t->set_var('details',$GLOBALS['phpgw']->link('/property/add_equipment_attribute.php','equipment_type_id='
. $equipment_type_edit . "&equipment_id=" . $equipment_id));
$t->set_var('lang_details',lang('Details'));
--- 274,278 ----
if ($equipment_id)
{
!
$t->set_var('details',$GLOBALS['phpgw']->link('/property/add_equipment_attribute.php','equipment_type_id='
. $equipment_type_id . "&equipment_id=" . $equipment_id));
$t->set_var('lang_details',lang('Details'));
Index: list_equipment.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_equipment.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** list_equipment.php 1 Sep 2002 19:43:49 -0000 1.2
--- list_equipment.php 3 Sep 2002 22:15:38 -0000 1.3
***************
*** 94,98 ****
$db2 = $GLOBALS['phpgw']->db;
! $sql = "select * from fm_equipment $join fm_equipment_type on
fm_equipment.equipment_type_id = fm_equipment_type.equipment_type_id $location
$querymethod";
$db2->query($sql,__LINE__,__FILE__);
$total_records = $db2->num_rows();
--- 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();
Index: list_equipment_type.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_equipment_type.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** list_equipment_type.php 1 Sep 2002 19:43:49 -0000 1.2
--- list_equipment_type.php 3 Sep 2002 22:15:38 -0000 1.3
***************
*** 57,61 ****
else
{
! $ordermethod = " order by equipment_type_id asc";
}
--- 57,61 ----
else
{
! $ordermethod = " order by id asc";
}
***************
*** 73,77 ****
if ($query)
{
! $querymethod = " where (attrib_descr like '%$query%' or
equipment_type_id like '%$query%' )";
}
--- 73,77 ----
if ($query)
{
! $querymethod = " where (attrib_descr like '%$query%' or id like
'%$query%' )";
}
***************
*** 118,125 ****
$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$t->set_var('currency',$currency);
!
$t->set_var('sort_equipment_type_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'equipment_type_id',$order,'/property/list_equipment.php',lang('Equipment
type')));
$t->set_var('sort_type_descr',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'type_descr',$order,'/property/list_equipment.php',lang('Description')));
$t->set_var('lang_edit',lang('Edit'));
$t->set_var('lang_delete',lang('Delete'));
// ---------------------------- end header declaration
-------------------------------------
--- 118,126 ----
$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$t->set_var('currency',$currency);
!
$t->set_var('sort_name',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'name',$order,'/property/list_equipment.php',lang('Equipment
type')));
$t->set_var('sort_type_descr',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'type_descr',$order,'/property/list_equipment.php',lang('Description')));
$t->set_var('lang_edit',lang('Edit'));
$t->set_var('lang_delete',lang('Delete'));
+ $t->set_var('lang_attributes',lang('Attributes'));
// ---------------------------- end header declaration
-------------------------------------
***************
*** 129,133 ****
{
$tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! $equipment_type_id =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('equipment_type_id'));
if (! $equipment_type_id) $equipment_type_id = ' ';
--- 130,136 ----
{
$tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! $name =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('name'));
! if (! $name) $name = ' ';
! $equipment_type_id =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('id'));
if (! $equipment_type_id) $equipment_type_id = ' ';
***************
*** 139,148 ****
// ------------------- template declaration for list records
-------------------------
! $t->set_var(array('equipment_type_id' => $equipment_type_id,
'type_descr' => $type_descr));
!
$t->set_var('edit',$GLOBALS['phpgw']->link('/property/edit_equipment_type.php','equipment_type_id='
. $GLOBALS['phpgw']->db->f('equipment_type_id') .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));
!
$t->set_var('delete',$GLOBALS['phpgw']->link('/property/delete_equipment_type.php','equipment_type_id='
. $GLOBALS['phpgw']->db->f('equipment_type_id') .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));
$t->parse('list','equipment_type_list',True);
--- 142,152 ----
// ------------------- template declaration for list records
-------------------------
! $t->set_var(array('name' => $name,
'type_descr' => $type_descr));
!
$t->set_var('edit',$GLOBALS['phpgw']->link('/property/edit_equipment_type.php','equipment_type_id='
. $GLOBALS['phpgw']->db->f('id') .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));
!
$t->set_var('delete',$GLOBALS['phpgw']->link('/property/delete_equipment_type.php','equipment_type_id='
. $GLOBALS['phpgw']->db->f('id') .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));
!
$t->set_var('attributes',$GLOBALS['phpgw']->link('/property/list_equipment_type_attribute.php','equipment_type_id='
. $GLOBALS['phpgw']->db->f('id') .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));
$t->parse('list','equipment_type_list',True);
Index: list_equipment_type_attribute.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_equipment_type_attribute.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** list_equipment_type_attribute.php 1 Sep 2002 19:43:49 -0000 1.2
--- list_equipment_type_attribute.php 3 Sep 2002 22:15:38 -0000 1.3
***************
*** 36,39 ****
--- 36,40 ----
. '<input type="hidden" name="query" value="' .
$query . '">' . "\n"
. '<input type="hidden" name="start" value="' .
$start . '">' . "\n"
+ . '<input type="hidden"
name="equipment_type_id" value="' . $equipment_type_id . '">' . "\n"
. '<input type="hidden" name="filter" value="'
. $filter . '">' . "\n";
***************
*** 41,45 ****
$t->set_var('actionurl',$GLOBALS['phpgw']->link('/property/add_equipment_type_attribute.php'));
$t->set_var('lang_done',lang('done'));
!
$t->set_var('done_url',$GLOBALS['phpgw']->link('/property/list_equipment.php'));
$t->set_var('hidden_vars',$hidden_vars);
$t->set_var('lang_search',lang('Search'));
--- 42,46 ----
$t->set_var('actionurl',$GLOBALS['phpgw']->link('/property/add_equipment_type_attribute.php'));
$t->set_var('lang_done',lang('done'));
!
$t->set_var('done_url',$GLOBALS['phpgw']->link('/property/list_equipment_type.php'));
$t->set_var('hidden_vars',$hidden_vars);
$t->set_var('lang_search',lang('Search'));
***************
*** 57,67 ****
else
{
! $ordermethod = " order by e_type_attrib_id asc";
}
! if (! $filter)
! {
! $filter = "none";
! }
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']
&& $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
--- 58,67 ----
else
{
! $ordermethod = " order by fm_equipment_type_attrib.name asc";
}
!
! $filter = "&equipment_type_id=".$equipment_type_id;
!
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']
&& $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
***************
*** 71,82 ****
else { $limit = 15; }
if ($query)
{
! $querymethod = " where (attrib_descr like '%$query%' or
e_type_attrib_id like '%$query%' or equipment_type_id like '%$query%' )";
}
$db2 = $GLOBALS['phpgw']->db;
! $sql = "select * from fm_equipment_type_attrib $querymethod";
$db2->query($sql,__LINE__,__FILE__);
$total_records = $db2->num_rows();
--- 71,94 ----
else { $limit = 15; }
+ if ($equipment_type_id)
+ {
+ $filtermethod= "where equipment_type_id='$equipment_type_id' ";
+ $where_1='and';
+ }
+ else
+ {
+ $where_1='where';
+ }
if ($query)
{
! $querymethod = " $where_1 (attrib_descr like '%$query%' or id
like '%$query%' or equipment_type_id like '%$query%' )";
}
$db2 = $GLOBALS['phpgw']->db;
! $join=join_statement();
!
! $sql = "select fm_equipment_type.name as equipment_type,
equipment_type_id,fm_equipment_type_attrib.id as attrib_id,
fm_equipment_type_attrib.name as attrib_name,attrib_descr,datatype "
! . "from fm_equipment_type_attrib $join fm_equipment_type on
fm_equipment_type_attrib.equipment_type_id =fm_equipment_type.id $filtermethod
$querymethod";
$db2->query($sql,__LINE__,__FILE__);
$total_records = $db2->num_rows();
***************
*** 117,122 ****
$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
!
$t->set_var('sort_e_type_attrib_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'e_type_attrib_id',$order,'/property/list_equipment_type_attribute.php',lang('Equipment
type attribute')));
!
$t->set_var('sort_equipment_type_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'equipment_type_id',$order,'/property/list_equipment_type_attribute.php',lang('Equipment
type')));
$t->set_var('sort_attrib_descr',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'attrib_descr',$order,'/property/list_equipment_type_attribute.php',lang('Description')));
$t->set_var('lang_edit',lang('Edit'));
--- 129,134 ----
$t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
!
$t->set_var('sort_attribute_name',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'fm_equipment_type_attrib.name
',$order,'/property/list_equipment_type_attribute.php',lang('Equipment type
attribute')));
!
$t->set_var('sort_equipment_type',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'fm_equipment_type.name',$order,'/property/list_equipment_type_attribute.php',lang('Equipment
type')));
$t->set_var('sort_attrib_descr',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'attrib_descr',$order,'/property/list_equipment_type_attribute.php',lang('Description')));
$t->set_var('lang_edit',lang('Edit'));
***************
*** 132,146 ****
$tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! $e_type_attrib_id =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('e_type_attrib_id'));
! if (! $e_type_attrib_id) $e_type_attrib_id = ' ';
$equipment_type_id =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('equipment_type_id'));
if (! $equipment_type_id) $equipment_type_id = ' ';
- $equipment_type_id_update =$equipment_type_id;
-
$attrib_descr =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('attrib_descr'));
if (! $attrib_descr) $attrib_descr = ' ';
$datatype =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('datatype'));
if (! $datatype) $datatype = ' ';
--- 144,161 ----
$tr_color =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
! $attrib_id =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('attrib_id'));
! if (! $attrib_id) $attrib_id = ' ';
!
! $equipment_type =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('equipment_type'));
! if (! $equipment_type) $equipment_type = ' ';
$equipment_type_id =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('equipment_type_id'));
if (! $equipment_type_id) $equipment_type_id = ' ';
$attrib_descr =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('attrib_descr'));
if (! $attrib_descr) $attrib_descr = ' ';
+ $attrib_name =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('attrib_name'));
+ if (! $attrib_name) $attrib_name = ' ';
$datatype =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('datatype'));
if (! $datatype) $datatype = ' ';
***************
*** 152,164 ****
// ------------------- template declaration for list records
-------------------------
! $t->set_var(array('e_type_attrib_id' => $e_type_attrib_id,
! 'equipment_type_id' =>
$equipment_type_id,
! 'equipment_type_id_update' =>
$equipment_type_id_update,
'datatype' => $datatype,
'attrib_descr' => $attrib_descr));
!
$t->set_var('edit',$GLOBALS['phpgw']->link('/property/edit_equipment_type_attribute.php','e_type_attrib_id='
. $GLOBALS['phpgw']->db->f('e_type_attrib_id') . "&equipment_type_id_orig=" .
$GLOBALS['phpgw']->db->f('equipment_type_id') .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));
!
$t->set_var('delete',$GLOBALS['phpgw']->link('/property/delete_equipment_type_attribute.php','e_type_attrib_id='
. $GLOBALS['phpgw']->db->f('e_type_attrib_id') . "&equipment_type_id=" .
$GLOBALS['phpgw']->db->f('equipment_type_id') .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));
$t->parse('list','equipment_type_attribute_list',True);
--- 167,179 ----
// ------------------- template declaration for list records
-------------------------
! $t->set_var(array('attrib_id' => $attrib_id,
! 'attrib_name' => $attrib_name,
! 'equipment_type' =>
$equipment_type,
'datatype' => $datatype,
'attrib_descr' => $attrib_descr));
!
$t->set_var('edit',$GLOBALS['phpgw']->link('/property/edit_equipment_type_attribute.php','attrib_id='
. $attrib_id . "&equipment_type_id=" . $equipment_type_id .
"&sort=$sort&order=$order&query=$query&start=$start"));
!
$t->set_var('delete',$GLOBALS['phpgw']->link('/property/delete_equipment_type_attribute.php','attrib_id='
. $attrib_id . "&equipment_type_id=" . $equipment_type_id .
"&sort=$sort&order=$order&query=$query&start=$start"));
$t->parse('list','equipment_type_attribute_list',True);
Index: viewticket_details.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/viewticket_details.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** viewticket_details.php 1 Sep 2002 19:43:49 -0000 1.2
--- viewticket_details.php 3 Sep 2002 22:15:38 -0000 1.3
***************
*** 121,125 ****
$GLOBALS['phpgw']->template->set_var('lang_generate_request',lang('Generate
Request'));
!
$GLOBALS['phpgw']->template->set_var('order_link',$GLOBALS['phpgw']->link('/property/add.php',"objekt_id=$objekt_id"
.
"&property_name=$property_name&bygg_id=$bygg_id&building_name=$building_name"
.
"&seksjons_id=$seksjons_id&etasje=$etasje&leie_id=$leie_id&street=$street"
--- 121,125 ----
$GLOBALS['phpgw']->template->set_var('lang_generate_request',lang('Generate
Request'));
!
$GLOBALS['phpgw']->template->set_var('order_link',$GLOBALS['phpgw']->link('/property/add_workorder.php',"objekt_id=$objekt_id"
.
"&property_name=$property_name&bygg_id=$bygg_id&building_name=$building_name"
.
"&seksjons_id=$seksjons_id&etasje=$etasje&leie_id=$leie_id&street=$street"
Index: workorder_archive.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/workorder_archive.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** workorder_archive.php 1 Sep 2002 19:43:49 -0000 1.2
--- workorder_archive.php 3 Sep 2002 22:15:38 -0000 1.3
***************
*** 40,44 ****
$c->app_name = 'p_workorder';
$t->set_var('category_list',$c->formated_list('select','all',$cat_id,'True'));
!
$t->set_var('coordinator_list',$fm_wrkorder->select_coordinator_list($coordinator_id));
$t->set_var('lang_all',lang('All'));
$t->set_var('lang_none',lang('None'));
--- 40,44 ----
$c->app_name = 'p_workorder';
$t->set_var('category_list',$c->formated_list('select','all',$cat_id,'True'));
!
$t->set_var('coordinator_list',$fm_wrkorder->select_coordinator_list(account_id,$coordinator_id,workorder));
$t->set_var('lang_all',lang('All'));
$t->set_var('lang_none',lang('None'));
Index: add_equipment_attribute.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_equipment_attribute.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** add_equipment_attribute.php 28 Aug 2002 16:43:04 -0000 1.1.1.1
--- add_equipment_attribute.php 3 Sep 2002 22:15:38 -0000 1.2
***************
*** 66,71 ****
if ($value[$n])
{
! $GLOBALS['phpgw']->db->query("INSERT
INTO fm_equipment_attrib
(equipment_id,equipment_type_id,e_type_attrib_id,$valuefield,"
! . "category,owner,access) VALUES
('$equipment_id','$equipment_type_id_h[$n]','$e_type_attrib_id_h[$n]','$value[$n]','$category','$owner','$access')");
}
}
--- 66,71 ----
if ($value[$n])
{
! $GLOBALS['phpgw']->db->query("INSERT
INTO fm_equipment_attrib (equipment_id,equipment_type_id,attrib_id,$valuefield,"
! . "category,owner,access) VALUES
('$equipment_id','$equipment_type_id_h[$n]','$attrib_id_h[$n]','$value[$n]','$category','$owner','$access')");
}
}
***************
*** 191,195 ****
while ($GLOBALS['phpgw']->db->next_record())
{
! $type_attrib[$i]['e_type_attrib_id'] =
$GLOBALS['phpgw']->db->f('e_type_attrib_id');
$type_attrib[$i]['equipment_type_id'] =
$GLOBALS['phpgw']->db->f('equipment_type_id');
$type_attrib[$i]['attrib_descr'] =
$GLOBALS['phpgw']->db->f('attrib_descr');
--- 191,196 ----
while ($GLOBALS['phpgw']->db->next_record())
{
! $type_attrib[$i]['attrib_id'] =
$GLOBALS['phpgw']->db->f('id');
! $type_attrib[$i]['attrib_name'] =
$GLOBALS['phpgw']->db->f('name');
$type_attrib[$i]['equipment_type_id'] =
$GLOBALS['phpgw']->db->f('equipment_type_id');
$type_attrib[$i]['attrib_descr'] =
$GLOBALS['phpgw']->db->f('attrib_descr');
***************
*** 206,210 ****
while ($GLOBALS['phpgw']->db->next_record())
{
! $attrib[$j]['e_type_attrib_id'] =
$GLOBALS['phpgw']->db->f('e_type_attrib_id');
$attrib[$j]['equipment_type_id'] =
$GLOBALS['phpgw']->db->f('equipment_type_id');
$attrib[$j]['attrib_descr'] =
$GLOBALS['phpgw']->db->f('attrib_descr');
--- 207,211 ----
while ($GLOBALS['phpgw']->db->next_record())
{
! $attrib[$j]['attrib_id'] =
$GLOBALS['phpgw']->db->f('attrib_id');
$attrib[$j]['equipment_type_id'] =
$GLOBALS['phpgw']->db->f('equipment_type_id');
$attrib[$j]['attrib_descr'] =
$GLOBALS['phpgw']->db->f('attrib_descr');
***************
*** 225,229 ****
for ($n=0;$n<$i;$n++)
{
! if
($type_attrib[$n]['e_type_attrib_id']==$attrib[$m]['e_type_attrib_id'] and
$type_attrib[$n]['equipment_type_id']==$attrib[$m]['equipment_type_id'])
{
$type_attrib[$n]['value']= $attrib[$m]['value'];
--- 226,230 ----
for ($n=0;$n<$i;$n++)
{
! if ($type_attrib[$n]['attrib_id']==$attrib[$m]['attrib_id'] and
$type_attrib[$n]['equipment_type_id']==$attrib[$m]['equipment_type_id'])
{
$type_attrib[$n]['value']= $attrib[$m]['value'];
***************
*** 239,247 ****
$select = '<input type="checkbox" name="select[' . $k . ']"
value="'. $k . '"checked>';
! $e_type_attrib_id = $type_attrib[$k]['e_type_attrib_id'];
! if (! $e_type_attrib_id) $e_type_attrib_id = ' ';
! $e_type_attrib_id_h ='<input type="hidden"
name="e_type_attrib_id_h[' . $k . ']" value="'. $e_type_attrib_id . '">';
$equipment_type_id = $type_attrib[$k]['equipment_type_id'];
--- 240,251 ----
$select = '<input type="checkbox" name="select[' . $k . ']"
value="'. $k . '"checked>';
! $attrib_id = $type_attrib[$k]['attrib_id'];
! if (! $attrib_id) $attrib_id = ' ';
+ $attrib_name = $type_attrib[$k]['attrib_name'];
+ if (! $attrib_name) $attrib_name = ' ';
!
! $attrib_id_h ='<input type="hidden" name="attrib_id_h[' . $k .
']" value="'. $attrib_id . '">';
$equipment_type_id = $type_attrib[$k]['equipment_type_id'];
***************
*** 271,276 ****
$t->set_var(array('select' => $select,
! 'e_type_attrib_id' =>
$e_type_attrib_id,
! 'e_type_attrib_id_h' =>
$e_type_attrib_id_h,
'equipment_type_id' =>
$equipment_type_id,
'equipment_type_id_h' =>
$equipment_type_id_h,
--- 275,281 ----
$t->set_var(array('select' => $select,
! 'attrib_id' => $attrib_id,
! 'attrib_name' => $attrib_name,
! 'attrib_id_h' => $attrib_id_h,
'equipment_type_id' =>
$equipment_type_id,
'equipment_type_id_h' =>
$equipment_type_id_h,
***************
*** 282,286 ****
!
$t->set_var('edit',$GLOBALS['phpgw']->link('/property/edit_equipment_type_attribute.php','e_type_attrib_id='
. $e_type_attrib_id . "&equipment_type_id_orig=" . $equipment_type_id .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));
$t->set_var('lang_edit',lang('Edit'));
--- 287,291 ----
!
$t->set_var('edit',$GLOBALS['phpgw']->link('/property/edit_equipment_type_attribute.php','attrib_id='
. $attrib_id . "&equipment_type_id=" . $equipment_type_id .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));
$t->set_var('lang_edit',lang('Edit'));
Index: add_equipment_type.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_equipment_type.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** add_equipment_type.php 28 Aug 2002 16:43:04 -0000 1.1.1.1
--- add_equipment_type.php 3 Sep 2002 22:15:38 -0000 1.2
***************
*** 20,39 ****
if ($submit)
{
- if ($choose)
- {
! }
! else
! {
! $equipment_type_id = addslashes($num);
! }
$errorcount = 0;
! if (!$equipment_type_id)
{
! $error[$errorcount++] = lang('Please enter an ID for
that equipment type !');
}
! $GLOBALS['phpgw']->db->query("select count(*) from
fm_equipment_type where equipment_type_id='$equipment_type_id'");
$GLOBALS['phpgw']->db->next_record();
if ($GLOBALS['phpgw']->db->f(0) != 0)
--- 20,36 ----
if ($submit)
{
! $equipment_type_id=next_id(fm_equipment_type);
!
! $name = addslashes($name);
!
$errorcount = 0;
! if (!$name)
{
! $error[$errorcount++] = lang('Please enter a Name for
that equipment type !');
}
! $GLOBALS['phpgw']->db->query("select count(*) from
fm_equipment_type where id='$equipment_type_id'");
$GLOBALS['phpgw']->db->next_record();
if ($GLOBALS['phpgw']->db->f(0) != 0)
***************
*** 46,51 ****
$type_descr = addslashes($type_descr);
! $GLOBALS['phpgw']->db->query("insert into
fm_equipment_type (equipment_type_id,type_descr) "
! . "values
('$equipment_type_id','$type_descr')");
}
$t->set_var('lang_equipment_id',lang('Equipment ID'));
--- 43,48 ----
$type_descr = addslashes($type_descr);
! $GLOBALS['phpgw']->db->query("insert into
fm_equipment_type (id,name,type_descr) "
! . "values
('$equipment_type_id','$name','$type_descr')");
}
$t->set_var('lang_equipment_id',lang('Equipment ID'));
***************
*** 55,59 ****
}
if ($errorcount) {
$t->set_var('message',$GLOBALS['phpgw']->common->error_list($error)); }
! if (($submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',lang('equipment_type x has been added
!',$equipment_type_id)); }
if ((! $submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',''); }
--- 52,56 ----
}
if ($errorcount) {
$t->set_var('message',$GLOBALS['phpgw']->common->error_list($error)); }
! if (($submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',lang('equipment_type x has been added !',$name)); }
if ((! $submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',''); }
***************
*** 67,72 ****
$t->set_var('hidden_vars',$hidden_vars);
! $t->set_var('lang_equipment_type_id',lang('Equipment type ID'));
! $t->set_var('equipment_type_id',$equipment_type_id);
--- 64,70 ----
$t->set_var('hidden_vars',$hidden_vars);
! $t->set_var('lang_name',lang('Name'));
! // $t->set_var('equipment_type_id',$equipment_type_id);
! $t->set_var('name',$name);
Index: add_equipment_type_attribute.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/add_equipment_type_attribute.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** add_equipment_type_attribute.php 28 Aug 2002 16:43:04 -0000 1.1.1.1
--- add_equipment_type_attribute.php 3 Sep 2002 22:15:38 -0000 1.2
***************
*** 20,39 ****
if ($submit)
{
! if ($choose)
! {
! }
! else
! {
! $e_type_attrib_id = addslashes($e_type_attrib_id);
! }
$errorcount = 0;
! if (!$e_type_attrib_id)
{
! $error[$errorcount++] = lang('Please enter an ID for
that equipment type !');
}
! $GLOBALS['phpgw']->db->query("select count(*) from
fm_equipment_type_attrib where e_type_attrib_id='$e_type_attrib_id'"
. " and equipment_type_id='$equipment_type_id'");
$GLOBALS['phpgw']->db->next_record();
--- 20,34 ----
if ($submit)
{
! $attrib_id = next_id(fm_equipment_type_attrib);
! $name = addslashes($name);
$errorcount = 0;
! if (!$name)
{
! $error[$errorcount++] = lang('Please enter Name for
that equipment type !');
}
! /* $GLOBALS['phpgw']->db->query("select count(*) from
fm_equipment_type_attrib where id='$attrib_id'"
. " and equipment_type_id='$equipment_type_id'");
$GLOBALS['phpgw']->db->next_record();
***************
*** 43,52 ****
}
if (! $error)
{
$attrib_descr = addslashes($attrib_descr);
! $GLOBALS['phpgw']->db->query("insert into
fm_equipment_type_attrib
(e_type_attrib_id,equipment_type_id,attrib_descr,datatype) "
! . "values
('$e_type_attrib_id','$equipment_type_id','$attrib_descr','$datatype ')");
}
$t->set_var('lang_equipment_id',lang('Equipment ID'));
--- 38,48 ----
}
+ */
if (! $error)
{
$attrib_descr = addslashes($attrib_descr);
! $GLOBALS['phpgw']->db->query("insert into
fm_equipment_type_attrib (id,name,equipment_type_id,attrib_descr,datatype) "
! . "values
('$attrib_id','$name','$equipment_type_id','$attrib_descr','$datatype ')");
}
$t->set_var('lang_equipment_id',lang('Equipment ID'));
***************
*** 54,64 ****
}
-
//----------------------- equipment_type
! $GLOBALS['phpgw']->db->query("SELECT * FROM fm_equipment_type
order by equipment_type_id asc");
while ($GLOBALS['phpgw']->db->next_record())
{
! $equipment_type_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('equipment_type_id') . '">'
! .
$GLOBALS['phpgw']->db->f('equipment_type_id')
. ' ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('type_descr')). '] ' .
'</option>';
}
--- 50,63 ----
}
//----------------------- equipment_type
! $GLOBALS['phpgw']->db->query("SELECT * FROM fm_equipment_type
order by id asc");
while ($GLOBALS['phpgw']->db->next_record())
{
! $equipment_type_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('id') . '"';
! if($equipment_type_id ==
$GLOBALS['phpgw']->db->f('id'))
! {
! $equipment_type_list .= '
selected';
! }
! $equipment_type_list .= '>' .
$GLOBALS['phpgw']->db->f('id')
. ' ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('type_descr')). '] ' .
'</option>';
}
***************
*** 92,96 ****
if ($errorcount) {
$t->set_var('message',$GLOBALS['phpgw']->common->error_list($error)); }
! if (($submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',lang('equipment_type x has been added
!',$equipment_type_id)); }
if ((! $submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',''); }
--- 91,95 ----
if ($errorcount) {
$t->set_var('message',$GLOBALS['phpgw']->common->error_list($error)); }
! if (($submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',lang('Attibute x has been added !',$name)); }
if ((! $submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',''); }
***************
*** 104,109 ****
$t->set_var('hidden_vars',$hidden_vars);
! $t->set_var('lang_e_type_attrib_id',lang('Equipment type attribute
ID'));
! $t->set_var('e_type_attrib_id',$e_type_attrib_id);
--- 103,108 ----
$t->set_var('hidden_vars',$hidden_vars);
! $t->set_var('lang_name',lang('Attribute Name'));
! $t->set_var('name',$name);
Index: delete_equipment_type.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/delete_equipment_type.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** delete_equipment_type.php 28 Aug 2002 16:43:08 -0000 1.1.1.1
--- delete_equipment_type.php 3 Sep 2002 22:15:38 -0000 1.2
***************
*** 8,18 ****
/* $Id$ */
! if (! $equipment_type_id)
{
Header('Location: ' .
$GLOBALS['phpgw']->link('/property/list_equipment_type.php','sort=' . $sort .
'&order=' . $order . '&query=' . $query . '&start=' . $start
. '&filter=' . $filter));
}
! if ($confirm)
{
$GLOBALS['phpgw_info']['flags'] = array('noheader' => True,
--- 8,19 ----
/* $Id$ */
! /* if (! $equipment_type_id)
{
Header('Location: ' .
$GLOBALS['phpgw']->link('/property/list_equipment_type.php','sort=' . $sort .
'&order=' . $order . '&query=' . $query . '&start=' . $start
. '&filter=' . $filter));
+
}
! */ if ($confirm)
{
$GLOBALS['phpgw_info']['flags'] = array('noheader' => True,
***************
*** 25,29 ****
if ($confirm)
{
! $GLOBALS['phpgw']->db->query("delete from fm_equipment_type
where equipment_type_id='$equipment_type_id'");
Header('Location: ' .
$GLOBALS['phpgw']->link('/property/list_equipment_type.php','sort=' . $sort .
'&order=' . $order . '&query=' . $query . '&start=' . $start
. '&filter=' . $filter));
--- 26,30 ----
if ($confirm)
{
! $GLOBALS['phpgw']->db->query("delete from fm_equipment_type
where id='$equipment_type_id'");
Header('Location: ' .
$GLOBALS['phpgw']->link('/property/list_equipment_type.php','sort=' . $sort .
'&order=' . $order . '&query=' . $query . '&start=' . $start
. '&filter=' . $filter));
Index: delete_equipment_type_attribute.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/delete_equipment_type_attribute.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** delete_equipment_type_attribute.php 28 Aug 2002 16:43:08 -0000 1.1.1.1
--- delete_equipment_type_attribute.php 3 Sep 2002 22:15:38 -0000 1.2
***************
*** 25,31 ****
if ($confirm)
{
! $GLOBALS['phpgw']->db->query("delete from
fm_equipment_type_attrib where e_type_attrib_id='$e_type_attrib_id' and
equipment_type_id='$equipment_type_id'");
Header('Location: ' .
$GLOBALS['phpgw']->link('/property/list_equipment_type_attribute.php','sort=' .
$sort . '&order=' . $order . '&query=' . $query . '&start=' . $start
!
. '&filter=' . $filter));
}
else
--- 25,31 ----
if ($confirm)
{
! $GLOBALS['phpgw']->db->query("delete from
fm_equipment_type_attrib where id='$attrib_id' and
equipment_type_id='$equipment_type_id'");
Header('Location: ' .
$GLOBALS['phpgw']->link('/property/list_equipment_type_attribute.php','sort=' .
$sort . '&order=' . $order . '&query=' . $query . '&start=' . $start
!
. '&attrib_id=' . $attrib_id. '&equipment_type_id=' .
$equipment_type_id));
}
else
***************
*** 36,41 ****
. '<input type="hidden" name="sub"
value="' . $sub . '">' . "\n"
. '<input type="hidden" name="start"
value="' . $start . '">' . "\n"
! . '<input type="hidden"
name="e_type_attrib_id" value="' . $e_type_attrib_id . '">' . "\n"
! . '<input type="hidden" name="filter"
value="' . $filter . '">' . "\n";
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
--- 36,41 ----
. '<input type="hidden" name="sub"
value="' . $sub . '">' . "\n"
. '<input type="hidden" name="start"
value="' . $start . '">' . "\n"
! . '<input type="hidden"
name="attrib_id" value="' . $attrib_id . '">' . "\n"
! . '<input type="hidden"
name="equipment_type_id" value="' . $equipment_type_id . '">' . "\n";
$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
***************
*** 45,54 ****
$t->set_var('hidden_vars',$hidden_vars);
$t->set_var('nolink',$GLOBALS['phpgw']->link('/property/list_equipment_type_attribute.php','sort='
. $sort . '&order=' . $order . '&query=' . $query
!
. '&start=' . $start . '&filter=' . $filter));
$t->set_var('lang_no',lang('No'));
!
$t->set_var('action_url',$GLOBALS['phpgw']->link('/property/delete_equipment_type_attribute.php','e_type_attrib_id='
. $e_type_attrib_id . "&equipment_type_id=" . $equipment_type_id));
$t->set_var('lang_yes',lang('Yes'));
! $t->set_var('e_type_attrib_id',$e_type_attrib_id);
$t->set_var('equipment_type_id',$equipment_type_id);
--- 45,54 ----
$t->set_var('hidden_vars',$hidden_vars);
$t->set_var('nolink',$GLOBALS['phpgw']->link('/property/list_equipment_type_attribute.php','sort='
. $sort . '&order=' . $order . '&query=' . $query
!
. '&start=' . $start . $attrib_id. '&equipment_type_id=' .
$equipment_type_id));
$t->set_var('lang_no',lang('No'));
!
$t->set_var('action_url',$GLOBALS['phpgw']->link('/property/delete_equipment_type_attribute.php','attrib_id='
. $attrib_id . "&equipment_type_id=" . $equipment_type_id));
$t->set_var('lang_yes',lang('Yes'));
! $t->set_var('attrib_id',$attrib_id);
$t->set_var('equipment_type_id',$equipment_type_id);
Index: edit_equipment_type.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/edit_equipment_type.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** edit_equipment_type.php 28 Aug 2002 16:43:08 -0000 1.1.1.1
--- edit_equipment_type.php 3 Sep 2002 22:15:38 -0000 1.2
***************
*** 33,36 ****
--- 33,38 ----
. '<input type="hidden"
name="equipment_type_id" value="' . $equipment_type_id . '">' . "\n";
+ $t->set_var('hidden_vars',$hidden_vars);
+
if ($submit)
{
***************
*** 41,45 ****
{
$descr = addslashes($descr);
! $GLOBALS['phpgw']->db->query("update fm_equipment_type
set type_descr='$type_descr' where equipment_type_id='$equipment_type_id'");
}
}
--- 43,47 ----
{
$descr = addslashes($descr);
! $GLOBALS['phpgw']->db->query("update fm_equipment_type
set name='$name', type_descr='$type_descr' where id='$equipment_type_id'");
}
}
***************
*** 49,57 ****
if ((! $submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',''); }
! $GLOBALS['phpgw']->db->query("select * from fm_equipment_type WHERE
equipment_type_id='$equipment_type_id'");
$GLOBALS['phpgw']->db->next_record();
$type_descr =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('type_descr'));
if (! $type_descr) $type_descr = ' ';
$t->set_var('type_descr',$type_descr);
$t->set_var('actionurl',$GLOBALS['phpgw']->link('/property/edit_equipment_type.php'));
--- 51,61 ----
if ((! $submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',''); }
! $GLOBALS['phpgw']->db->query("select * from fm_equipment_type WHERE
id='$equipment_type_id'");
$GLOBALS['phpgw']->db->next_record();
$type_descr =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('type_descr'));
if (! $type_descr) $type_descr = ' ';
+ $name =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('name'));
$t->set_var('type_descr',$type_descr);
+ $t->set_var('name',$name);
$t->set_var('actionurl',$GLOBALS['phpgw']->link('/property/edit_equipment_type.php'));
***************
*** 59,66 ****
$t->set_var('done_url',$GLOBALS['phpgw']->link('/property/list_equipment_type.php'));
$t->set_var('lang_action',lang('Edit equipment type'));
- $t->set_var('hidden_vars',$hidden_vars);
$t->set_var('lang_descr',lang('Description'));
! $t->set_var('lang_equipment_type_id',lang('Equipment type ID'));
$t->set_var('equipment_type_id',$equipment_type_id);
--- 63,69 ----
$t->set_var('done_url',$GLOBALS['phpgw']->link('/property/list_equipment_type.php'));
$t->set_var('lang_action',lang('Edit equipment type'));
$t->set_var('lang_descr',lang('Description'));
! $t->set_var('lang_name',lang('Equipment type Name'));
$t->set_var('equipment_type_id',$equipment_type_id);
Index: edit_equipment_type_attribute.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/edit_equipment_type_attribute.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** edit_equipment_type_attribute.php 28 Aug 2002 16:43:08 -0000 1.1.1.1
--- edit_equipment_type_attribute.php 3 Sep 2002 22:15:38 -0000 1.2
***************
*** 27,50 ****
- if ($equipment_type_id == $equipment_type_id_orig)
- {
- $equipment_type_id_update= $equipment_type_id_orig;
- $equipment_type_selected= $equipment_type_id_orig;
- }
- else
- {
-
- $equipment_type_id_update = $equipment_type_id;
- $equipment_type_selected= $equipment_type_id;
- }
-
- if (!$equipment_type_id )
- {
- $equipment_type_selected= $equipment_type_id_orig;
- }
-
-
-
-
if ($submit)
{
--- 27,30 ----
***************
*** 55,61 ****
if (! $error)
{
$descr = addslashes($descr);
! $GLOBALS['phpgw']->db->query("update
fm_equipment_type_attrib set attrib_descr='$attrib_descr',
equipment_type_id='$equipment_type_id_update',datatype='$datatype' where
e_type_attrib_id='$e_type_attrib_id' and
equipment_type_id='$equipment_type_id_orig'");
! $equipment_type_id_orig= $equipment_type_id_update;
}
}
--- 35,41 ----
if (! $error)
{
+ $name = addslashes($name);
$descr = addslashes($descr);
! $GLOBALS['phpgw']->db->query("update
fm_equipment_type_attrib set name='$name', attrib_descr='$attrib_descr',
datatype='$datatype' where id='$attrib_id' and
equipment_type_id='$equipment_type_id'");
}
}
***************
*** 66,91 ****
. '<input type="hidden" name="sub" value="' . $sub .
'">' . "\n"
. '<input type="hidden" name="start" value="' . $start
. '">' . "\n"
! . '<input type="hidden" name="filter" value="' .
$filter . '">' . "\n"
! . '<input type="hidden" name="equipment_type_id_orig"
value="' . $equipment_type_id_orig . '">' . "\n";
- $t->set_var('equipment_type_id_update',$equipment_type_id_update);
- $t->set_var('equipment_type_id_orig',$equipment_type_id_orig);
$t->set_var('equipment_type_selected',$equipment_type_selected);
if ($errorcount) {
$t->set_var('message',$GLOBALS['phpgw']->common->error_list($error)); }
! if (($submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',lang('Equipment type x has been updated
!',$equipment_type_id)); }
if ((! $submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',''); }
- $GLOBALS['phpgw']->db->query("select * from fm_equipment_type_attrib
WHERE e_type_attrib_id='$e_type_attrib_id' and
equipment_type_id='$equipment_type_id_orig'");
- $GLOBALS['phpgw']->db->next_record();
$attrib_descr = $GLOBALS['phpgw']->db->f('attrib_descr');
if (! $attrib_descr) $attrib_descr = ' ';
$t->set_var('attrib_descr',$attrib_descr);
$t->set_var('actionurl',$GLOBALS['phpgw']->link('/property/edit_equipment_type_attribute.php'));
- //,'e_type_attrib_id=' . $e_type_attrib_id .
"&equipment_type_id_update=" . $equipment_type_id_update .
"&sort=$sort&order=$order&query=$query&start=$start&filter=$filter"));
$t->set_var('deleteurl',$GLOBALS['phpgw']->link('/property/delete_equipment_type_attribute.php'));
$t->set_var('done_url',$GLOBALS['phpgw']->link('/property/list_equipment_type_attribute.php'));
--- 46,75 ----
. '<input type="hidden" name="sub" value="' . $sub .
'">' . "\n"
. '<input type="hidden" name="start" value="' . $start
. '">' . "\n"
! . '<input type="hidden" name="attrib_id" value="' .
$attrib_id . '">' . "\n"
! . '<input type="hidden" name="equipment_type_id"
value="' . $equipment_type_id . '">' . "\n";
!
! $t->set_var('hidden_vars',$hidden_vars);
$t->set_var('equipment_type_selected',$equipment_type_selected);
if ($errorcount) {
$t->set_var('message',$GLOBALS['phpgw']->common->error_list($error)); }
! if (($submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',lang('Equipment type x has been updated
!',$equipment_type)); }
if ((! $submit) && (! $error) && (! $errorcount)) {
$t->set_var('message',''); }
+
+ $GLOBALS['phpgw']->db->query("select * from fm_equipment_type_attrib
WHERE id='$attrib_id' and equipment_type_id='$equipment_type_id'");
+
+ $GLOBALS['phpgw']->db->next_record();
+
+ $name = $GLOBALS['phpgw']->db->f('name');
$attrib_descr = $GLOBALS['phpgw']->db->f('attrib_descr');
if (! $attrib_descr) $attrib_descr = ' ';
$t->set_var('attrib_descr',$attrib_descr);
+ $datatype = $GLOBALS['phpgw']->db->f('datatype');
$t->set_var('actionurl',$GLOBALS['phpgw']->link('/property/edit_equipment_type_attribute.php'));
$t->set_var('deleteurl',$GLOBALS['phpgw']->link('/property/delete_equipment_type_attribute.php'));
$t->set_var('done_url',$GLOBALS['phpgw']->link('/property/list_equipment_type_attribute.php'));
***************
*** 94,106 ****
$t->set_var('lang_descr',lang('Description'));
- //$attrib_descr =
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('attrib_descr'));
-
-
$t->set_var('lang_e_type_attrib_id',lang('Equipment type attribute
ID'));
$t->set_var('e_type_attrib_id',$e_type_attrib_id);
$t->set_var('lang_equipment_type',lang('Equipment type'));
$t->set_var('lang_equipment_type_id',lang('Equipment type ID'));
$t->set_var('equipment_type_id',$equipment_type_id);
--- 78,89 ----
$t->set_var('lang_descr',lang('Description'));
$t->set_var('lang_e_type_attrib_id',lang('Equipment type attribute
ID'));
$t->set_var('e_type_attrib_id',$e_type_attrib_id);
+ $t->set_var('name',$name);
$t->set_var('lang_equipment_type',lang('Equipment type'));
+ $t->set_var('lang_name',lang('Attribute name'));
$t->set_var('lang_equipment_type_id',lang('Equipment type ID'));
$t->set_var('equipment_type_id',$equipment_type_id);
***************
*** 113,125 ****
// ---------- datatype list
! if ($GLOBALS['phpgw']->db->f('datatype')=='C'):
$datatype_sel[0]=' selected';
! elseif ($GLOBALS['phpgw']->db->f('datatype')=='I'):
$datatype_sel[1]=' selected';
! elseif ($GLOBALS['phpgw']->db->f('datatype')=='N'):
$datatype_sel[2]=' selected';
endif;
! $datatype_list = '<option value="C"' . $unit_sel[0] . '>' .
lang('Character') . '</option>' . "\n"
. '<option value="I"' . $datatype_sel[1] . '>' .
lang('Integer') . '</option>' . "\n"
. '<option value="N"' . $datatype_sel[2] . '>' .
lang('Decimal') . '</option>' . "\n";
--- 96,108 ----
// ---------- datatype list
! if ($datatype=='C'):
$datatype_sel[0]=' selected';
! elseif ($datatype=='I'):
$datatype_sel[1]=' selected';
! elseif ($datatype=='N'):
$datatype_sel[2]=' selected';
endif;
! $datatype_list = '<option value="C"' . $datatype_sel[0] . '>' .
lang('Character') . '</option>' . "\n"
. '<option value="I"' . $datatype_sel[1] . '>' .
lang('Integer') . '</option>' . "\n"
. '<option value="N"' . $datatype_sel[2] . '>' .
lang('Decimal') . '</option>' . "\n";
***************
*** 129,140 ****
//----------------------- equipment_type
! $GLOBALS['phpgw']->db->query("SELECT * FROM fm_equipment_type order by
equipment_type_id asc");
while ($GLOBALS['phpgw']->db->next_record())
{
! $equipment_type_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('equipment_type_id') . '"';
! if
($GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('equipment_type_id'))
== $equipment_type_selected)
$equipment_type_list .= ' selected';
$equipment_type_list .= '>'
! . $GLOBALS['phpgw']->db->f('equipment_type_id')
. ' ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('type_descr')). '] ' .
'</option>';
}
--- 112,123 ----
//----------------------- equipment_type
! $GLOBALS['phpgw']->db->query("SELECT * FROM fm_equipment_type order by
name asc");
while ($GLOBALS['phpgw']->db->next_record())
{
! $equipment_type_list .= '<option value="' .
$GLOBALS['phpgw']->db->f('id') . '"';
! if ($GLOBALS['phpgw']->db->f('id') ==
$equipment_type_id)
$equipment_type_list .= ' selected';
$equipment_type_list .= '>'
! . $GLOBALS['phpgw']->db->f('name')
. ' ['.
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('type_descr')). '] ' .
'</option>';
}
Index: invoice_consume.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/invoice_consume.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** invoice_consume.php 2 Sep 2002 22:55:56 -0000 1.1
--- invoice_consume.php 3 Sep 2002 22:15:38 -0000 1.2
***************
*** 163,171 ****
{
$querymethod= " where left(spbudact_code,2)='$b_account_class'";
! $where_1= 'where';
}
else
{
! $where_1= 'and';
$querymethod='';
$select_account_class=',left(spbudact_code,2) as
b_account_class';
--- 163,171 ----
{
$querymethod= " where left(spbudact_code,2)='$b_account_class'";
! $where_1= 'and';
}
else
{
! $where_1= 'where';
$querymethod='';
$select_account_class=',left(spbudact_code,2) as
b_account_class';
***************
*** 243,247 ****
{
$sql = "SELECT omraade_id,periode,sum(godkjentbelop) as consume
$select_account_class "
! . " FROM t_ecobilagoverf INNER JOIN boei_objekt ON
t_ecobilagoverf.dima = boei_objekt.objekt_id INNER JOIN "
. " boei_bydel ON boei_objekt.bydel_id = boei_bydel.bydel_id "
. " $querymethod $filtermethod"
--- 243,247 ----
{
$sql = "SELECT omraade_id,periode,sum(godkjentbelop) as consume
$select_account_class "
! . " FROM t_ecobilagoverf LEFT JOIN boei_objekt ON
left(t_ecobilagoverf.dima,4) = boei_objekt.objekt_id LEFT JOIN "
. " boei_bydel ON boei_objekt.bydel_id = boei_bydel.bydel_id "
. " $querymethod $filtermethod"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property invoice_paid.php,1.4,1.5 list_invoice.php,1.4,1.5 list_workorder.php,1.3,1.4 add_equipment.php,1.2,1.3 addactivity.php,1.2,1.3 edit_equipment.php,1.2,1.3 list_equipment.php,1.2,1.3 list_equipment_type.php,1.2,1.3 list_equipment_type_attribute.php,1.2,1.3 viewticket_details.php,1.2,1.3 workorder_archive.php,1.2,1.3 add_equipment_attribute.php,1.1.1.1,1.2 add_equipment_type.php,1.1.1.1,1.2 add_equipment_type_attribute.php,1.1.1.1,1.2 delete_equipment_type.php,1.1.1.1,1.2 delete_equipment_type_attribute.php,1.1.1.1,1.2 edit_equipment_type.php,1.1.1.1,1.2 edit_equipment_type_attribute.php,1.1.1.1,1.2 invoice_consume.php,1.1,1.2,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default header.tpl,1.2,1.3 form_equipment_attribute.tpl,1.1.1.1,1.2 formequipment.tpl,1.1.1.1,1.2 formequipment_type.tpl,1.1.1.1,1.2 formequipment_type_attribute.tpl,1.1.1.1,1.2 list_equipment_type.tpl,1.1.1.1,1.2 list_equipment_type_attribute.tpl,1.1.1.1,1.2 list_workorder.tpl,1.1.1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: etemplate/inc class.editor.inc.php,1.9,1.10
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default header.tpl,1.2,1.3 form_equipment_attribute.tpl,1.1.1.1,1.2 formequipment.tpl,1.1.1.1,1.2 formequipment_type.tpl,1.1.1.1,1.2 formequipment_type_attribute.tpl,1.1.1.1,1.2 list_equipment_type.tpl,1.1.1.1,1.2 list_equipment_type_attribute.tpl,1.1.1.1,1.2 list_workorder.tpl,1.1.1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: etemplate/inc class.editor.inc.php,1.9,1.10
- Index(es):