[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.1,1.2 clas
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.1,1.2 class.boinvoice.inc.php,1.2,1.3 class.bolookup.inc.php,1.1,1.2 class.sobuilding.inc.php,1.2,1.3 class.socommon.inc.php,1.2,1.3 class.soinvoice.inc.php,1.2,1.3 class.solookup.inc.php,1.2,1.3 class.soproperty.inc.php,1.1,1.2 class.uilookup.inc.php,1.2,1.3 class.uiXport.inc.php,1.7,1.8 |
|
Date: |
Thu, 02 Jan 2003 17:04:01 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv12307/inc
Modified Files:
class.bocommon.inc.php class.boinvoice.inc.php
class.bolookup.inc.php class.sobuilding.inc.php
class.socommon.inc.php class.soinvoice.inc.php
class.solookup.inc.php class.soproperty.inc.php
class.uilookup.inc.php class.uiXport.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.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.bocommon.inc.php 11 Dec 2002 19:31:22 -0000 1.1
--- class.bocommon.inc.php 2 Jan 2003 22:03:57 -0000 1.2
***************
*** 16,19 ****
--- 16,20 ----
var $order;
var $cat_id;
+ var $district_id;
var $public_functions = array
***************
*** 56,65 ****
}
! $start = get_var('start',array('POST','GET'));
! $query = get_var('query',array('POST','GET'));
! $sort = get_var('sort',array('POST','GET'));
! $order = get_var('order',array('POST','GET'));
! $filter = get_var('filter',array('POST','GET'));
! $cat_id = get_var('cat_id',array('POST','GET'));
if ($start)
--- 57,67 ----
}
! $start =
get_var('start',array('POST','GET'));
! $query =
get_var('query',array('POST','GET'));
! $sort =
get_var('sort',array('POST','GET'));
! $order =
get_var('order',array('POST','GET'));
! $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)
***************
*** 92,95 ****
--- 94,101 ----
$this->cat_id = $cat_id;
}
+ if(isset($cat_id))
+ {
+ $this->district_id = $district_id;
+ }
}
***************
*** 161,170 ****
// print_();
! $this->start = $data['start'];
! $this->query = $data['query'];
! $this->filter = $data['filter'];
! $this->sort = $data['sort'];
! $this->order = $data['order'];
! $this->cat_id = $data['cat_id'];
}
--- 167,178 ----
// print_();
! $this->start = $data['start'];
! $this->query = $data['query'];
! $this->filter = $data['filter'];
! $this->sort = $data['sort'];
! $this->order = $data['order'];
! $this->cat_id = $data['cat_id'];
! $this->district_id = $data['district_id'];
!
}
***************
*** 216,220 ****
'link_workorder' =>
$GLOBALS['phpgw']->link('/property/list_workorder.php','sub=workorder'),
'lang_workorder' =>
lang('Workorder'),
! 'link_invoice' =>
$GLOBALS['phpgw']->link('/property/list_invoice.php','sub=invoice'),
'lang_invoice' => lang('Invoice'),
'link_activities' =>
$GLOBALS['phpgw']->link('/property/list_vendors_activities.php','sub=activity'),
--- 224,228 ----
'link_workorder' =>
$GLOBALS['phpgw']->link('/property/list_workorder.php','sub=workorder'),
'lang_workorder' =>
lang('Workorder'),
! 'link_invoice' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&sub=invoice'),
'lang_invoice' => lang('Invoice'),
'link_activities' =>
$GLOBALS['phpgw']->link('/property/list_vendors_activities.php','sub=activity'),
***************
*** 282,286 ****
if ($sub == invoice)
{
!
$menu['sub_invoice_list']=$GLOBALS['phpgw']->link('/property/list_invoice.php','sub=invoice');
$menu['sub_invoice_paid']=$GLOBALS['phpgw']->link('/property/invoice_paid.php','sub=invoice');
$menu['sub_invoice_powermeter']=$GLOBALS['phpgw']->link('/property/list_power_meter.php','sub=invoice');
--- 290,294 ----
if ($sub == invoice)
{
!
$menu['sub_invoice_list']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&sub=invoice');
$menu['sub_invoice_paid']=$GLOBALS['phpgw']->link('/property/invoice_paid.php','sub=invoice');
$menu['sub_invoice_powermeter']=$GLOBALS['phpgw']->link('/property/list_power_meter.php','sub=invoice');
***************
*** 426,429 ****
--- 434,562 ----
return $part_of_town_list;
+ }
+
+ function select_category_apartment_list($format='',$selected='')
+ {
+ switch($format)
+ {
+ case 'select':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
+ break;
+ case 'filter':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
+ break;
+ }
+
+ $categories=
$this->socommon->select_category_apartment_list();
+
+ while (is_array($categories) && list(,$category) =
each($categories))
+ {
+ $sel_category = '';
+ if ($category['id']==$selected)
+ {
+ $sel_category = 'selected';
+ }
+
+ $category_list[] = array
+ (
+ 'cat_id' => $category['id'],
+ 'name' => $category['name'],
+ 'selected' => $sel_category
+ );
+ }
+
+ for ($i=0;$i<count($category_list);$i++)
+ {
+ if ($category_list[$i]['selected'] !=
'selected')
+ {
+ unset($category_list[$i]['selected']);
+ }
+ }
+
+ return $category_list;
+ }
+
+ function select_district_list($format='',$selected='')
+ {
+ switch($format)
+ {
+ case 'select':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('select_district',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
+ break;
+ case 'filter':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('filter_district',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
+ break;
+ }
+
+ $districts= $this->socommon->select_district_list();
+
+ while (is_array($districts) && list(,$district) =
each($districts))
+ {
+ $sel_district = '';
+ if ($district['id']==$selected)
+ {
+ $sel_district = 'selected';
+ }
+
+ $district_list[] = array
+ (
+ 'id' => $district['id'],
+ 'name' => $district['name'],
+ 'selected' => $sel_district
+ );
+ }
+
+ for ($i=0;$i<count($district_list);$i++)
+ {
+ if ($district_list[$i]['selected'] !=
'selected')
+ {
+ unset($district_list[$i]['selected']);
+ }
+ }
+
+ return $district_list;
+ }
+
+
+ function select_category_equipment_list($format='',$selected='')
+ {
+ switch($format)
+ {
+ case 'select':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
+ break;
+ case 'filter':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
+ break;
+ }
+
+
+ $categories=
$this->socommon->select_category_equipment_list();
+
+ while (is_array($categories) && list(,$category) =
each($categories))
+ {
+ $sel_category = '';
+ if ($category['id']==$selected)
+ {
+ $sel_category = 'selected';
+ }
+
+ $category_list[] = array
+ (
+ 'cat_id' => $category['id'],
+ 'name' => $category['name'],
+ 'selected' => $sel_category
+ );
+ }
+
+ for ($i=0;$i<count($category_list);$i++)
+ {
+ if ($category_list[$i]['selected'] !=
'selected')
+ {
+ unset($category_list[$i]['selected']);
+ }
+ }
+
+ return $category_list;
}
Index: class.boinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boinvoice.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.boinvoice.inc.php 24 Dec 2002 23:22:29 -0000 1.2
--- class.boinvoice.inc.php 2 Jan 2003 22:03:57 -0000 1.3
***************
*** 32,38 ****
--- 32,121 ----
}
$this->account_id =
$GLOBALS['phpgw_info']['user']['account_id'];
+
+ if ($session)
+ {
+ $this->read_sessiondata();
+ $this->use_session = True;
+ }
+ $this->read_sessiondata();
+
+ $start =
get_var('start',array('POST','GET'));
+ $query =
get_var('query',array('POST','GET'));
+ $sort =
get_var('sort',array('POST','GET'));
+ $order =
get_var('order',array('POST','GET'));
+ $filter =
get_var('filter',array('POST','GET'));
+ $cat_id =
get_var('cat_id',array('POST','GET'));
+ $user_lid =
get_var('user_lid',array('POST','GET'));
+ $sub =
get_var('sub',array('POST','GET'));
+
+ if ($start)
+ {
+ $this->start=$start;
+ }
+ else
+ {
+ $this->start=0;
+ }
+
+ if(isset($query))
+ {
+ $this->query = $query;
+ }
+ if(!empty($filter))
+ {
+ $this->filter = $filter;
+ }
+ if(isset($sort))
+ {
+ $this->sort = $sort;
+ }
+ if(isset($order))
+ {
+ $this->order = $order;
+ }
+ if(isset($cat_id))
+ {
+ $this->cat_id = $cat_id;
+ }
+ if(isset($user_lid))
+ {
+ $this->user_lid = $user_lid;
+ }
+ if(isset($sub))
+ {
+ $this->sub = $sub;
+ }
+
+
+ }
+
+ function read_sessiondata()
+ {
+ $data =
$GLOBALS['phpgw']->session->appsession('session_data',$this->currentapp);
+
+ // _debug_array($data);
+
+ $this->start = $data['start'];
+ $this->query = $data['query'];
+ $this->filter = $data['filter'];
+ $this->sort = $data['sort'];
+ $this->order = $data['order'];
+ $this->cat_id = $data['cat_id'];
+ $this->user_lid = $data['user_lid'];
+ $this->sub = $data['sub'];
+
+ }
+
+ function read_invoice()
+ {
+ $invoice = $this->so->read_invoice(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
+
'user_lid' => $this->user_lid,'cat_id' => $this->cat_id));
+ $this->total_records = $this->so->total_records;
+
+ return $invoice;
}
+
function get_list_role($role='',$selected='')
{
***************
*** 116,119 ****
--- 199,288 ----
}
//----------
+
+ function select_category($format='',$selected='')
+ {
+ switch($format)
+ {
+ case 'select':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
+ break;
+ case 'filter':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('cat_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
+ break;
+ }
+
+ $categories= $this->so->get_type_list();
+
+ while (is_array($categories) && list(,$category) =
each($categories))
+ {
+ $sel_category = '';
+ if ($category['id']==$selected)
+ {
+ $sel_category = 'selected';
+ }
+
+ $category_list[] = array
+ (
+ 'cat_id' => $category['id'],
+ 'name' => $category['num'],
+ 'selected' => $sel_category
+ );
+ }
+
+ for ($i=0;$i<count($category_list);$i++)
+ {
+ if ($category_list[$i]['selected'] !=
'selected')
+ {
+ unset($category_list[$i]['selected']);
+ }
+ }
+
+ return $category_list;
+ }
+
+
+ function get_invoice_user_list($format='',$selected='')
+ {
+ switch($format)
+ {
+ case 'select':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('user_lid_select',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
+ break;
+ case 'filter':
+
$GLOBALS['phpgw']->xslttpl->add_file(array('user_lid_filter',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
. SEP . 'app_header'));
+ break;
+ }
+
+ $users= $this->so->get_invoice_user_list();
+
+ while (is_array($users) && list(,$user) = each($users))
+ {
+ $sel_user = '';
+ if ($user['account_lid']==$selected)
+ {
+ $sel_user = 'selected';
+ }
+
+ $user_list[] = array
+ (
+ 'user_lid' => $user['account_lid'],
+ 'name' =>
$user['account_lastname'].', '.$user['account_firstname'],
+ 'selected' => $sel_user
+ );
+ }
+
+ for ($i=0;$i<count($user_list);$i++)
+ {
+ if ($user_list[$i]['selected'] != 'selected')
+ {
+ unset($user_list[$i]['selected']);
+ }
+ }
+
+ //_debug_array($user_list);
+ return $user_list;
+ }
+
+
function get_type_list($selected='')
Index: class.bolookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bolookup.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.bolookup.inc.php 27 Dec 2002 19:03:27 -0000 1.1
--- class.bolookup.inc.php 2 Jan 2003 22:03:57 -0000 1.2
***************
*** 50,59 ****
$this->socommon =
CreateObject($this->currentapp.'.socommon');
! $start = get_var('start',array('POST','GET'));
! $query = get_var('query',array('POST','GET'));
! $sort = get_var('sort',array('POST','GET'));
! $order = get_var('order',array('POST','GET'));
! $filter = get_var('filter',array('POST','GET'));
! $cat_id = get_var('cat_id',array('POST','GET'));
if ($start)
--- 50,60 ----
$this->socommon =
CreateObject($this->currentapp.'.socommon');
! $start =
get_var('start',array('POST','GET'));
! $query =
get_var('query',array('POST','GET'));
! $sort =
get_var('sort',array('POST','GET'));
! $order =
get_var('order',array('POST','GET'));
! $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)
***************
*** 86,89 ****
--- 87,94 ----
$this->cat_id = $cat_id;
}
+ if(isset($district_id))
+ {
+ $this->district_id = $district_id;
+ }
}
***************
*** 101,108 ****
{
$property = $this->so->read_property(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;
return $property;
}
--- 106,122 ----
{
$property = $this->so->read_property(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 $property;
+ }
+
+ function read_equipment()
+ {
+ $equipment = $this->so->read_equipment(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.sobuilding.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sobuilding.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.sobuilding.inc.php 11 Dec 2002 19:40:29 -0000 1.2
--- class.sobuilding.inc.php 2 Jan 2003 22:03:57 -0000 1.3
***************
*** 70,74 ****
}
reset($public_user_list);
! $filtermethod .= " OR (access='public'
AND owner IN(" . implode(',',$public_user_list) . ")))";
}
else
--- 70,74 ----
}
reset($public_user_list);
! $filtermethod .= " OR (access='public'
OR owner IN(" . implode(',',$public_user_list) . ")))";
}
else
Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.socommon.inc.php 12 Dec 2002 18:15:33 -0000 1.2
--- class.socommon.inc.php 2 Jan 2003 22:03:57 -0000 1.3
***************
*** 46,49 ****
--- 46,97 ----
}
+ function select_category_apartment_list()
+ {
+
+ $this->db->query("SELECT formaal_id, navnpaaformaal
FROM boei_formaal where formaal_id >'0' ORDER BY navnpaaformaal ");
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $categories[$i]['id']
= $this->db->f('formaal_id');
+ $categories[$i]['name']
= stripslashes($this->db->f('navnpaaformaal'));
+ $i++;
+ }
+ //_debug_array($categories);
+ return $categories;
+ }
+
+ function select_category_equipment_list()
+ {
+
+ $this->db->query("SELECT id, num FROM fm_equipment_type
ORDER BY num ");
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $categories[$i]['id']
= $this->db->f('id');
+ $categories[$i]['name']
= stripslashes($this->db->f('num'));
+ $i++;
+ }
+ //_debug_array($categories);
+ return $categories;
+ }
+
+ function select_district_list()
+ {
+
+ $this->db->query("SELECT omraade_id, omraade FROM
boei_omraade where omraade_id >'0' ORDER BY omraade_id ");
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $district[$i]['id']
= $this->db->f('omraade_id');
+ $district[$i]['name']
= stripslashes($this->db->f('omraade'));
+ $i++;
+ }
+ //_debug_array($district);
+ return $district;
+ }
+
Index: class.soinvoice.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soinvoice.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.soinvoice.inc.php 24 Dec 2002 23:22:29 -0000 1.2
--- class.soinvoice.inc.php 2 Jan 2003 22:03:57 -0000 1.3
***************
*** 37,40 ****
--- 37,225 ----
}
+
+ function read_invoice($data)
+ {
+ if(is_array($data))
+ {
+ if ($data['start'])
+ {
+ $start=$data['start'];
+ }
+ else
+ {
+ $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);
+ $district_id =
(isset($data['district_id'])?$data['district_id']:0);
+ }
+
+
+ if ($order)
+ {
+ $ordermethod = " order by $order $sort";
+ }
+ else
+ {
+ $ordermethod = ' order by bilagsnr DESC';
+ }
+
+ if ($filter == 'none')
+ {
+ $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 .= ' )';
+ }
+ }
+ elseif ($filter == 'yours')
+ {
+ $filtermethod = " fm_equipment.owner='" .
$this->account . "'";
+ }
+ else
+ {
+ $filtermethod = " fm_equipment.owner='" .
$this->account . "' AND fm_equipment.access='private'";
+ }
+
+ if ($cat_id > 0)
+ {
+ $filtermethod .= " AND fm_equipment.
equipment_type_id='$cat_id' ";
+ }
+
+ if ($district_id > 0)
+ {
+ $filtermethod .= " AND
omraade_id='$district_id' ";
+ }
+ if($query)
+ {
+ $query = ereg_replace("'",'',$query);
+ $query = ereg_replace('"','',$query);
+
+ $querymethod = " AND ( fm_equipment.descr LIKE
'%$query%' OR street LIKE '%$query%' OR fm_equipment.location_code LIKE
'%$query%' OR equipment_id LIKE '%$query%' )";
+ }
+
+
+ /* $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"
+ . " 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 ";
+
+ */
+ $sql = "SELECT DISTINCT bilagsnr, count(bilagsnr) as
invoice_count, sum(belop) as belop FROM t_ecobilag group by bilagsnr";//where
$filtermethod $querymethod ";
+
+ //echo $sql;
+ $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())
+ {
+ $invoice_temp[] = array
+ (
+ 'invoice_id' =>
$this->db->f('bilagsnr'),
+ 'invoice_count' =>
$this->db->f('invoice_count'),
+ 'amount' =>
$this->db->f('belop')
+ );
+ }
+
+
+ if ($invoice_temp)
+ {
+ $j=0;
+ $i = 0;
+ while(each($invoice_temp))
+ {
+
+ $role= $this->check_role();
+
+
$invoice_id=$invoice_temp[$i]['invoice_id'];
+
+ $sql = "SELECT
spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
+ . "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
+ . "
forfallsdato,periode,artid,kidnr,kreditnota "
+ . " from t_ecobilag $this->join
phpgw_addressbook ON phpgw_addressbook.id = t_ecobilag.spvend_code WHERE
bilagsnr = '$invoice_id' "
+ . " group by
bilagsnr,spvend_code,oppsynsmannid,saksbehandlerid,budsjettansvarligid,"
+ . "
utbetalingid,oppsynsigndato,saksigndato,budsjettsigndato,utbetalingsigndato,fakturadato,org_name,"
+ . " forfallsdato,periode,artid,kidnr ";
+
+
$this->db->query($sql,__LINE__,__FILE__);
+
+ $this->db->next_record();
+
+ $timestamp_invoice_date=
mktime(0,0,0,date(m,strtotime($this->db->f('fakturadato'))),date(d,strtotime($this->db->f('fakturadato'))),date(y,strtotime($this->db->f('fakturadato'))));
+ $timestamp_payment_date=
mktime(0,0,0,date(m,strtotime($this->db->f('forfallsdato'))),date(d,strtotime($this->db->f('forfallsdato'))),date(y,strtotime($this->db->f('forfallsdato'))));
+
+ $invoice[$i]['counter']
= $i;
+ $invoice[$i]['current_user']
= strtoupper($GLOBALS['phpgw_info']['user']['account_lid']);
+ $invoice[$i]['invoice_id']
= $invoice_id;
+ $invoice[$i]['invoice_count']
= $invoice_temp[$i]['invoice_count'];
+ $invoice[$i]['vendor_id']
= $this->db->f('spvend_code');
+ $invoice[$i]['vendor']
= $this->db->f('org_name');
+ $invoice[$i]['is_janitor']
= $role['is_janitor'];
+ $invoice[$i]['is_supervisor']
= $role['is_supervisor'];
+ $invoice[$i]['is_budget_responsible']
= $role['is_budget_responsible'];
+ $invoice[$i]['is_janitor']
= $role['is_janitor'];
+ $invoice[$i]['is_transfer']
= $role['is_transfer'];
+ $invoice[$i]['janitor']
= $this->db->f('oppsynsmannid');
+ $invoice[$i]['supervisor']
= $this->db->f('saksbehandlerid');
+ $invoice[$i]['budget_responsible']
= $this->db->f('budsjettansvarligid');
+ $invoice[$i]['transfer_id']
= $this->db->f('utbetalingid');
+ $invoice[$i]['jan_date']
= $this->db->f('oppsynsigndato');
+ $invoice[$i]['super_date']
= $this->db->f('saksigndato');
+ $invoice[$i]['budget_date']
= $this->db->f('budsjettsigndato');
+ $invoice[$i]['transfer_date']
= $this->db->f('utbetalingsigndato');
+ $invoice[$i]['invoice_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_invoice_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $invoice[$i]['payment_date']
=
$GLOBALS['phpgw']->common->show_date($timestamp_payment_date,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $invoice[$i]['period']
= $this->db->f('periode');
+ $invoice[$i]['type']
= $this->db->f('artid');
+ $invoice[$i]['kidnr']
= $this->db->f('kidnr');
+ $invoice[$i]['kreditnota']
= $this->db->f('kreditnota');
+ $invoice[$i]['amount']
= $invoice_temp[$i]['amount'];
+ $invoice[$i]['num_days']
=
intval(($timestamp_payment_date-$timestamp_invoice_date)/(24*3600));
+
+ $i++;
+
+ }
+ }
+ //_debug_array($invoice);
+
+ return $invoice;
+
+ }
+
+ function check_role()
+ {
+
+ $user_id = $GLOBALS['phpgw_info']['user']['account_id'];
+
+ $this->db->query(" SELECT * from fm_admin where
sub_module='invoice' and account_id= '$user_id'");
+ $this->db->next_record();
+ $role=array(
+ 'is_janitor' =>
$this->db->f('janitor'),
+ 'is_supervisor' =>
$this->db->f('supervisor'),
+ 'is_budget_responsible' =>
$this->db->f('budget_responsible'),
+ 'is_transfer' =>
$this->db->f('transfer')
+ );
+
+ return $role;
+
+ }
+
+
function increment_bilagsnr()
{
***************
*** 142,145 ****
--- 327,351 ----
$sql = "SELECT * FROM phpgw_accounts $this->join
fm_admin on phpgw_accounts.account_id=fm_admin.account_id where $role ='1'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ while ($this->db->next_record())
+ {
+ $employees[] = Array(
+ 'account_id' =>
$this->db->f('account_id'),
+ 'account_lid' =>
$this->db->f('account_lid'),
+ 'account_type' =>
$this->db->f('account_type'),
+ 'account_firstname' =>
$this->db->f('account_firstname'),
+ 'account_lastname' =>
$this->db->f('account_lastname'),
+ 'account_status' =>
$this->db->f('account_status'),
+ 'account_expires' =>
$this->db->f('account_expires')
+ );
+ }
+ //_debug_array($employees);
+ return $employees;
+ }
+
+ function get_invoice_user_list()
+ {
+
+ $sql = "SELECT * FROM fm_admin $this->join
phpgw_accounts on phpgw_accounts.account_id=fm_admin.account_id where
sub_module ='invoice' ";
$this->db->query($sql,__LINE__,__FILE__);
while ($this->db->next_record())
Index: class.solookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solookup.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.solookup.inc.php 28 Dec 2002 17:25:45 -0000 1.2
--- class.solookup.inc.php 2 Jan 2003 22:03:57 -0000 1.3
***************
*** 121,124 ****
--- 121,125 ----
function read_property($data)
{
+ //_debug_array($data);
if(is_array($data))
{
***************
*** 136,139 ****
--- 137,141 ----
$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);
}
***************
*** 145,154 ****
else
{
! $ordermethod = ' order by objekt_id DESC';
}
if ($filter == 'none')
{
! $filtermethod = ' ( owner=' . $this->account;
if (is_array($this->grants))
{
--- 147,156 ----
else
{
! $ordermethod = ' order by
boei_leieobjekt.objekt_id DESC';
}
if ($filter == 'none')
{
! $filtermethod = ' ( boei_leieobjekt.owner=' .
$this->account;
if (is_array($this->grants))
{
***************
*** 168,183 ****
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' ";
}
if($query)
{
--- 170,193 ----
elseif ($filter == 'yours')
{
! $filtermethod = " boei_leieobjekt.owner='" .
$this->account . "'";
}
else
{
! $filtermethod = " boei_leieobjekt.owner='" .
$this->account . "' AND boei_leieobjekt.access='private'";
}
if ($cat_id > 0)
{
! $filtermethod .= " AND
boei_leieobjekt.formaal_id='$cat_id' ";
! }
! else
! {
! $filtermethod .= " AND
boei_leieobjekt.formaal_id!='99' ";
}
+ if ($district_id > 0)
+ {
+ $filtermethod .= " AND
omraade_id='$district_id' ";
+ }
if($query)
{
***************
*** 185,193 ****
$query = ereg_replace('"','',$query);
! $querymethod = " AND gatenavn LIKE '%$query%'
OR location_code LIKE '%$query%'";
}
- $sql = "SELECT
objekt_id,bygg_id,seksjons_id,etasje,leie_id,gatenr,gatenavn,tid,owner,access,cat_id,property_type_id,location_code
FROM boei_leieobjekt $this->join boei_gateadresse ON
boei_leieobjekt.gateadresse_id=boei_gateadresse.gateadresse_id ";//WHERE (Not
(boei_leieobjekt.formaal_id)='99') AND $filtermethod $querymethod ";
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
--- 195,212 ----
$query = ereg_replace('"','',$query);
! $querymethod = " AND ( gatenavn LIKE '%$query%'
OR boei_leieobjekt.location_code LIKE '%$query%' OR fornavn LIKE '%$query%' OR
etternavn LIKE '%$query%')";
}
+ $sql = "SELECT
boei_leieobjekt.objekt_id,bygg_id,seksjons_id,etasje,leie_id,gatenr,gatenavn,navnpaaformaal,boei_leieobjekt.leietaker_id,
fornavn, etternavn"
+ . " FROM boei_leieobjekt $this->join"
+ . " boei_objekt ON boei_leieobjekt.objekt_id =
boei_objekt.objekt_id $this->join"
+ . " boei_bydel ON boei_objekt.bydel_id =
boei_bydel.bydel_id $this->join"
+ . " boei_leietaker ON boei_leieobjekt.leietaker_id =
boei_leietaker.leietaker_id $this->join"
+ . " boei_gateadresse ON boei_leieobjekt.gateadresse_id
= boei_gateadresse.gateadresse_id $this->join"
+ . " boei_formaal ON boei_leieobjekt.formaal_id =
boei_formaal.formaal_id "
+ . " WHERE $filtermethod $querymethod ";
+
+ //echo $sql;
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
***************
*** 205,214 ****
'street_name' =>
$this->db->f('gatenavn'),
'street_number' =>
$this->db->f('gatenr'),
);
}
- //_debug_array($property);
-
return $property;
}
--- 224,343 ----
'street_name' =>
$this->db->f('gatenavn'),
'street_number' =>
$this->db->f('gatenr'),
+ 'category' =>
$this->db->f('navnpaaformaal'),
+ 'tenant_id' =>
$this->db->f('leietaker_id'),
+ 'firstname' =>
$this->db->f('fornavn'),
+ 'lastname' =>
$this->db->f('etternavn')
);
}
return $property;
+ }
+
+ function read_equipment($data)
+ {
+ if(is_array($data))
+ {
+ if ($data['start'])
+ {
+ $start=$data['start'];
+ }
+ else
+ {
+ $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);
+ $district_id =
(isset($data['district_id'])?$data['district_id']:0);
+ }
+
+
+ if ($order)
+ {
+ $ordermethod = " order by $order $sort";
+ }
+ else
+ {
+ $ordermethod = ' order by
fm_equipment.objekt_id DESC';
+ }
+
+ if ($filter == 'none')
+ {
+ $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 .= ' )';
+ }
+ }
+ elseif ($filter == 'yours')
+ {
+ $filtermethod = " fm_equipment.owner='" .
$this->account . "'";
+ }
+ else
+ {
+ $filtermethod = " fm_equipment.owner='" .
$this->account . "' AND fm_equipment.access='private'";
+ }
+
+ if ($cat_id > 0)
+ {
+ $filtermethod .= " AND fm_equipment.
equipment_type_id='$cat_id' ";
+ }
+
+ if ($district_id > 0)
+ {
+ $filtermethod .= " AND
omraade_id='$district_id' ";
+ }
+ if($query)
+ {
+ $query = ereg_replace("'",'',$query);
+ $query = ereg_replace('"','',$query);
+
+ $querymethod = " AND ( fm_equipment.descr LIKE
'%$query%' OR street LIKE '%$query%' OR fm_equipment.location_code LIKE
'%$query%' OR equipment_id LIKE '%$query%' )";
+ }
+
+
+ $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"
+ . " 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 ";
+
+ //echo $sql;
+ $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())
+ {
+ $equipment[] = array
+ (
+ 'equipment_id' =>
$this->db->f('equipment_id'),
+ 'property_id' =>
$this->db->f('objekt_id'),
+ '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'),
+ );
+ }
+
+ //_debug_array($equipment);
+
+ return $equipment;
}
Index: class.soproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproperty.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.soproperty.inc.php 11 Dec 2002 19:31:22 -0000 1.1
--- class.soproperty.inc.php 2 Jan 2003 22:03:57 -0000 1.2
***************
*** 70,74 ****
}
reset($public_user_list);
! $filtermethod .= " OR (access='public'
AND owner IN(" . implode(',',$public_user_list) . ")))";
}
else
--- 70,74 ----
}
reset($public_user_list);
! $filtermethod .= " OR (access='public'
OR owner IN(" . implode(',',$public_user_list) . ")))";
}
else
Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uilookup.inc.php 28 Dec 2002 17:25:45 -0000 1.2
--- class.uilookup.inc.php 2 Jan 2003 22:03:57 -0000 1.3
***************
*** 17,20 ****
--- 17,21 ----
var $filter;
var $part_of_town_id;
+ var $district_id;
var $sub;
var $currentapp;
***************
*** 24,29 ****
'addressbook' => True,
'property' => True,
! 'edit' => True,
! 'delete' => True
);
--- 25,29 ----
'addressbook' => True,
'property' => True,
! 'equipment' => True
);
***************
*** 48,51 ****
--- 48,52 ----
$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;
}
***************
*** 54,63 ****
$data = array
(
! 'start' => $this->start,
! 'query' => $this->query,
! 'sort' => $this->sort,
! 'order' => $this->order,
! 'filter' => $this->filter,
! 'cat_id' => $this->cat_id
);
$this->bocommon->save_sessiondata($data);
--- 55,65 ----
$data = 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->bocommon->save_sessiondata($data);
***************
*** 146,150 ****
$data = array
(
- 'hidden_vars' => $hidden_vars,
'allow_all_rows'
=> false,
'start_record'
=> $this->start,
--- 148,151 ----
***************
*** 200,209 ****
'street_name'
=> $property_entry['street_name'],
'street_number'
=> $property_entry['street_number'],
! 'lang_select'
=> lang('Select'),
! 'lang_select_statustext' =>
lang('Select this vendor')
);
}
-
$table_header[] = array
(
--- 201,210 ----
'street_name'
=> $property_entry['street_name'],
'street_number'
=> $property_entry['street_number'],
! 'tenant_id'
=> $property_entry['tenant_id'],
! 'tenant'
=> $property_entry['lastname'].', '.$property_entry['firstname'],
! 'category'
=> $property_entry['category']
);
}
$table_header[] = array
(
***************
*** 213,218 ****
'var' => 'objekt_id',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.property',
!
'cat_id'
=>$this->cat_id)
)),
'lang_property' => lang('Property'),
--- 214,220 ----
'var' => 'objekt_id',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.property',
!
'cat_id'
=>$this->cat_id,
!
'district_id' =>
$this->district_id)
)),
'lang_property' => lang('Property'),
***************
*** 220,224 ****
'lang_entrance' => lang('Entrance'),
'lang_floor' => lang('Floor'),
! 'lang_apartment' =>
lang('Apartment'),
'sort_street_name' =>
$this->nextmatchs->show_sort_order(array
(
--- 222,226 ----
'lang_entrance' => lang('Entrance'),
'lang_floor' => lang('Floor'),
! 'lang_apartment' => lang('Apartment'),
'sort_street_name' =>
$this->nextmatchs->show_sort_order(array
(
***************
*** 226,235 ****
'var' => 'gatenavn',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.property',
!
'cat_id'
=>$this->cat_id)
)),
'lang_street_name' => lang('Street
Name'),
'lang_street_num' => lang('Num'),
! 'lang_select' => lang('Select')
);
--- 228,248 ----
'var' => 'gatenavn',
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.property',
!
'cat_id'
=>$this->cat_id,
!
'district_id' =>
$this->district_id)
)),
'lang_street_name' => lang('Street
Name'),
'lang_street_num' => lang('Num'),
! 'sort_tenant' =>
$this->nextmatchs->show_sort_order(array
!
(
!
'sort' => $this->sort,
!
'var' => 'etternavn',
!
'order' => $this->order,
!
'extra' => array('menuaction' =>
$this->currentapp.'.uilookup.property',
!
'cat_id'
=>$this->cat_id,
!
'district_id' =>
$this->district_id)
!
)),
! 'lang_tenant' => lang('Tenant'),
! 'lang_category' => lang('Category')
);
***************
*** 246,249 ****
--- 259,263 ----
'sort' => $this->sort,
'cat_id' =>
$this->cat_id,
+ 'district_id' => $this->district_id,
'query' => $this->query,
'filter' => $this->filter
***************
*** 260,269 ****
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'appname'
=> lang($this->currentapp),
! 'function_msg'
=> lang('list vendors'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
'select_name'
=> 'cat_id',
! 'cat_list'
=> $this->cats->formatted_xslt_list(array('selected' =>
$this->cat_id,'globals' => True)),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
'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'),
--- 274,288 ----
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'appname'
=> lang($this->currentapp),
! 'function_msg'
=> lang('list property'),
'lang_no_cat'
=> lang('no category'),
'lang_cat_statustext' =>
lang('Select the category the building belongs to. To do not use a category
select NO CATEGORY'),
'select_name'
=> 'cat_id',
! 'cat_list'
=>
$this->bocommon->select_category_apartment_list('filter',$this->cat_id),
! 'district_list'
=> $this->bocommon->select_district_list('filter',$this->district_id),
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
+ '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',
+
'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'),
***************
*** 272,281 ****
'query'
=> $this->query,
'lang_submit'
=> lang('submit'),
! 'table_header_property' =>
$table_header,
! 'values_property' =>
$content,
'table_done'
=> $table_done
);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_property' => $data));
$this->save_sessiondata();
}
--- 291,424 ----
'query'
=> $this->query,
'lang_submit'
=> lang('submit'),
! 'table_header_property' =>
$table_header,
! 'values_property'
=> $content,
'table_done'
=> $table_done
);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_property' => $data));
+ $this->save_sessiondata();
+ }
+
+ function equipment()
+ {
+
+ $GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
+
'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'));
+
+ $sub = get_var('sub',array('POST','GET'));
+
+ $equipment_list = $this->bo->read_equipment();
+
+ while (is_array($equipment_list) &&
list(,$equipment_entry) = each($equipment_list))
+ {
+ $content[] = array
+ (
+ 'equipment_id'
=> $equipment_entry['equipment_id'],
+ 'descr'
=> $equipment_entry['descr'],
+ 'property_id'
=> $equipment_entry['property_id'],
+ 'building_id'
=> $equipment_entry['building_id'],
+ 'entrance_id'
=> $equipment_entry['entrance_id'],
+ 'floor'
=> $equipment_entry['floor'],
+ 'apartment_id'
=> $equipment_entry['apartment_id'],
+ 'street'
=> $equipment_entry['street'],
+ 'category'
=> $equipment_entry['category']
+ );
+ }
+
+ //_debug_array($content);
+ $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.'.uilookup.equipment',
+
'cat_id'
=>$this->cat_id,
+
'district_id' =>
$this->district_id)
+
)),
+ '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.'.uilookup.equipment',
+
'cat_id'
=>$this->cat_id,
+
'district_id' =>
$this->district_id)
+
)),
+ '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.'.uilookup.equipment',
+
'cat_id'
=>$this->cat_id,
+
'district_id' =>
$this->district_id)
+
)),
+ 'lang_street_name' => lang('Street
Name'),
+ 'lang_street_num' => lang('Num'),
+ 'lang_category' => lang('Category')
+ );
+
+ $table_done[] = array
+ (
+ 'lang_done' =>
lang('Done'),
+ 'lang_done_statustext' => lang('Close this
window')
+ );
+
+ $link_select = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uilookup.equipment',
+ 'order' => $this->order,
+ 'sort' => $this->sort,
+ 'cat_id' =>
$this->cat_id,
+ 'district_id' => $this->district_id,
+ 'query' => $this->query,
+ 'filter' => $this->filter
+ );
+
+ $data = array
+ (
+ 'allow_all_rows'
=> false,
+ 'start_record'
=> $this->start,
+ 'record_limit'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
+ 'num_records'
=> count($equipment_list),
+ 'all_records'
=> $this->bo->total_records,
+ 'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
+ 'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
+ 'appname'
=> lang($this->currentapp),
+ 'function_msg'
=> lang('list equipment'),
+ 'lang_no_cat'
=> lang('no category'),
+ 'lang_cat_statustext' =>
lang('Select the category the building 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),
+ 'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_select),
+ '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',
+
+ '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'),
+ 'lang_searchbutton_statustext' => lang('Submit
the search string'),
+ 'query'
=> $this->query,
+ 'lang_submit'
=> lang('submit'),
+ 'table_header_equipment'
=> $table_header,
+ 'values_equipment'
=> $content,
+ 'table_done'
=> $table_done
+ );
+
+
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_equipment' => $data));
$this->save_sessiondata();
}
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uiXport.inc.php 27 Dec 2002 19:03:27 -0000 1.7
--- class.uiXport.inc.php 2 Jan 2003 22:03:57 -0000 1.8
***************
*** 442,448 ****
'lang_sum'
=> lang('Sum'),
'sum'
=> $sum,
! 'table_header'
=> $table_header,
'table_key'
=> $table_key,
! 'values'
=> $values,
'table_add'
=> $table_add
);
--- 442,448 ----
'lang_sum'
=> lang('Sum'),
'sum'
=> $sum,
! 'table_header_debug' =>
$table_header,
'table_key'
=> $table_key,
! 'values_debug'
=> $values,
'table_add'
=> $table_add
);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.1,1.2 class.boinvoice.inc.php,1.2,1.3 class.bolookup.inc.php,1.1,1.2 class.sobuilding.inc.php,1.2,1.3 class.socommon.inc.php,1.2,1.3 class.soinvoice.inc.php,1.2,1.3 class.solookup.inc.php,1.2,1.3 class.soproperty.inc.php,1.1,1.2 class.uilookup.inc.php,1.2,1.3 class.uiXport.inc.php,1.7,1.8,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/inc class.uiinvoice.inc.php,NONE,1.1
- Next by Date:
[Phpgroupware-cvs] CVS: property/templates/default cat_filter.xsl,NONE,1.1 cat_select.xsl,NONE,1.1 filter_district.xsl,NONE,1.1 select_district.xsl,NONE,1.1 user_lid_filter.xsl,NONE,1.1 user_lid_select.xsl,NONE,1.1
- Previous by thread:
[Phpgroupware-cvs] CVS: property/inc class.uiinvoice.inc.php,NONE,1.1
- Next by thread:
[Phpgroupware-cvs] CVS: property/templates/default cat_filter.xsl,NONE,1.1 cat_select.xsl,NONE,1.1 filter_district.xsl,NONE,1.1 select_district.xsl,NONE,1.1 user_lid_filter.xsl,NONE,1.1 user_lid_select.xsl,NONE,1.1
- Index(es):