[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6716] property: end date (as custom column) at proje
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6716] property: end date (as custom column) at project list |
|
Date: |
Sun, 02 Jan 2011 18:01:59 +0000 |
Revision: 6716
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6716
Author: sigurdne
Date: 2011-01-02 18:01:59 +0000 (Sun, 02 Jan 2011)
Log Message:
-----------
property: end date (as custom column) at project list
Modified Paths:
--------------
trunk/property/inc/class.bocommon.inc.php
trunk/property/inc/class.boproject.inc.php
trunk/property/inc/class.soproject.inc.php
Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php 2011-01-02 17:25:49 UTC (rev
6715)
+++ trunk/property/inc/class.bocommon.inc.php 2011-01-02 18:01:59 UTC (rev
6716)
@@ -1228,6 +1228,9 @@
$uicols['exchange'][] = false;
$uicols['align'][] = '';
$uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+
}
/*
$fm_location_cols =
$soadmin_location->read_attrib(array('type_id'=>$type_id,'lookup_type'=>$type_id));
@@ -1265,6 +1268,8 @@
$uicols['exchange'][] = true;
$uicols['align'][] = '';
$uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
for ($i=2;$i<($type_id+1);$i++)
{
@@ -1276,6 +1281,9 @@
$uicols['exchange'][] = true;
$uicols['align'][]
= '';
$uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+
}
}
@@ -1290,6 +1298,8 @@
$uicols['exchange'][] = false;
$uicols['align'][] = '';
$uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
}
if($uicol_address)
@@ -1301,6 +1311,8 @@
$uicols['exchange'][] = false;
$uicols['align'][] = '';
$uicols['datatype'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
}
$config_count = count($config);
@@ -1321,6 +1333,8 @@
$uicols['exchange'][]
= false;
$uicols['align'][]
= '';
$uicols['datatype'][]
= '';
+ $uicols['formatter'][]
= '';
+ $uicols['classname'][]
= '';
$cols_return[]
= 'street_number';
$uicols['input_type'][]
= 'hidden';
@@ -1330,7 +1344,10 @@
$uicols['exchange'][]
= false;
$uicols['align'][]
= '';
$uicols['datatype'][]
= '';
+ $uicols['formatter'][]
= '';
+ $uicols['classname'][]
= '';
+
$cols_return[]
= $config[$i]['column_name'];
$uicols['input_type'][]
= 'hidden';
$uicols['name'][]
= $config[$i]['column_name'];
@@ -1339,6 +1356,9 @@
$uicols['exchange'][]
= false;
$uicols['align'][]
= '';
$uicols['datatype'][]
= '';
+ $uicols['formatter'][]
= '';
+ $uicols['classname'][]
= '';
+
if($lookup)
{
$cols_extra[]
= 'street_name';
@@ -1357,6 +1377,8 @@
$uicols['exchange'][]
= false;
$uicols['align'][]
= '';
$uicols['datatype'][]
= '';
+ $uicols['formatter'][]
= '';
+ $uicols['classname'][]
= '';
if($lookup)
{
Modified: trunk/property/inc/class.boproject.inc.php
===================================================================
--- trunk/property/inc/class.boproject.inc.php 2011-01-02 17:25:49 UTC (rev
6715)
+++ trunk/property/inc/class.boproject.inc.php 2011-01-02 18:01:59 UTC (rev
6716)
@@ -126,9 +126,15 @@
$columns = array();
$columns[] = array
(
+ 'id' => 'end_date',
+ 'name'=> lang('end date')
+ );
+ $columns[] = array
+ (
'id' => 'billable_hours',
'name'=> lang('billable hours')
);
+
$column_list=$this->bocommon->select_multi_list($selected,$columns);
return $column_list;
}
@@ -313,16 +319,6 @@
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
$this->uicols = $this->so->uicols;
- if(!isset($data['skip_origin']) ||
!$data['skip_origin'])
- {
- $this->uicols['input_type'][] = 'text';
- $this->uicols['name'][] =
'ticket';
- $this->uicols['descr'][] =
lang('ticket');
- $this->uicols['statustext'][] = false;
- $this->uicols['exchange'][] = false;
- $this->uicols['align'][] = '';
- $this->uicols['datatype'][] =
'link';
- }
$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();
@@ -337,11 +333,23 @@
$this->uicols['datatype'][] = false;
}
+ if(!isset($data['skip_origin']) ||
!$data['skip_origin'])
+ {
+ $this->uicols['input_type'][] = 'text';
+ $this->uicols['name'][] =
'ticket';
+ $this->uicols['descr'][] =
lang('ticket');
+ $this->uicols['statustext'][] = false;
+ $this->uicols['exchange'][] = false;
+ $this->uicols['align'][] = '';
+ $this->uicols['datatype'][] =
'link';
+ }
+
$cols_extra = $this->so->cols_extra;
foreach ($project as & $entry)
{
$entry['start_date'] =
$GLOBALS['phpgw']->common->show_date($entry['start_date'],$dateformat);
+ $entry['end_date'] =
$GLOBALS['phpgw']->common->show_date($entry['end_date'],$dateformat);
if(!isset($data['skip_origin']) ||
!$data['skip_origin'])
{
$origin =
$this->interlink->get_relation('property', '.project', $entry['project_id'],
'origin');
Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php 2011-01-02 17:25:49 UTC (rev
6715)
+++ trunk/property/inc/class.soproject.inc.php 2011-01-02 18:01:59 UTC (rev
6716)
@@ -164,15 +164,8 @@
$cols.= ",$entity_table.start_date";
$cols_return[] =
'start_date';
- $uicols['input_type'][] = 'text';
- $uicols['name'][] =
'start_date';
- $uicols['descr'][] =
lang('start date');
- $uicols['statustext'][] = lang('Project
start date');
- $uicols['exchange'][] = false;
- $uicols['align'][] = '';
- $uicols['datatype'][] = '';
- $uicols['formatter'][] = '';
- $uicols['classname'][] = '';
+ $cols.= ",$entity_table.end_date";
+ $cols_return[] =
'end_date';
$cols.= ",$entity_table.name as name";
$cols_return[] =
'name';
@@ -291,6 +284,17 @@
$this->bocommon->fm_cache('sql_project_' .
!!$wo_hour_cat_id,$sql);
$this->uicols =
$this->bocommon->uicols;
+
+ $this->uicols['input_type'][] =
'text';
+ $this->uicols['name'][]
= 'start_date';
+ $this->uicols['descr'][]
= lang('start date');
+ $this->uicols['statustext'][] =
lang('Project start date');
+ $this->uicols['exchange'][]
= false;
+ $this->uicols['align'][]
= '';
+ $this->uicols['datatype'][]
= '';
+ $this->uicols['formatter'][] = '';
+ $this->uicols['classname'][] = '';
+
$cols_return =
$this->bocommon->cols_return;
$type_id =
$this->bocommon->type_id;
$this->cols_extra =
$this->bocommon->cols_extra;
@@ -369,7 +373,7 @@
$where= 'AND';
}
- $group_method = ' GROUP BY
fm_project_status.descr,loc1_name,fm_project.location_code,fm_project.id,fm_project.start_date,'
+ $group_method = ' GROUP BY
fm_project_status.descr,loc1_name,fm_project.location_code,fm_project.id,fm_project.start_date,fm_project.end_date,'
.
'fm_project.name,phpgw_accounts.account_lid,fm_project.user_id,fm_project.address,'
.
'fm_project.budget,fm_project.reserve,planned_cost,project_group';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6716] property: end date (as custom column) at project list,
Sigurd Nes <=