[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6725] property: custom fields at order/order
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6725] property: custom fields at order/order |
|
Date: |
Mon, 03 Jan 2011 19:38:48 +0000 |
Revision: 6725
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6725
Author: sigurdne
Date: 2011-01-03 19:38:47 +0000 (Mon, 03 Jan 2011)
Log Message:
-----------
property: custom fields at order/order
Modified Paths:
--------------
trunk/property/inc/class.bocommon.inc.php
trunk/property/inc/class.boproject.inc.php
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.soproject.inc.php
trunk/property/inc/class.soworkorder.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uiworkorder.inc.php
Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php 2011-01-03 13:31:26 UTC (rev
6724)
+++ trunk/property/inc/class.bocommon.inc.php 2011-01-03 19:38:47 UTC (rev
6725)
@@ -1230,6 +1230,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
}
/*
@@ -1270,6 +1271,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
for ($i=2;$i<($type_id+1);$i++)
{
@@ -1283,7 +1285,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
-
+ $uicols['sortable'][] = '';
}
}
@@ -1300,6 +1302,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
}
if($uicol_address)
@@ -1313,6 +1316,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
}
$config_count = count($config);
@@ -1335,6 +1339,7 @@
$uicols['datatype'][]
= '';
$uicols['formatter'][]
= '';
$uicols['classname'][]
= '';
+ $uicols['sortable'][]
= true;
$cols_return[]
= 'street_number';
$uicols['input_type'][]
= 'hidden';
@@ -1346,8 +1351,8 @@
$uicols['datatype'][]
= '';
$uicols['formatter'][]
= '';
$uicols['classname'][]
= '';
+ $uicols['sortable'][]
= '';
-
$cols_return[]
= $config[$i]['column_name'];
$uicols['input_type'][]
= 'hidden';
$uicols['name'][]
= $config[$i]['column_name'];
@@ -1358,6 +1363,7 @@
$uicols['datatype'][]
= '';
$uicols['formatter'][]
= '';
$uicols['classname'][]
= '';
+ $uicols['sortable'][]
= '';
if($lookup)
{
@@ -1379,6 +1385,7 @@
$uicols['datatype'][]
= '';
$uicols['formatter'][]
= '';
$uicols['classname'][]
= '';
+ $uicols['sortable'][]
= '';
if($lookup)
{
Modified: trunk/property/inc/class.boproject.inc.php
===================================================================
--- trunk/property/inc/class.boproject.inc.php 2011-01-03 13:31:26 UTC (rev
6724)
+++ trunk/property/inc/class.boproject.inc.php 2011-01-03 19:38:47 UTC (rev
6725)
@@ -116,37 +116,59 @@
$this->criteria_id =
isset($data['criteria_id'])?$data['criteria_id']:'';
}
- function column_list($selected =
array(),$type_id='',$allrows='')
+ function column_list($selected = array())
{
if(!$selected)
{
$selected =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['project_columns'])
? $GLOBALS['phpgw_info']['user']['preferences']['property']['project_columns']
: '';
}
- $filter = array('list' => ''); // translates to "list
IS NULL"
+ $columns = $this->get_column_list();
+ return
$this->bocommon->select_multi_list($selected,$columns);
+ }
+
+ function get_column_list()
+ {
$columns = array();
- $columns[] = array
+ $columns['planned_cost'] = array
(
- 'id' => 'entry_date',
- 'name'=> lang('entry date')
+ 'id' => 'planned_cost',
+ 'name' => lang('planned cost'),
+ 'sortable' => false,
+ 'formatter' => 'myFormatCount2',
+ 'classname' => 'rightClasss'
);
- $columns[] = array
+ $columns['ecodimb'] = array
(
- 'id' => 'start_date',
- 'name'=> lang('start date')
+ 'id' => 'ecodimb',
+ 'name' => lang('accounting dim
b'),
+ 'sortable' => true
);
- $columns[] = array
+ $columns['entry_date'] = array
(
- 'id' => 'end_date',
- 'name'=> lang('end date')
+ 'id' => 'entry_date',
+ 'name' => lang('entry date'),
+ 'sortable' => true
);
- $columns[] = array
+ $columns['start_date'] = array
(
- 'id' => 'billable_hours',
- 'name'=> lang('billable hours')
+ 'id' => 'start_date',
+ 'name' => lang('start date'),
+ 'sortable' => true
);
+ $columns['end_date'] = array
+ (
+ 'id' => 'end_date',
+ 'name' => lang('end date'),
+ 'sortable' => true
+ );
+ $columns['billable_hours'] = array
+ (
+ 'id' => 'billable_hours',
+ 'name' => lang('billable
hours'),
+ 'sortable' => true
+ );
-
$column_list=$this->bocommon->select_multi_list($selected,$columns);
- return $column_list;
+ return $columns;
}
function select_status_list($format='',$selected='')
@@ -240,6 +262,11 @@
'id' => '6',
'name' => lang('module')
),
+ array
+ (
+ 'id' => '7',
+ 'name' => lang('accounting dim
b')
+ )
);
return
$this->bocommon->select_list($selected,$criteria);
}
@@ -296,6 +323,14 @@
'front' => "'",
'back' => "'"
);
+ $criteria[7] = array
+ (
+ 'field' => 'fm_project.ecodimb',
+ 'type' => 'int',
+ 'matchtype' => 'exact',
+ 'front' => '',
+ 'back' => ''
+ );
if($id)
{
@@ -331,16 +366,20 @@
$this->uicols = $this->so->uicols;
$custom_cols =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['project_columns'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['project_columns'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['project_columns'] :
array();
+ $column_list = $this->get_column_list();
- foreach ($custom_cols as $col)
+ foreach ($custom_cols as $col_id)
{
$this->uicols['input_type'][] = 'text';
- $this->uicols['name'][] = $col;
- $this->uicols['descr'][] =
lang(str_replace('_', ' ', $col));
- $this->uicols['statustext'][] = $col;
+ $this->uicols['name'][] =
$col_id;
+ $this->uicols['descr'][] =
$column_list[$col_id]['name'];
+ $this->uicols['statustext'][] =
$column_list[$col_id]['name'];
$this->uicols['exchange'][] = false;
$this->uicols['align'][] = '';
$this->uicols['datatype'][] = false;
+ $this->uicols['sortable'][] =
$column_list[$col_id]['sortable'];
+ $this->uicols['formatter'][] =
$column_list[$col_id]['formatter'];
+ $this->uicols['classname'][] =
$column_list[$col_id]['classname'];
}
if(!isset($data['skip_origin']) ||
!$data['skip_origin'])
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2011-01-03 13:31:26 UTC
(rev 6724)
+++ trunk/property/inc/class.boworkorder.inc.php 2011-01-03 19:38:47 UTC
(rev 6725)
@@ -167,39 +167,49 @@
}
}
- function column_list($selected =
array(),$type_id='',$allrows='')
+ function column_list($selected = array())
{
if(!$selected)
{
$selected =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_columns'])
?
$GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_columns']
: '';
}
- $filter = array('list' => ''); // translates to "list
IS NULL"
+
+ $columns = $this->get_column_list();
+ return
$this->bocommon->select_multi_list($selected,$columns);
+ }
+
+ function get_column_list()
+ {
$columns = array();
-
- $columns[] = array
+ $columns['ecodimb'] = array
(
+ 'id' => 'ecodimb',
+ 'name' => lang('accounting dim
b'),
+ 'sortable' => true
+ );
+ $columns['entry_date'] = array
+ (
'id' => 'entry_date',
'name'=> lang('entry date')
);
- $columns[] = array
+ $columns['start_date'] = array
(
'id' => 'start_date',
'name'=> lang('start date')
);
- $columns[] = array
+ $columns['end_date'] = array
(
'id' => 'end_date',
'name'=> lang('end date')
);
- $columns[] = array
+ $columns['billable_hours'] = array
(
'id' => 'billable_hours',
'name'=> lang('billable hours')
);
-
$column_list=$this->bocommon->select_multi_list($selected,$columns);
- return $column_list;
+ return $columns;
}
function next_id()
@@ -305,6 +315,11 @@
'id' => '8',
'name' => lang('vendor id')
),
+ array
+ (
+ 'id' => '9',
+ 'name' => lang('accounting dim
b')
+ )
);
return
$this->bocommon->select_list($selected,$criteria);
}
@@ -377,6 +392,14 @@
'front' => '',
'back' => ''
);
+ $criteria[9] = array
+ (
+ 'field' => 'fm_workorder.ecodimb',
+ 'type' => 'int',
+ 'matchtype' => 'exact',
+ 'front' => '',
+ 'back' => ''
+ );
if($id)
{
@@ -409,14 +432,20 @@
$this->uicols = $this->so->uicols;
$custom_cols =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_columns'])
&&
$GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_columns']
?
$GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_columns']
: array();
- foreach ($custom_cols as $col)
+ $column_list = $this->get_column_list();
+
+ foreach ($custom_cols as $col_id)
{
$this->uicols['input_type'][] = 'text';
- $this->uicols['name'][] = $col;
- $this->uicols['descr'][] =
lang(str_replace('_', ' ', $col));
- $this->uicols['statustext'][] = $col;
+ $this->uicols['name'][] =
$col_id;
+ $this->uicols['descr'][] =
$column_list[$col_id]['name'];
+ $this->uicols['statustext'][] =
$column_list[$col_id]['name'];
+ $this->uicols['exchange'][] = false;
+ $this->uicols['align'][] = '';
+ $this->uicols['datatype'][] = false;
+ $this->uicols['sortable'][] =
$column_list[$col_id]['sortable'];
}
- //_debug_array($this->uicols);die();
+
foreach ($workorder as &$entry)
{
$entry['entry_date'] =
$GLOBALS['phpgw']->common->show_date($entry['entry_date'],$dateformat);
Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php 2011-01-03 13:31:26 UTC (rev
6724)
+++ trunk/property/inc/class.soproject.inc.php 2011-01-03 19:38:47 UTC (rev
6725)
@@ -137,6 +137,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
$cols .= ", project_group";
$cols_return[] =
'project_group';
@@ -149,6 +150,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = 'rightClasss';
+ $uicols['sortable'][] = '';
$cols .= ", fm_project_status.descr as status";
$cols_return[] =
'status';
@@ -161,6 +163,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
$cols.= ",$entity_table.entry_date";
$cols_return[] =
'entry_date';
@@ -168,6 +171,9 @@
$cols_return[] =
'start_date';
$cols.= ",$entity_table.end_date";
$cols_return[] =
'end_date';
+ $cols.= ",$entity_table.ecodimb";
+ $cols_return[] =
'ecodimb';
+
/*
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'entry_date';
@@ -178,6 +184,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
*/
$cols.= ",$entity_table.name as name";
$cols_return[] =
'name';
@@ -190,6 +197,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols.= ",loc1_name";
$cols_return[] =
'loc1_name';
@@ -202,6 +210,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols.= ",account_lid as coordinator";
$cols_return[] =
'coordinator';
@@ -214,6 +223,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols.= ",(fm_project.budget +
fm_project.reserve) as budget";
$cols_return[] =
'budget';
@@ -226,6 +236,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
+ $uicols['sortable'][] = '';
$cols .= ',sum(fm_workorder.combined_cost) as
combined_cost';
$cols_return[] = 'combined_cost';
@@ -238,6 +249,7 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
+ $uicols['sortable'][] = '';
$cols .= ',(sum(fm_workorder.act_mtrl_cost) +
sum(fm_workorder.act_vendor_cost)) as actual_cost';
$cols_return[] = 'actual_cost';
@@ -250,9 +262,11 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
+ $uicols['sortable'][] = '';
$cols .= ',planned_cost';
$cols_return[] = 'planned_cost';
+/*
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'planned_cost';
$uicols['descr'][] =
lang('planned cost');
@@ -262,7 +276,8 @@
$uicols['datatype'][] = '';
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
-
+ $uicols['sortable'][] = '';
+*/
$cols.= ",$entity_table.user_id";
$cols .= ',sum(fm_workorder.billable_hours) as
billable_hours';
@@ -375,7 +390,7 @@
}
$group_method = ' GROUP BY
fm_project_status.descr,loc1_name,fm_project.location_code,fm_project.id,fm_project.entry_date,fm_project.start_date,fm_project.end_date,'
- .
'fm_project.name,phpgw_accounts.account_lid,fm_project.user_id,fm_project.address,'
+ .
'fm_project.name,fm_project.ecodimb,phpgw_accounts.account_lid,fm_project.user_id,fm_project.address,'
.
'fm_project.budget,fm_project.reserve,planned_cost,project_group';
Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php 2011-01-03 13:31:26 UTC
(rev 6724)
+++ trunk/property/inc/class.soworkorder.inc.php 2011-01-03 19:38:47 UTC
(rev 6725)
@@ -157,6 +157,7 @@
$uicols['statustext'][] = lang('Project
ID');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
$cols .= ",fm_workorder.id as workorder_id";
$cols_return[] =
'workorder_id';
@@ -166,6 +167,7 @@
$uicols['statustext'][] =
lang('Workorder ID');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
$cols .= ",fm_workorder.title as title";
$cols_return[] =
'title';
@@ -175,6 +177,7 @@
$uicols['statustext'][] =
lang('Workorder title');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols .= ",fm_workorder_status.descr as status";
$cols_return[] =
'status';
@@ -184,6 +187,7 @@
$uicols['statustext'][] =
lang('Workorder status');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols .= ",fm_workorder.entry_date as
entry_date";
$cols_return[] =
'entry_date';
@@ -191,6 +195,9 @@
$cols_return[] =
'start_date';
$cols .= ",fm_workorder.end_date as end_date";
$cols_return[] =
'end_date';
+ $cols.= ",fm_workorder.ecodimb";
+ $cols_return[] =
'ecodimb';
+
/*
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'entry_date';
@@ -207,6 +214,7 @@
$uicols['statustext'][] =
lang('Workorder User');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols .= ',fm_workorder.vendor_id';
$cols_return[] = 'vendor_id';
@@ -216,6 +224,7 @@
$uicols['statustext'][] = lang('Vendor
ID');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols.= ",loc1_name";
$cols_return[] =
'loc1_name';
@@ -225,8 +234,8 @@
$uicols['statustext'][] = '';
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
-
$cols .= ",fm_project.user_id as project_owner";
$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))";
@@ -243,6 +252,7 @@
$uicols['statustext'][] = lang('Vendor
name');
$uicols['formatter'][] = '';
$uicols['classname'][] = '';
+ $uicols['sortable'][] = '';
$cols .= ',fm_workorder.combined_cost';
$cols_return[] = 'combined_cost';
@@ -252,6 +262,7 @@
$uicols['statustext'][] = lang('Cost -
either budget or calculation');
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
+ $uicols['sortable'][] = true;
$cols .= ',fm_workorder.act_mtrl_cost +
fm_workorder.act_vendor_cost as actual_cost';
$cols_return[] = 'actual_cost';
@@ -261,6 +272,7 @@
$uicols['statustext'][] = lang('Actual
cost - paid so far');
$uicols['formatter'][] =
'myFormatCount2';
$uicols['classname'][] = 'rightClasss';
+ $uicols['sortable'][] = true;
$joinmethod .= " $this->left_join fm_vendor ON
(fm_workorder.vendor_id = fm_vendor.id))";
$paranthesis .='(';
@@ -307,6 +319,9 @@
$uicols['exchange'][] = false;
$uicols['align'][]
= '';
$uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+ $uicols['sortable'][] = true;
}
else
{
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2011-01-03 13:31:26 UTC (rev
6724)
+++ trunk/property/inc/class.uiproject.inc.php 2011-01-03 19:38:47 UTC (rev
6725)
@@ -676,7 +676,7 @@
$datatable['headers']['header'][$i]['format'] =
$this->bocommon->translate_datatype_format($uicols['datatype'][$i]);
$datatable['headers']['header'][$i]['sortable'] = false;
- if($uicols['name'][$i]=='project_id' ||
$uicols['name'][$i]=='address' || $uicols['name'][$i]=='project_group')
+ if(isset($uicols['sortable'][$i]) &&
$uicols['sortable'][$i])
{
$datatable['headers']['header'][$i]['sortable'] = true;
$datatable['headers']['header'][$i]['sort_field'] = $uicols['name'][$i];
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2011-01-03 13:31:26 UTC
(rev 6724)
+++ trunk/property/inc/class.uiworkorder.inc.php 2011-01-03 19:38:47 UTC
(rev 6725)
@@ -681,7 +681,8 @@
$datatable['headers']['header'][$i]['visible'] = true;
$datatable['headers']['header'][$i]['format'] =
$this->bocommon->translate_datatype_format($uicols['datatype'][$i]);
$datatable['headers']['header'][$i]['sortable'] = false;
- if($uicols['name'][$i]=='project_id' ||
$uicols['name'][$i]=='workorder_id' || $uicols['name'][$i]=='address')
+
+ if(isset($uicols['sortable'][$i]) &&
$uicols['sortable'][$i])
{
$datatable['headers']['header'][$i]['sortable'] = true;
$datatable['headers']['header'][$i]['sort_field'] = $uicols['name'][$i];
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6725] property: custom fields at order/order,
Sigurd Nes <=