[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uiwo_hour.inc.php, 1.43, 1.44 clas
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uiwo_hour.inc.php, 1.43, 1.44 class.solocation.inc.php, 1.37, 1.38 class.soproject.inc.php, 1.50, 1.51 class.uiproject.inc.php, 1.59, 1.60 class.uitts.inc.php, 1.48, 1.49 class.boproject.inc.php, 1.22, 1.23 class.uiworkorder.inc.php, 1.48, 1.49 hook_settings.inc.php, 1.15, 1.16 |
|
Date: |
Fri, 21 Nov 2003 16:26:36 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv28882/inc
Modified Files:
class.uiwo_hour.inc.php class.solocation.inc.php
class.soproject.inc.php class.uiproject.inc.php
class.uitts.inc.php class.boproject.inc.php
class.uiworkorder.inc.php hook_settings.inc.php
Log Message:
no message
Index: hook_settings.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_settings.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** hook_settings.inc.php 10 Oct 2003 21:57:13 -0000 1.15
--- hook_settings.inc.php 21 Nov 2003 16:26:34 -0000 1.16
***************
*** 73,77 ****
create_select_box('Default Degree Request residential
environment','default_environment',$degree);
-
create_input_box('Refresh TTS every (seconds)','refreshinterval','The
intervall for Helpdesk refresh - cheking for new tickets');
--- 73,76 ----
***************
*** 88,94 ****
--- 87,95 ----
$soworkorder= CreateObject($this->currentapp.'.soworkorder');
+ $socommon= CreateObject($this->currentapp.'.socommon');
$status_list= $soworkorder->select_status_list();
$category_list= $soworkorder->select_category_workorder_list();
+ $district_list= $socommon->select_district_list();
if ($status_list)
***************
*** 106,113 ****
--- 107,123 ----
}
}
+ if ($district_list)
+ {
+ while (list($key,$entry) = each($district_list))
+ {
+ $_districts[$entry['id']] = $entry['name'];
+ }
+ }
unset($soworkorder);
+ unset($socommon);
create_select_box('Default project
status','project_status',$_status,'The default status for your projects and
workorders');
create_select_box('Default project
categories','project_category',$_categories,'The default category for your
projects and workorders');
+ create_select_box('Default
district-filter','default_district',$_districts,'Your default district-filter
');
create_input_box('Yout Cellphone','cellphone');
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** class.soproject.inc.php 19 Nov 2003 19:08:32 -0000 1.50
--- class.soproject.inc.php 21 Nov 2003 16:26:33 -0000 1.51
***************
*** 357,360 ****
--- 357,368 ----
+ function get_ticket($project_id = '')
+ {
+ $sql = "SELECT * FROM fm_project_origin WHERE
project_id='$project_id' and origin ='tts'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->db->next_record();
+ return $this->db->f('origin_id');
+ }
+
function get_power_meter($location_code = '')
{
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** class.uitts.inc.php 18 Nov 2003 16:25:16 -0000 1.48
--- class.uitts.inc.php 21 Nov 2003 16:26:33 -0000 1.49
***************
*** 75,78 ****
--- 75,89 ----
'search_field'));
+
+ $second_display =
get_var('second_display',array('POST','GET'));
+
+ $default_category =
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['default_district'];
+
+ if ($default_category && !$second_display &&
!$this->district_id)
+ {
+ $this->bo->district_id = $default_category;
+ $this->district_id =
$default_category;
+ }
+
$links = $this->menu->links();
***************
*** 213,216 ****
--- 224,228 ----
(
'menuaction' =>
$this->currentapp.'.uitts.index',
+ 'second_display' => true,
'sort' =>$this->sort,
'order' =>$this->order,
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** class.uiproject.inc.php 19 Nov 2003 19:08:31 -0000 1.59
--- class.uiproject.inc.php 21 Nov 2003 16:26:33 -0000 1.60
***************
*** 158,162 ****
for ($k=0;$k<$count_uicols_name;$k++)
{
!
if($uicols['input_type'][$k]!='hidden')
{
--- 158,162 ----
for ($k=0;$k<$count_uicols_name;$k++)
{
!
if($uicols['input_type'][$k]=='text')
{
***************
*** 172,175 ****
--- 172,181 ----
$content[$j]['row'][$k]['name'] = $uicols['name'][$k];
}
+ }
+
elseif($uicols['input_type'][$k]=='link')
+ {
+
$content[$j]['row'][$k]['statustext'] = lang('search');
+
$content[$j]['row'][$k]['text'] =
$project_entry[$uicols['name'][$k]];
+
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.view&id='
. $project_entry[$uicols['name'][$k]]);
}
Index: class.boproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boproject.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** class.boproject.inc.php 18 Nov 2003 16:25:16 -0000 1.22
--- class.boproject.inc.php 21 Nov 2003 16:26:34 -0000 1.23
***************
*** 296,305 ****
$this->uicols = $this->so->uicols;
// $cols_extra = $this->so->cols_extra;
for ($i=0; $i<count($project); $i++)
{
- // $project[$i]['coordinator'] =
$GLOBALS['phpgw']->accounts->id2name($project[$i]['coordinator']);
$project[$i]['start_date'] =
$GLOBALS['phpgw']->common->show_date($project[$i]['start_date'],$dateformat);
/*
$location_data=$this->solocation->read_single($project[$i]['location_code']);
--- 296,311 ----
$this->uicols = $this->so->uicols;
+ $this->uicols['input_type'][] = 'link';
+ $this->uicols['name'][] = 'ticket_id';
+ $this->uicols['descr'][] =
lang('ticket');
+ $this->uicols['statustext'][] = false;
+
// $cols_extra = $this->so->cols_extra;
for ($i=0; $i<count($project); $i++)
{
$project[$i]['start_date'] =
$GLOBALS['phpgw']->common->show_date($project[$i]['start_date'],$dateformat);
+ $project[$i]['ticket_id'] =
$this->so->get_ticket($project[$i]['project_id']);
+
/*
$location_data=$this->solocation->read_single($project[$i]['location_code']);
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** class.uiwo_hour.inc.php 19 Nov 2003 19:08:32 -0000 1.43
--- class.uiwo_hour.inc.php 21 Nov 2003 16:26:33 -0000 1.44
***************
*** 261,265 ****
}
! function common_data($workorder_id)
{
--- 261,265 ----
}
! function common_data($workorder_id,$view='')
{
***************
*** 303,307 ****
}
! if($hour['count_deviation'])
{
$deviation=$hour['deviation'];
--- 303,307 ----
}
! if($hour['count_deviation'] || $view)
{
$deviation=$hour['deviation'];
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** class.solocation.inc.php 19 Nov 2003 19:08:32 -0000 1.37
--- class.solocation.inc.php 21 Nov 2003 16:26:33 -0000 1.38
***************
*** 419,423 ****
if ($status_drift_id > 0)
{
! $filtermethod .= " $and
fm_tenant.status_eco=$status_drift_id ) ";
}
else
--- 419,423 ----
if ($status_drift_id > 0)
{
! $filtermethod .= " $and
fm_tenant.status_drift=$status_drift_id ) ";
}
else
***************
*** 827,831 ****
$location_types =
$this->soadmin_location->select_location_type();
! for ($type_id=count($location_types); $type_id>1;
$type_id--)
{
$parent_table = 'fm_location' . ($type_id-1);
--- 827,833 ----
$location_types =
$this->soadmin_location->select_location_type();
! $m= count($location_types);
!
! for ($type_id=$m; $type_id>1; $type_id--)
{
$parent_table = 'fm_location' . ($type_id-1);
***************
*** 847,851 ****
$sql = "SELECT $parent_table.location_code
,count(*) as count_99 FROM $paranthesis fm_location$type_id $joinmethod where
fm_location$type_id.category='99' group by $parent_table.location_code ";
-
$this->db->query($sql,__LINE__,__FILE__);
--- 849,852 ----
***************
*** 874,878 ****
$this->db->next_record();
! if(!$this->db->f('category')=='99')
{
$j++;
--- 875,879 ----
$this->db->next_record();
! if($this->db->f('category')!='99')
{
$j++;
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** class.uiworkorder.inc.php 29 Oct 2003 17:28:42 -0000 1.48
--- class.uiworkorder.inc.php 21 Nov 2003 16:26:34 -0000 1.49
***************
*** 619,622 ****
--- 619,623 ----
}
+ //_debug_array($hour_data);
$table_header_history[] = array
(
***************
*** 713,717 ****
'project_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit'),
'b_account_data'
=> $b_account_data,
- 'vendor_data'
=> $vendor_data,
'table_header_workorder_budget' =>
$table_header_workorder_budget,
'lang_no_workorders' =>
lang('No workorder bugdet'),
--- 714,717 ----
***************
*** 801,805 ****
'cat_list'
=>
$this->bo->select_category_workorder_list('select',$project['cat_id']),
- 'lang_workorder_id'
=> lang('Workorder ID'),
'sum_workorder_budget' =>
$values['sum_workorder_budget'],
'workorder_budget'
=> $values['workorder_budget'],
--- 801,804 ----
***************
*** 837,842 ****
'lang_ask_approval_statustext' =>
lang('Check this to send a mail to your supervisor for approval'),
'value_approval_mail_address' =>
$supervisor_email,
-
-
'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
);
--- 836,839 ----
***************
*** 942,951 ****
$id = get_var('id',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder'));
$values = $this->bo->read_single($id);
$project =
$boproject->read_single($values['project_id']);
-
- //_debug_array($values);
$record_history = $this->bo->read_record_history($id);
--- 939,948 ----
$id = get_var('id',array('POST','GET'));
!
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder','hour_data_view'));
+ $uiwo_hour =
CreateObject($this->currentapp.'.uiwo_hour');
+ $hour_data =
$uiwo_hour->common_data($id,$view=True);
$values = $this->bo->read_single($id);
$project =
$boproject->read_single($values['project_id']);
$record_history = $this->bo->read_record_history($id);
***************
*** 966,975 ****
$function_msg = lang('View Workorder');
- if ($values['cat_id'])
- {
- $this->cat_id = $values['cat_id'];
- }
-
-
$location_data=$bolocation->initiate_ui_location(array(
'values' =>
$project['location_data'],
--- 963,966 ----
***************
*** 981,989 ****
));
- $msgbox_data = $this->bocommon->msgbox_data($receipt);
-
$data = array
(
- 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'project_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.view'),
'table_header_workorder_budget' =>
$table_header_workorder_budget,
--- 972,977 ----
***************
*** 995,998 ****
--- 983,989 ----
'lang_no_history'
=> lang('No history'),
+ 'lang_project_name'
=> lang('Project name'),
+ 'value_project_name' =>
$project['name'],
+
'lang_vendor'
=> lang('Vendor'),
'value_vendor_id'
=> $values['vendor_id'],
***************
*** 1003,1007 ****
'value_b_account_name' =>
$values['b_account_name'],
-
'lang_start_date'
=> lang('Project start date'),
'value_start_date'
=> $values['start_date'],
--- 994,997 ----
***************
*** 1052,1055 ****
--- 1042,1046 ----
'lang_workorder_id'
=> lang('Workorder ID'),
+ 'value_workorder_id' =>
$values['workorder_id'],
'lang_coordinator'
=> lang('Coordinator'),
***************
*** 1076,1080 ****
'lang_edit_statustext' =>
lang('Edit this entry workorder'),
'lang_edit'
=> lang('Edit'),
! 'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
);
--- 1067,1076 ----
'lang_edit_statustext' =>
lang('Edit this entry workorder'),
'lang_edit'
=> lang('Edit'),
! 'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
! 'lang_total_records' =>
lang('Total records'),
! 'total_hours_records' =>
$hour_data['total_hours_records'],
! 'table_header_hour'
=> $hour_data['table_header'],
! 'values_hour'
=> $hour_data['content'],
! 'table_sum'
=> $hour_data['table_sum']
);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uiwo_hour.inc.php, 1.43, 1.44 class.solocation.inc.php, 1.37, 1.38 class.soproject.inc.php, 1.50, 1.51 class.uiproject.inc.php, 1.59, 1.60 class.uitts.inc.php, 1.48, 1.49 class.boproject.inc.php, 1.22, 1.23 class.uiworkorder.inc.php, 1.48, 1.49 hook_settings.inc.php, 1.15, 1.16,
Sigurd Nes <address@hidden> <=