[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uiworkorder.inc.php, 1.12 class.ui
|
From: |
sigurdne |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uiworkorder.inc.php, 1.12 class.uiwo_hour.inc.php, 1.16 class.uiproject.inc.php, 1.19 class.boworkorder.inc.php, 1.6 class.bowo_hour.inc.php, 1.7 class.boproject.inc.php, 1.12 class.socommon.inc.php, 1.9 class.soproject.inc.php, 1.24 class.soworkorder.inc.php, 1.10 class.sowo_hour.inc.php, 1.9 class.bocommon.inc.php, 1.14 |
|
Date: |
Mon, 12 Sep 2005 10:19:00 +0200 |
Update of property/inc
Modified Files:
Branch: MAIN
class.uiworkorder.inc.php lines: +32 -15
class.uiwo_hour.inc.php lines: +4 -4
class.uiproject.inc.php lines: +26 -10
class.boworkorder.inc.php lines: +9 -2
class.bowo_hour.inc.php lines: +1 -13
class.boproject.inc.php lines: +8 -2
class.socommon.inc.php lines: +15 -1
class.soproject.inc.php lines: +38 -13
class.soworkorder.inc.php lines: +35 -14
class.sowo_hour.inc.php lines: +1 -16
class.bocommon.inc.php lines: +14 -1
Log Message:
no message
====================================================
Index: property/inc/class.uiworkorder.inc.php
diff -u property/inc/class.uiworkorder.inc.php:1.11
property/inc/class.uiworkorder.inc.php:1.12
--- property/inc/class.uiworkorder.inc.php:1.11 Wed Aug 10 19:39:42 2005
+++ property/inc/class.uiworkorder.inc.php Mon Sep 12 08:19:02 2005
@@ -64,6 +64,7 @@
$this->cat_id =
$this->bo->cat_id;
$this->status_id =
$this->bo->status_id;
$this->search_vendor =
$this->bo->search_vendor;
+ $this->wo_hour_cat_id =
$this->bo->wo_hour_cat_id;
$this->menu->sub ='project';
}
@@ -77,7 +78,8 @@
'sort' => $this->sort,
'order' => $this->order,
'filter' =>
$this->filter,
- 'cat_id' => $this->cat_id
+ 'cat_id' =>
$this->cat_id,
+ 'wo_hour_cat_id' =>
$this->wo_hour_cat_id
);
$this->bo->save_sessiondata($data);
}
@@ -149,7 +151,8 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder','values','table_header',
'menu',
-
'nextmatchs'));
+
'nextmatchs',
+
'wo_hour_cat_filter'));
$links = $this->menu->links('workorder');
@@ -263,7 +266,9 @@
'search_vendor'
=>$this->search_vendor,
'cat_id'
=>$this->cat_id,
'start_date'=>$start_date,
-
'end_date'=>$end_date)
+
'end_date'=>$end_date,
+
'wo_hour_cat_id'
=>$this->wo_hour_cat_id
+
)
));
}
if($uicols['name'][$i]=='project_id')
@@ -282,7 +287,9 @@
'search_vendor'
=>$this->search_vendor,
'cat_id'
=>$this->cat_id,
'start_date'=>$start_date,
-
'end_date'=>$end_date)
+
'end_date'=>$end_date,
+
'wo_hour_cat_id'
=>$this->wo_hour_cat_id
+
)
));
}
if($uicols['name'][$i]=='workorder_id')
{
@@ -300,7 +307,9 @@
'search_vendor'
=>$this->search_vendor,
'cat_id'
=>$this->cat_id,
'start_date'=>$start_date,
-
'end_date'=>$end_date)
+
'end_date'=>$end_date,
+
'wo_hour_cat_id'
=>$this->wo_hour_cat_id
+
)
));
}
if($uicols['name'][$i]=='address')
@@ -319,7 +328,9 @@
'search_vendor'
=>$this->search_vendor,
'cat_id'
=>$this->cat_id,
'start_date'=>$start_date,
-
'end_date'=>$end_date)
+
'end_date'=>$end_date,
+
'wo_hour_cat_id'
=>$this->wo_hour_cat_id
+
)
));
}
@@ -379,13 +390,14 @@
'sort'
=>$this->sort,
'order'
=>$this->order,
'cat_id'
=>$this->cat_id,
- 'district_id'
=>$this->district_id,
+ 'district_id'
=>$this->district_id,
'status_id'
=>$this->status_id,
'filter'
=>$this->filter,
'query'
=>$this->query,
- 'search_vendor'
=>$this->search_vendor,
- 'start_date' =>$start_date,
- 'end_date'
=>$end_date
+ 'search_vendor'
=>$this->search_vendor,
+ 'start_date'
=>$start_date,
+ 'end_date'
=>$end_date,
+ 'wo_hour_cat_id'
=>$this->wo_hour_cat_id
);
$link_date_search
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.date_search');
@@ -396,14 +408,15 @@
'sort'
=>$this->sort,
'order'
=>$this->order,
'cat_id'
=>$this->cat_id,
- 'district_id'
=>$this->district_id,
+ 'district_id'
=>$this->district_id,
'status_id'
=>$this->status_id,
'filter'
=>$this->filter,
'query'
=>$this->query,
- 'search_vendor'
=>$this->search_vendor,
- 'start_date' =>$start_date,
+ 'search_vendor'
=>$this->search_vendor,
+ 'start_date'
=>$start_date,
'end_date'
=>$end_date,
- 'start' =>$this->start
+ 'start'
=>$this->start,
+ 'wo_hour_cat_id'
=>$this->wo_hour_cat_id,
);
$data = array
@@ -440,6 +453,10 @@
'status_name'
=> 'status_id',
'lang_no_status'
=> lang('No status'),
'status_list'
=> $this->bo->select_status_list('filter',$this->status_id),
+
+ 'lang_wo_hour_cat_statustext' =>
lang('Select the workorder hour category'),
+ 'lang_no_wo_hour_cat' =>
lang('no hour category'),
+ 'wo_hour_cat_list'
=> $this->bocommon->select_wo_hours_category_list($this->wo_hour_cat_id),
'lang_user_statustext' =>
lang('Select the user the workorder belongs to. To do not use a category select
NO USER'),
'select_user_name'
=> 'filter',
====================================================
Index: property/inc/class.uiwo_hour.inc.php
diff -u property/inc/class.uiwo_hour.inc.php:1.15
property/inc/class.uiwo_hour.inc.php:1.16
--- property/inc/class.uiwo_hour.inc.php:1.15 Fri Sep 9 10:52:13 2005
+++ property/inc/class.uiwo_hour.inc.php Mon Sep 12 08:19:02 2005
@@ -759,7 +759,7 @@
$this->create_html->add_file(array(PHPGW_SERVER_ROOT . SEP . $this->currentapp
. SEP . 'templates' . SEP . 'default' . SEP . 'location_view'));
$this->create_html->set_var('phpgw',array('email_data' => $email_data));
-
+
$this->create_html->xsl_parse();
$this->create_html->xml_parse();
$xsltproc = xslt_create();
@@ -1180,7 +1180,7 @@
'table_sum' =>
$common_data['table_sum'],
'table_done' =>
$table_done,
'lang_no_wo_hour_cat' =>
lang('no category'),
- 'wo_hour_cat_list' =>
$this->bo->select_wo_hours_category_list(),
+ 'wo_hour_cat_list' =>
$this->bocommon->select_wo_hours_category_list(),
);
//_debug_array($data);
@@ -1589,7 +1589,7 @@
'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
'lang_wo_hour_category' =>
lang('category'),
'lang_select_wo_hour_category' =>
lang('no category'),
- 'wo_hour_cat_list' =>
$this->bo->select_wo_hours_category_list($values['wo_hour_cat']),
+ 'wo_hour_cat_list' =>
$this->bocommon->select_wo_hours_category_list($values['wo_hour_cat']),
);
$appname
= lang('Workorder');
====================================================
Index: property/inc/class.uiproject.inc.php
diff -u property/inc/class.uiproject.inc.php:1.18
property/inc/class.uiproject.inc.php:1.19
--- property/inc/class.uiproject.inc.php:1.18 Wed Aug 10 19:39:43 2005
+++ property/inc/class.uiproject.inc.php Mon Sep 12 08:19:02 2005
@@ -64,6 +64,8 @@
$this->filter =
$this->bo->filter;
$this->cat_id =
$this->bo->cat_id;
$this->status_id =
$this->bo->status_id;
+ $this->wo_hour_cat_id =
$this->bo->wo_hour_cat_id;
+
$this->menu->sub ='project';
}
@@ -78,7 +80,8 @@
'order' => $this->order,
'filter' => $this->filter,
'cat_id' => $this->cat_id,
- 'status_id' => $this->status_id
+ 'status_id' => $this->status_id,
+ 'wo_hour_cat_id'=> $this->wo_hour_cat_id
);
$this->bo->save_sessiondata($data);
}
@@ -149,7 +152,8 @@
$GLOBALS['phpgw']->xslttpl->add_file(array('project','values','table_header',
'menu',
'nextmatchs',
-
'search_field'));
+
'search_field',
+
'wo_hour_cat_filter'));
$lookup =
get_var('lookup',array('POST','GET'));
$from =
get_var('from',array('POST','GET'));
@@ -276,7 +280,9 @@
'district_id' =>
$this->district_id,
'cat_id'
=>$this->cat_id,
'start_date'=>$start_date,
-
'end_date'=>$end_date)
+
'end_date'=>$end_date,
+
'wo_hour_cat_id'
=>$this->wo_hour_cat_id
+
)
));
}
if($uicols['name'][$i]=='project_id')
@@ -295,7 +301,9 @@
'district_id' =>
$this->district_id,
'cat_id'
=>$this->cat_id,
'start_date'=>$start_date,
-
'end_date'=>$end_date)
+
'end_date'=>$end_date,
+
'wo_hour_cat_id'
=>$this->wo_hour_cat_id
+
)
));
}
if($uicols['name'][$i]=='address')
@@ -314,7 +322,9 @@
'district_id' =>
$this->district_id,
'cat_id'
=>$this->cat_id,
'start_date'=>$start_date,
-
'end_date'=>$end_date)
+
'end_date'=>$end_date,
+
'wo_hour_cat_id'
=>$this->wo_hour_cat_id
+
)
));
}
}
@@ -375,7 +385,8 @@
'from' =>$from,
'query'
=>$this->query,
'start_date' =>$start_date,
- 'end_date'
=>$end_date
+ 'end_date'
=>$end_date,
+ 'wo_hour_cat_id'
=>$this->wo_hour_cat_id,
);
$link_date_search
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.date_search');
@@ -386,15 +397,16 @@
'sort'
=>$this->sort,
'order'
=>$this->order,
'cat_id'
=>$this->cat_id,
- 'district_id'
=>$this->district_id,
+ 'district_id'
=>$this->district_id,
'filter'
=>$this->filter,
'status_id'
=>$this->status_id,
'lookup'
=>$lookup,
'from' =>$from,
'query'
=>$this->query,
- 'start_date' =>$start_date,
+ 'start_date'
=>$start_date,
'end_date'
=>$end_date,
- 'start' =>$this->start
+ 'start'
=>$this->start,
+ 'wo_hour_cat_id'
=>$this->wo_hour_cat_id,
);
$data = array
@@ -436,6 +448,10 @@
'status_name'
=> 'status_id',
'lang_no_status'
=> lang('No status'),
'status_list'
=> $this->bo->select_status_list('filter',$this->status_id),
+
+ 'lang_wo_hour_cat_statustext' =>
lang('Select the workorder hour category'),
+ 'lang_no_wo_hour_cat' =>
lang('no hour category'),
+ 'wo_hour_cat_list'
=> $this->bocommon->select_wo_hours_category_list($this->wo_hour_cat_id),
'lang_user_statustext' =>
lang('Select the user the project belongs to. To do not use a category select
NO USER'),
'select_user_name'
=> 'filter',
====================================================
Index: property/inc/class.boworkorder.inc.php
diff -u property/inc/class.boworkorder.inc.php:1.5
property/inc/class.boworkorder.inc.php:1.6
--- property/inc/class.boworkorder.inc.php:1.5 Thu May 12 21:26:28 2005
+++ property/inc/class.boworkorder.inc.php Mon Sep 12 08:19:02 2005
@@ -54,6 +54,7 @@
$cat_id = get_var('cat_id',array('POST','GET'));
$status_id =
get_var('status_id',array('POST','GET'));
$search_vendor =
get_var('search_vendor',array('POST','GET'));
+ $wo_hour_cat_id =
get_var('wo_hour_cat_id',array('POST','GET'));
if ($start)
{
@@ -92,6 +93,10 @@
{
$this->search_vendor = $search_vendor;
}
+ if(isset($wo_hour_cat_id))
+ {
+ $this->wo_hour_cat_id = $wo_hour_cat_id;
+ }
}
function read_sessiondata()
@@ -105,6 +110,7 @@
$this->order = $data['order'];
$this->cat_id = $data['cat_id'];
$this->order = $data['order'];
+ $this->wo_hour_cat_id = $data['wo_hour_cat_id'];
}
function save_sessiondata($data)
@@ -307,7 +313,8 @@
$end_date =
$this->bocommon->date_to_timestamp($end_date);
$workorder = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
-
'filter' => $this->filter,'cat_id' => $this->cat_id,'status_id' =>
$this->status_id,'search_vendor' => $this->search_vendor,
+
'filter' => $this->filter,'cat_id' => $this->cat_id,'status_id' =>
$this->status_id,
+
'search_vendor' => $this->search_vendor,'wo_hour_cat_id' =>
$this->wo_hour_cat_id,
'start_date'=>$start_date,'end_date'=>$end_date,'allrows'=>$allrows));
$this->total_records = $this->so->total_records;
====================================================
Index: property/inc/class.bowo_hour.inc.php
diff -u property/inc/class.bowo_hour.inc.php:1.6
property/inc/class.bowo_hour.inc.php:1.7
--- property/inc/class.bowo_hour.inc.php:1.6 Fri Sep 9 10:52:13 2005
+++ property/inc/class.bowo_hour.inc.php Mon Sep 12 08:19:02 2005
@@ -258,18 +258,6 @@
return $building_part_list;
}
-
- function select_wo_hours_category_list($selected='')
- {
- $category_list=
$this->so->select_wo_hours_category_list();
- if($selected)
- {
- $category_list =
$this->bocommon->select_list($selected,$category_list);
- }
-
- return $category_list;
- }
-
function read($workorder_id='')
{
$hour = $this->so->read(array('workorder_id' =>
$workorder_id));
====================================================
Index: property/inc/class.boproject.inc.php
diff -u property/inc/class.boproject.inc.php:1.11
property/inc/class.boproject.inc.php:1.12
--- property/inc/class.boproject.inc.php:1.11 Thu May 12 21:26:28 2005
+++ property/inc/class.boproject.inc.php Mon Sep 12 08:19:02 2005
@@ -54,6 +54,7 @@
$filter = get_var('filter',array('POST','GET'));
$cat_id = get_var('cat_id',array('POST','GET'));
$status_id =
get_var('status_id',array('POST','GET'));
+ $wo_hour_cat_id =
get_var('wo_hour_cat_id',array('POST','GET'));
if ($start)
{
@@ -88,6 +89,10 @@
{
$this->status_id = $status_id;
}
+ if(isset($wo_hour_cat_id))
+ {
+ $this->wo_hour_cat_id = $wo_hour_cat_id;
+ }
}
function save_sessiondata($data)
@@ -109,6 +114,7 @@
$this->order = $data['order'];
$this->cat_id = $data['cat_id'];
$this->status_id = $data['status_id'];
+ $this->wo_hour_cat_id = $data['wo_hour_cat_id'];
}
function select_status_list($format='',$selected='')
@@ -298,7 +304,7 @@
$end_date =
$this->bocommon->date_to_timestamp($end_date);
$project = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
-
'filter' => $this->filter,'cat_id' => $this->cat_id,'status_id' =>
$this->status_id,
+
'filter' => $this->filter,'cat_id' => $this->cat_id,'status_id' =>
$this->status_id,'wo_hour_cat_id' => $this->wo_hour_cat_id,
'start_date'=>$start_date,'end_date'=>$end_date,'allrows'=>$allrows));
$this->total_records = $this->so->total_records;
====================================================
Index: property/inc/class.socommon.inc.php
diff -u property/inc/class.socommon.inc.php:1.8
property/inc/class.socommon.inc.php:1.9
--- property/inc/class.socommon.inc.php:1.8 Thu May 12 21:26:28 2005
+++ property/inc/class.socommon.inc.php Mon Sep 12 08:19:02 2005
@@ -254,5 +254,19 @@
$this->db->query("update fm_idgenerator set value =
$next_id WHERE name = 'workorder'");
return $next_id;
}
+
+ function select_wo_hours_category_list()
+ {
+ $this->db->query("SELECT id, descr FROM
fm_wo_hours_category ORDER BY id ");
+
+ $i = 0;
+ while ($this->db->next_record())
+ {
+ $category_list[$i]['id'] = $this->db->f('id');
+ $category_list[$i]['name'] =
stripslashes($this->db->f('descr'));
+ $i++;
+ }
+ return $category_list;
+ }
}
?>
====================================================
Index: property/inc/class.soproject.inc.php
diff -u property/inc/class.soproject.inc.php:1.23
property/inc/class.soproject.inc.php:1.24
--- property/inc/class.soproject.inc.php:1.23 Fri Aug 19 11:56:50 2005
+++ property/inc/class.soproject.inc.php Mon Sep 12 08:19:02 2005
@@ -28,6 +28,7 @@
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
$this->join = $this->bocommon->join;
+ $this->left_join = $this->bocommon->left_join;
$this->like = $this->bocommon->like;
$this->grants =
$GLOBALS['phpgw']->session->appsession('grants_project',$this->currentapp);
@@ -126,9 +127,10 @@
$start_date =
(isset($data['start_date'])?$data['start_date']:'');
$end_date =
(isset($data['end_date'])?$data['end_date']:'');
$allrows =
(isset($data['allrows'])?$data['allrows']:'');
+ $wo_hour_cat_id =
(isset($data['wo_hour_cat_id'])?$data['wo_hour_cat_id']:'');
}
- $sql = $this->bocommon->fm_cache('sql_project');
+ $sql = $this->bocommon->fm_cache('sql_project_' .
!!$wo_hour_cat_id);
if(!$sql)
{
@@ -170,28 +172,44 @@
$joinmethod .= " $this->join phpgw_accounts ON
($entity_table.coordinator = phpgw_accounts.account_id))";
$paranthesis .='(';
+ //----- wo_hour_status
+
+ if($wo_hour_cat_id)
+ {
+ $joinmethod .= " $this->join
fm_workorder ON ($entity_table.id = fm_workorder.project_id))";
+ $paranthesis .='(';
+
+ $joinmethod .= " $this->join
fm_wo_hours ON (fm_workorder.id = fm_wo_hours.workorder_id))";
+ $paranthesis .='(';
+
+ $joinmethod .= " $this->join
fm_wo_hours_category ON (fm_wo_hours.category = fm_wo_hours_category.id))";
+ $paranthesis .='(';
+ }
+
+ //----- wo_hour_status
+
$sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols'=>$cols,'cols_return'=>$cols_return,
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'query'=>$query));
- $this->bocommon->fm_cache('sql_project',$sql);
+ $this->bocommon->fm_cache('sql_project_' .
!!$wo_hour_cat_id,$sql);
$this->uicols =
$this->bocommon->uicols;
$cols_return =
$this->bocommon->cols_return;
- $type_id =
$this->bocommon->type_id;
+ $type_id =
$this->bocommon->type_id;
$this->cols_extra =
$this->bocommon->cols_extra;
-
$this->bocommon->fm_cache('uicols_project',$this->uicols);
-
$this->bocommon->fm_cache('cols_return_project',$cols_return);
-
$this->bocommon->fm_cache('type_id_project',$type_id);
-
$this->bocommon->fm_cache('cols_extra_project',$this->cols_extra);
+ $this->bocommon->fm_cache('uicols_project_' .
!!$wo_hour_cat_id,$this->uicols);
+
$this->bocommon->fm_cache('cols_return_project_' .
!!$wo_hour_cat_id,$cols_return);
+ $this->bocommon->fm_cache('type_id_project_' .
!!$wo_hour_cat_id,$type_id);
+ $this->bocommon->fm_cache('cols_extra_project_'
. !!$wo_hour_cat_id,$this->cols_extra);
}
else
{
- $this->uicols =
$this->bocommon->fm_cache('uicols_project');
- $cols_return =
$this->bocommon->fm_cache('cols_return_project');
- $type_id =
$this->bocommon->fm_cache('type_id_project');
- $this->cols_extra =
$this->bocommon->fm_cache('cols_extra_project');
+ $this->uicols =
$this->bocommon->fm_cache('uicols_project_' . !!$wo_hour_cat_id);
+ $cols_return =
$this->bocommon->fm_cache('cols_return_project_' . !!$wo_hour_cat_id);
+ $type_id =
$this->bocommon->fm_cache('type_id_project_' . !!$wo_hour_cat_id);
+ $this->cols_extra =
$this->bocommon->fm_cache('cols_extra_project_' . !!$wo_hour_cat_id);
}
if ($order)
@@ -217,6 +235,13 @@
$where= 'AND';
}
+ if($wo_hour_cat_id)
+ {
+ $filtermethod .= " $where
fm_wo_hours_category.id=$wo_hour_cat_id ";
+ $where= 'AND';
+ $group_method = " group by
fm_project.location_code,fm_project.id
,fm_project.start_date,fm_project.name,account_lid
,fm_project.user_id,fm_project.address";
+ }
+
if ($filter=='all')
{
if (is_array($this->grants))
@@ -261,7 +286,7 @@
}
}
- $sql .= " $filtermethod $querymethod";
+ $sql .= " $filtermethod $querymethod $group_method";
//echo $sql;
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
====================================================
Index: property/inc/class.soworkorder.inc.php
diff -u property/inc/class.soworkorder.inc.php:1.9
property/inc/class.soworkorder.inc.php:1.10
--- property/inc/class.soworkorder.inc.php:1.9 Fri Jun 10 09:47:52 2005
+++ property/inc/class.soworkorder.inc.php Mon Sep 12 08:19:02 2005
@@ -142,10 +142,11 @@
$start_date =
(isset($data['start_date'])?$data['start_date']:'');
$end_date =
(isset($data['end_date'])?$data['end_date']:'');
$allrows =
(isset($data['allrows'])?$data['allrows']:'');
+ $wo_hour_cat_id =
(isset($data['wo_hour_cat_id'])?$data['wo_hour_cat_id']:'');
}
//_debug_array($data);
- $sql =
$this->bocommon->fm_cache('sql_workorder'.!!$search_vendor);
+ $sql =
$this->bocommon->fm_cache('sql_workorder'.!!$search_vendor . '_' .
!!$wo_hour_cat_id);
if(!$sql)
{
@@ -196,7 +197,7 @@
$uicols['descr'][] =
lang('User');
$uicols['statustext'][] =
lang('Workorder User');
- $cols .= ',vendor_id';
+ $cols .= ',fm_workorder.vendor_id';
$cols_return[] = 'vendor_id';
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'vendor_id';
@@ -207,7 +208,7 @@
$joinmethod .= " $this->join fm_workorder ON
($entity_table.id = fm_workorder.project_id) $this->join phpgw_accounts ON
(fm_workorder.user_id = phpgw_accounts.account_id))";
$paranthesis .='(';
-// if($search_vendor)
+ if($search_vendor)
{
$cols .= ',fm_vendor.org_name';
$cols_return[] = 'org_name';
@@ -219,29 +220,42 @@
$paranthesis .='(';
}
+ //----- wo_hour_status
+
+ if($wo_hour_cat_id)
+ {
+ $joinmethod .= " $this->join
fm_wo_hours ON (fm_workorder.id = fm_wo_hours.workorder_id))";
+ $paranthesis .='(';
+
+ $joinmethod .= " $this->join
fm_wo_hours_category ON (fm_wo_hours.category = fm_wo_hours_category.id))";
+ $paranthesis .='(';
+ }
+
+ //----- wo_hour_status
+
$sql =
$this->bocommon->generate_sql(array('entity_table'=>$entity_table,'cols'=>$cols,'cols_return'=>$cols_return,
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'query'=>$query));
-
$this->bocommon->fm_cache('sql_workorder'.!!$search_vendor,$sql);
+
$this->bocommon->fm_cache('sql_workorder'.!!$search_vendor . '_' .
!!$wo_hour_cat_id,$sql);
$this->uicols =
$this->bocommon->uicols;
$cols_return =
$this->bocommon->cols_return;
$type_id =
$this->bocommon->type_id;
// $this->cols_extra =
$this->bocommon->cols_extra;
-
$this->bocommon->fm_cache('uicols_workorder'.!!$search_vendor,$this->uicols);
-
$this->bocommon->fm_cache('cols_return_workorder'.!!$search_vendor,$cols_return);
-
$this->bocommon->fm_cache('type_id_workorder'.!!$search_vendor,$type_id);
-//
$this->bocommon->fm_cache('cols_extra_workorder'.!!$search_vendor,$this->cols_extra);
+
$this->bocommon->fm_cache('uicols_workorder'.!!$search_vendor . '_' .
!!$wo_hour_cat_id,$this->uicols);
+
$this->bocommon->fm_cache('cols_return_workorder'.!!$search_vendor . '_' .
!!$wo_hour_cat_id,$cols_return);
+
$this->bocommon->fm_cache('type_id_workorder'.!!$search_vendor . '_' .
!!$wo_hour_cat_id,$type_id);
+//
$this->bocommon->fm_cache('cols_extra_workorder'.!!$search_vendor . '_' .
!!$wo_hour_cat_id,$this->cols_extra);
}
else
{
- $this->uicols =
$this->bocommon->fm_cache('uicols_workorder'.!!$search_vendor);
- $cols_return =
$this->bocommon->fm_cache('cols_return_workorder'.!!$search_vendor);
- $type_id =
$this->bocommon->fm_cache('type_id_workorder'.!!$search_vendor);
-// $this->cols_extra =
$this->bocommon->fm_cache('cols_extra_workorder'.!!$search_vendor);
+ $this->uicols =
$this->bocommon->fm_cache('uicols_workorder'.!!$search_vendor . '_' .
!!$wo_hour_cat_id);
+ $cols_return =
$this->bocommon->fm_cache('cols_return_workorder'.!!$search_vendor . '_' .
!!$wo_hour_cat_id);
+ $type_id =
$this->bocommon->fm_cache('type_id_workorder'.!!$search_vendor . '_' .
!!$wo_hour_cat_id);
+// $this->cols_extra =
$this->bocommon->fm_cache('cols_extra_workorder'.!!$search_vendor . '_' .
!!$wo_hour_cat_id);
}
if ($order)
@@ -267,6 +281,13 @@
$where= 'AND';
}
+ if($wo_hour_cat_id)
+ {
+ $filtermethod .= " $where
fm_wo_hours_category.id=$wo_hour_cat_id ";
+ $where= 'AND';
+ $group_method = " group by
fm_project.id,fm_project.location_code,fm_workorder.id,workorder_id,title,fm_workorder.status,fm_workorder.entry_date,user_lid,fm_workorder.vendor_id,project_owner,fm_project.address";
+ }
+
if ($filter=='all')
{
if (is_array($this->grants))
@@ -324,7 +345,7 @@
}
}
- $sql .= " $filtermethod $querymethod
$querymethod_vendor";
+ $sql .= " $filtermethod $querymethod
$querymethod_vendor $group_method";
//echo $sql;
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
====================================================
Index: property/inc/class.sowo_hour.inc.php
diff -u property/inc/class.sowo_hour.inc.php:1.8
property/inc/class.sowo_hour.inc.php:1.9
--- property/inc/class.sowo_hour.inc.php:1.8 Fri Sep 9 10:52:13 2005
+++ property/inc/class.sowo_hour.inc.php Mon Sep 12 08:19:02 2005
@@ -89,21 +89,6 @@
return $branch_entries;
}
- function select_wo_hours_category_list()
- {
- $this->db->query("SELECT id, descr FROM
fm_wo_hours_category ORDER BY id ");
-
- $i = 0;
- while ($this->db->next_record())
- {
- $category_list[$i]['id'] = $this->db->f('id');
- $category_list[$i]['name'] =
stripslashes($this->db->f('descr'));
- $i++;
- }
- return $category_list;
- }
-
-
function read($data)
{
if(is_array($data))
====================================================
Index: property/inc/class.bocommon.inc.php
diff -u property/inc/class.bocommon.inc.php:1.13
property/inc/class.bocommon.inc.php:1.14
--- property/inc/class.bocommon.inc.php:1.13 Wed Aug 10 19:39:43 2005
+++ property/inc/class.bocommon.inc.php Mon Sep 12 08:19:02 2005
@@ -1362,5 +1362,18 @@
return $link;
}
+
+ function select_wo_hours_category_list($selected='')
+ {
+ $category_list=
$this->socommon->select_wo_hours_category_list();
+ if($selected)
+ {
+ $category_list =
$this->select_list($selected,$category_list);
+ }
+
+ return $category_list;
+ }
+
+
}
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uiworkorder.inc.php, 1.12 class.uiwo_hour.inc.php, 1.16 class.uiproject.inc.php, 1.19 class.boworkorder.inc.php, 1.6 class.bowo_hour.inc.php, 1.7 class.boproject.inc.php, 1.12 class.socommon.inc.php, 1.9 class.soproject.inc.php, 1.24 class.soworkorder.inc.php, 1.10 class.sowo_hour.inc.php, 1.9 class.bocommon.inc.php, 1.14,
sigurdne <=
- Prev by Date:
[Phpgroupware-cvs] property/templates/default project.xsl, 1.9 workorder.xsl, 1.4 wo_hour_cat_filter.xsl, 1.1
- Next by Date:
[Phpgroupware-cvs] property/templates/base wo_hour_cat_filter.xsl, 1.1 project.xsl, 1.4 workorder.xsl, 1.2
- Previous by thread:
[Phpgroupware-cvs] property/templates/default project.xsl, 1.9 workorder.xsl, 1.4 wo_hour_cat_filter.xsl, 1.1
- Next by thread:
[Phpgroupware-cvs] property/templates/base wo_hour_cat_filter.xsl, 1.1 project.xsl, 1.4 workorder.xsl, 1.2
- Index(es):