holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linked filter for timesheet (analog to infolog one, using nextmatch

Browse Source 
custom filter with a link-entry widget)
This commit is contained in:
Ralf Becker 2009-09-26 11:17:19 +00:00
parent a4d167ef8c
commit 42d898da8c
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -5,7 +5,7 @@
* @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @package timesheet
* @copyright (c) 2005-8 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2005-9 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
*/
@ -432,13 +432,13 @@ class timesheet_ui extends timesheet_bo
//echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n";
if (!$id_only) $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
$query = $query_in; // keep the original query
if($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
if ($query['no_status']) $query_in['options-selectcols']['ts_status'] = false;
#_debug_array($query['col_filter']);
// PM project filter for the PM integration
if ((string)$query['col_filter']['pm_id'] != '')
{
//$query['col_filter']['ts_id'] = egw_link::get_links('projectmanager',$query['col_filter']['pm_id'],'timesheet');
$query['col_filter']['ts_id'] = $this->get_ts_links($query['col_filter']['pm_id']);
if (!$query['col_filter']['ts_id']) $query['col_filter']['ts_id'] = 0;
}
@ -449,6 +449,28 @@ class timesheet_ui extends timesheet_bo
}
unset($query['col_filter']['pm_id']);
// handle linked filter (show only entries linked to a certain other entry)
if ($query['col_filter']['linked'])
{
list($app,$id) = explode(':',$query['col_filter']['linked']);
if (!($links = egw_link::get_links($app,$id,'timesheet')))
{
$rows = array(); // no infologs linked to project --> no rows to return
return 0;
}
if (!$query['col_filter']['ts_id'])
{
$query['col_filter']['ts_id'] = array_values(array_unique($links));
}
// allow to combine with other filters using ts_id --> intersect ids
elseif (!($query['col_filter']['ts_id'] = array_intersect((array)$query['col_filter']['ts_id'],array_values(array_unique($links)))))
{
$rows = array(); // no infologs linked to project --> no rows to return
return 0;
}
}
unset($query['col_filter']['linked']);
// filter for no project
if ((string)$query['col_filter']['ts_project'] == '0')
{

4
timesheet/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

7
timesheet/templates/default/index.xet
View File

@ -15,7 +15,7 @@
<template id="timesheet.index.add" template="" lang="" group="0" version="1.7.001">
<buttononly label="Add" id="add" onclick="window.open(egw::link('/index.php','menuaction=timesheet.timesheet_ui.edit'),'_blank','dependent=yes,width=600,height=400,scrollbars=yes,status=yes'); return false;"/>
</template>
<template id="timesheet.index.rows" template="" lang="" group="0" version="1.7.001">
<template id="timesheet.index.rows" template="" lang="" group="0" version="1.7.003">
<grid width="100%">
<columns>
<column width="15%"/>
@ -44,6 +44,9 @@
<row disabled="!@pm_integration=full">
<nextmatch-customfilter options="projectmanager-select,All projects" id="pm_id" onchange="1"/>
</row>
<row>
<nextmatch-customfilter options="link-entry" onchange="1" id="linked"/>
</row>
<row>
<nextmatch-sortheader label="Title" id="ts_title"/>
</row>
@ -102,7 +105,7 @@
</rows>
</grid>
</template>
<template id="timesheet.index" template="" lang="" group="0" version="1.7.001">
<template id="timesheet.index" template="" lang="" group="0" version="1.7.003">
<grid width="100%">
<columns>
<column/>