|
| From: | sigurdne |
| Subject: | [Phpgroupware-cvs] property/inc hook_admin.inc.php, 1.16 class.uiwo_hour.inc.php, 1.15 class.socategory.inc.php, 1.10 class.bowo_hour.inc.php, 1.6 class.sotts.inc.php, 1.10 class.sowo_hour.inc.php, 1.8 class.uitts.inc.php, 1.17 class.botts.inc.php, 1.8 |
| Date: | Fri, 9 Sep 2005 12:52:00 +0200 |
Update of property/inc
Modified Files:
Branch: MAIN
hook_admin.inc.php lines: +2 -1
class.uiwo_hour.inc.php lines: +55 -48
class.socategory.inc.php lines: +4 -1
class.bowo_hour.inc.php lines: +21 -8
class.sotts.inc.php lines: +9 -1
class.sowo_hour.inc.php lines: +29 -8
class.uitts.inc.php lines: +45 -9
class.botts.inc.php lines: +6 -2
Log Message:
no message
====================================================
Index: property/inc/hook_admin.inc.php
diff -u property/inc/hook_admin.inc.php:1.15
property/inc/hook_admin.inc.php:1.16
--- property/inc/hook_admin.inc.php:1.15 Fri May 13 12:17:25 2005
+++ property/inc/hook_admin.inc.php Fri Sep 9 10:52:13 2005
@@ -23,6 +23,7 @@
'Update the not active category for
locations'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uilocation.update_cat'),
// 'Request Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=request'),
'Workorder Categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=wo'),
+ 'Workorder Detail Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=wo_hours'),
'Ticket Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=ticket'),
'Tenant Claim Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=tenant_claim'),
'Tenant Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=tenant'),
====================================================
Index: property/inc/class.uiwo_hour.inc.php
diff -u property/inc/class.uiwo_hour.inc.php:1.14
property/inc/class.uiwo_hour.inc.php:1.15
--- property/inc/class.uiwo_hour.inc.php:1.14 Thu Aug 11 10:46:39 2005
+++ property/inc/class.uiwo_hour.inc.php Fri Sep 9 10:52:13 2005
@@ -326,29 +326,30 @@
$content[] = array
(
- 'post'
=> sprintf("%02s",$workorder['chapter_id']) . '.' .
sprintf("%02s",$hour['building_part']) . '.' .
sprintf("%02s",$hour['grouping_id']) . '.' . sprintf("%03s",$hour['record']),
- 'hour_id'
=> $hour['hour_id'],
+ 'post'
=> sprintf("%02s",$workorder['chapter_id']) . '.' .
sprintf("%02s",$hour['building_part']) . '.' .
sprintf("%02s",$hour['grouping_id']) . '.' . sprintf("%03s",$hour['record']),
+ 'hour_id'
=> $hour['hour_id'],
'activity_num'
=> $hour['activity_num'],
'hours_descr'
=> $hour['hours_descr'],
'activity_descr'
=> $hour['activity_descr'],
'new_grouping'
=> $new_grouping,
'grouping_id'
=> $hour['grouping_id'],
'grouping_descr'
=> $hour['grouping_descr'],
- 'ns3420_id'
=> $hour['ns3420_id'],
- 'code'
=> $code,
- 'remark'
=> $hour['remark'],
+ 'ns3420_id'
=> $hour['ns3420_id'],
+ 'code'
=> $code,
+ 'remark'
=> $hour['remark'],
'building_part'
=> $hour['building_part'],
- 'quantity'
=> $hour['quantity'],
- 'cost'
=> $hour['cost'],
- 'unit'
=> $hour['unit'],
- 'billperae'
=> $hour['billperae'],
- 'deviation'
=> $deviation,
- 'result'
=> ($hour['deviation']+$hour['cost']),
+ 'quantity'
=> $hour['quantity'],
+ 'cost'
=> $hour['cost'],
+ 'unit'
=> $hour['unit'],
+ 'billperae'
=> $hour['billperae'],
+ 'deviation'
=> $deviation,
+ 'result'
=> ($hour['deviation']+$hour['cost']),
+ 'wo_hour_category'
=> $hour['wo_hour_category'],
'link_deviation'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.deviation&workorder_id='
. $workorder_id . '&hour_id=' . $hour['hour_id']),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.edit&workorder_id='
. $workorder_id . '&hour_id=' . $hour['hour_id']),
- 'lang_edit_statustext'
=> lang('edit/customise this hour'),
- 'lang_delete_statustext'
=> lang('delete this hour'),
- 'text_edit'
=> lang('edit'),
+ 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.edit&workorder_id='
. $workorder_id . '&hour_id=' . $hour['hour_id']),
+ 'lang_edit_statustext'
=> lang('edit/customise this hour'),
+ 'lang_delete_statustext'
=> lang('delete this hour'),
+ 'text_edit'
=> lang('edit'),
'text_delete'
=> lang('delete')
);
}
@@ -371,7 +372,8 @@
'lang_result' => lang('result'),
'lang_view' => lang('view'),
'lang_edit' => lang('edit'),
- 'lang_delete' => lang('delete')
+ 'lang_delete' => lang('delete'),
+ 'lang_category' => lang('category')
);
$tax = $this->config->config_data['fm_tax'];
@@ -1090,7 +1092,8 @@
'extra' => array('menuaction' =>
$this->currentapp.'.uiwo_hour.prizebook',
'workorder_id'
=>$workorder_id,
'allrows'
=>$this->allrows)
-
))
+
)),
+ 'lang_category' =>
lang('category'),
);
@@ -1146,40 +1149,42 @@
$data = array
(
- 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_add_statustext' =>
lang('Add the selected items'),
- 'lang_add'
=> lang('Add'),
- 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',$link_data_delete),
-
- 'function'
=> 'prizebook',
- 'links'
=> $links,
- 'allrows'
=> $this->allrows,
- 'allow_allrows'
=> true,
- 'start_record'
=> $this->start,
- 'record_limit'
=> $record_limit,
- 'num_records'
=> count($pricebook_list),
- 'all_records'
=> $this->bopricebook->total_records,
- 'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data_nextmatch),
- 'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
- 'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
-
- '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_search'
=> lang('search'),
- 'workorder_data'
=> $common_data['workorder_data'],
+ 'lang_add' =>
lang('Add'),
+ 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php',$link_data_delete),
+ 'function' =>
'prizebook',
+ 'links' =>
$links,
+ 'allrows' =>
$this->allrows,
+ 'allow_allrows' => true,
+ 'start_record' =>
$this->start,
+ 'record_limit' =>
$record_limit,
+ 'num_records' =>
count($pricebook_list),
+ 'all_records' =>
$this->bopricebook->total_records,
+ 'link_url' =>
$GLOBALS['phpgw']->link('/index.php',$link_data_nextmatch),
+ 'img_path' =>
$GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
+ 'select_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
+
+ '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_search' =>
lang('search'),
+ 'workorder_data' =>
$common_data['workorder_data'],
'table_header_prizebook' =>
$table_header_prizebook,
- 'values_prizebook'
=> $content_prizebook,
+ 'values_prizebook' =>
$content_prizebook,
'total_hours_records' =>
$common_data['total_hours_records'],
'lang_total_records' =>
lang('Total records'),
- 'table_header_hour'
=> $common_data['table_header'],
- 'values_hour'
=> $common_data['content'],
- 'table_sum'
=> $common_data['table_sum'],
- 'table_done'
=> $table_done
+ 'table_header_hour' =>
$common_data['table_header'],
+ 'values_hour' =>
$common_data['content'],
+ '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(),
);
+//_debug_array($data);
- $appname
= lang('pricebook');
+ $appname =
lang('pricebook');
$function_msg =
lang('list pricebook');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
@@ -1581,8 +1586,10 @@
'lang_ns3420'
=> lang('NS3420'),
'value_ns3420_id'
=> $values['ns3420_id'],
'lang_ns3420_statustext' =>
lang('Select a standard-code from the norwegian standard'),
- 'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
-
+ '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']),
);
$appname
= lang('Workorder');
====================================================
Index: property/inc/class.socategory.inc.php
diff -u property/inc/class.socategory.inc.php:1.9
property/inc/class.socategory.inc.php:1.10
--- property/inc/class.socategory.inc.php:1.9 Fri Aug 19 11:56:50 2005
+++ property/inc/class.socategory.inc.php Fri Sep 9 10:52:13 2005
@@ -152,6 +152,9 @@
case 'tenant_claim':
$table='fm_tenant_claim_category';
break;
+ case 'wo_hours':
+ $table='fm_wo_hours_category';
+ break;
}
return $table;
====================================================
Index: property/inc/class.bowo_hour.inc.php
diff -u property/inc/class.bowo_hour.inc.php:1.5
property/inc/class.bowo_hour.inc.php:1.6
--- property/inc/class.bowo_hour.inc.php:1.5 Thu May 12 21:26:28 2005
+++ property/inc/class.bowo_hour.inc.php Fri Sep 9 10:52:13 2005
@@ -37,7 +37,8 @@
function bowo_hour($session=False)
{
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
- $this->so =
CreateObject($this->currentapp.'.sowo_hour');
+ $this->so =
CreateObject($this->currentapp.'.sowo_hour');
+ $this->bocommon =
CreateObject($this->currentapp.'.bocommon');
if ($session)
{
@@ -258,6 +259,17 @@
}
+ 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));
@@ -329,13 +341,14 @@
'activity_id' =>
$values['activity_id'][$n],
'activity_num' =>
$values['activity_num'][$n],
'hours_descr' =>
$values['descr'][$n],
- 'unit' =>
$values['unit'][$n],
- 'cost' =>
$cost,
- 'quantity' =>
$values['quantity'][$n],
- 'billperae' =>
$values['total_cost'][$n],
- 'ns3420_id' =>
$values['ns3420_id'][$n],
- 'dim_d' =>
$values['dim_d'][$n],
+ 'unit' =>
$values['unit'][$n],
+ 'cost' => $cost,
+ 'quantity' =>
$values['quantity'][$n],
+ 'billperae' =>
$values['total_cost'][$n],
+ 'ns3420_id' =>
$values['ns3420_id'][$n],
+ 'dim_d' =>
$values['dim_d'][$n],
'workorder_id' =>
$workorder_id,
+ 'wo_hour_cat' =>
$values['wo_hour_cat'][$n]
);
}
====================================================
====================================================
====================================================
Index: property/inc/class.uitts.inc.php
diff -u property/inc/class.uitts.inc.php:1.16
property/inc/class.uitts.inc.php:1.17
--- property/inc/class.uitts.inc.php:1.16 Fri May 13 12:17:25 2005
+++ property/inc/class.uitts.inc.php Fri Sep 9 10:52:13 2005
@@ -80,7 +80,10 @@
function excel()
{
- $list = $this->bo->read();
+ $start_date =
urldecode(get_var('start_date',array('POST','GET')));
+ $end_date =
urldecode(get_var('end_date',array('POST','GET')));
+
+ $list = $this->bo->read($start_date,$end_date);
if (isset($list) AND is_array($list))
{
@@ -177,6 +180,8 @@
$default_category =
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['default_district'];
$default_status =
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_status'];
+ $start_date =
urldecode(get_var('start_date',array('POST','GET')));
+ $end_date =
urldecode(get_var('end_date',array('POST','GET')));
if ($default_category && !$second_display &&
!$this->district_id)
@@ -205,7 +210,7 @@
$links = $this->menu->links();
- $ticket_list = $this->bo->read();
+ $ticket_list = $this->bo->read($start_date,$end_date);
$uicols=$this->bo->uicols;
@@ -290,7 +295,10 @@
'district_id' =>
$this->district_id,
'query'
=>$this->query,
'second_display'
=> true,
-
'allrows'=>$this->allrows)
+
'allrows'=>$this->allrows,
+
'start_date'
=>$start_date,
+
'end_date'
=>$end_date
+
)
)),
'lang_priority' => lang('Priority'),
@@ -308,7 +316,10 @@
'district_id' =>
$this->district_id,
'query'
=>$this->query,
'second_display'
=> true,
-
'allrows'=>$this->allrows)
+
'allrows'=>$this->allrows,
+
'start_date'
=>$start_date,
+
'end_date'
=>$end_date
+
)
)),
'lang_id' => lang('ID'),
@@ -332,7 +343,10 @@
'district_id' =>
$this->district_id,
'query'
=>$this->query,
'second_display'
=> true,
-
'allrows'=>$this->allrows)
+
'allrows'=>$this->allrows,
+
'start_date'
=>$start_date,
+
'end_date'
=>$end_date
+
)
)),
'lang_assigned_to' =>
lang('Assigned to'),
'sort_opened_by' =>
$this->nextmatchs->show_sort_order(array
@@ -347,7 +361,10 @@
'district_id' =>
$this->district_id,
'query'
=>$this->query,
'second_display'
=> true,
-
'allrows'=>$this->allrows)
+
'allrows'=>$this->allrows,
+
'start_date'
=>$start_date,
+
'end_date'
=>$end_date
+
)
)),
'sort_date' =>
$this->nextmatchs->show_sort_order(array
(
@@ -361,7 +378,10 @@
'district_id' =>
$this->district_id,
'query'
=>$this->query,
'second_display'
=> true,
-
'allrows'=>$this->allrows)
+
'allrows'=>$this->allrows,
+
'start_date'
=>$start_date,
+
'end_date'
=>$end_date
+
)
)),
'sort_finnish_date' =>
$this->nextmatchs->show_sort_order(array
(
@@ -375,7 +395,10 @@
'district_id' =>
$this->district_id,
'query'
=>$this->query,
'second_display'
=> true,
-
'allrows'=>$this->allrows)
+
'allrows'=>$this->allrows,
+
'start_date'
=>$start_date,
+
'end_date'
=>$end_date
+
)
)),
'lang_finnish_date' =>
lang('finnish date'),
'lang_delay' =>
lang('delay'),
@@ -407,6 +430,8 @@
'user_filter'
=>$this->user_filter,
'query' =>$this->query,
'district_id' =>
$this->district_id,
+ 'start_date' =>$start_date,
+ 'end_date' =>$end_date,
'allrows' =>$this->allrows
);
@@ -432,6 +457,8 @@
$msgbox_data = $this->bocommon->msgbox_data($receipt);
+ $link_date_search =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.date_search');
+
$link_excel = array
(
'menuaction' =>
$this->currentapp.'.uitts.excel',
@@ -444,6 +471,8 @@
'query' =>$this->query,
'district_id' =>
$this->district_id,
'allrows'
=>$this->allrows,
+ 'start_date' =>$start_date,
+ 'end_date' =>$end_date,
'start' =>$this->start
);
@@ -452,6 +481,13 @@
'lang_excel' =>
'excel',
'link_excel' =>
$GLOBALS['phpgw']->link('/index.php',$link_excel),
'lang_excel_help' =>
lang('Download table to MS Excel'),
+
+ 'start_date'
=>$start_date,
+ 'end_date'
=>$end_date,
+ 'lang_none'
=>lang('None'),
+ 'lang_date_search' =>
lang('Date search'),
+ 'lang_date_search_help' =>
lang('Narrow the search by dates'),
+ 'link_date_search' =>
$link_date_search,
'overlib_source'
=> './'.$this->currentapp.'/inc/overlib.js',
====================================================
Index: property/inc/class.botts.inc.php
diff -u property/inc/class.botts.inc.php:1.7
property/inc/class.botts.inc.php:1.8
--- property/inc/class.botts.inc.php:1.7 Thu May 12 21:26:28 2005
+++ property/inc/class.botts.inc.php Fri Sep 9 10:52:13 2005
@@ -317,10 +317,14 @@
return $category_list;
}
- function read()
+ function read($start_date='',$end_date='')
{
+ $start_date =
$this->bocommon->date_to_timestamp($start_date);
+ $end_date =
$this->bocommon->date_to_timestamp($end_date);
+
$tickets = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
'filter' => $this->filter,'cat_id' => $this->cat_id,'district_id' =>
$this->district_id,
+
'start_date'=>$start_date,'end_date'=>$end_date,
'allrows'=>$this->allrows,'user_filter' => $this->user_filter));
$this->total_records = $this->so->total_records;
$entity = $this->so->get_origin_entity_type();
| [Prev in Thread] | Current Thread | [Next in Thread] |