@@ -86,7 +86,7 @@ class helper_plugin_task extends DokuWiki_Plugin {
/**
* Returns an array of task pages, sorted by priority
*/
- function getTasks($ns, $num = NULL, $filter = '') {
+ function getTasks($ns, $num = NULL, $filter = '', $user = NULL) {
global $conf;
if (!$filter) $filter = strtolower($_REQUEST['filter']);
@@ -122,7 +122,7 @@ class helper_plugin_task extends DokuWiki_Plugin {
}
// skip other's tasks if filter is 'my'
- if (($filter == 'my') && !$responsible) continue;
+ if ($user && !$responsible) continue;
// skip assigned and not new tasks if filter is 'new'
if (($filter == 'new') && ($task['user']['name'] || ($task['status'] != 0))) continue;
helper.php
@@ -38,6 +38,7 @@ $lang['view_new'] = 'new';
$lang['view_done'] = 'done';
$lang['view_due'] = 'due';
$lang['view_overdue'] = 'overdue';
+$lang['view_user'] = 'Show only my tasks';
$lang['btn_change'] = 'Change';
$lang['btn_refresh'] = 'Refresh';
lang/en/lang.php
@@ -66,6 +66,19 @@ div.dokuwiki div.task_viewmenu {
margin-bottom: 0.5em;
}
+div.dokuwiki form#task__changeview_form label {
+ float: left;
+ margin-right: 0.5em;
+}
+
+div.dokuwiki form#task__changeview_form input {
+ margin: 0.3em;
+}
+
+div.dokuwiki form#task__changeview_form input.button {
+ margin: 0;
+}
+
div.dokuwiki th.status,
div.dokuwiki td.status {
color: __text_neu__;
style.css
@@ -64,8 +64,9 @@ class syntax_plugin_task_tasks extends DokuWiki_Syntax_Plugin {
$filter = strtolower($filter);
$filters = $this->_viewFilters();
if (!in_array($filter, $filters)) $filter = 'open';
+ if(isset($_REQUEST['view_user'])) $user = $_REQUEST['view_user'];
- if ($my =& plugin_load('helper', 'task')) $pages = $my->getTasks($ns, NULL, $filter);
+ if ($this->helper =& plugin_load('helper', 'task')) $pages = $this->helper->getTasks($ns, NULL, $filter, $user);
// use tag refinements?
if ($refine) {
@@ -184,9 +185,17 @@ class syntax_plugin_task_tasks extends DokuWiki_Syntax_Plugin {
if ($filter == $option) $ret .= ' selected="selected"';
$ret .= '>'.$this->getLang('view_'.$option).'</option>'.DOKU_LF;
}
- $ret .= DOKU_TAB.'</select>'.DOKU_LF.
- DOKU_TAB.'<input class="button" type="submit" value="'.$this->getLang('btn_refresh').'" />'.DOKU_LF.
- '</label>'.DOKU_LF.
+ $ret .= DOKU_TAB.'</select>'.DOKU_LF;
+ $ret .= '</label>'.DOKU_LF;
+
+ if(isset($_SERVER['REMOTE_USER'])) {
+ $ret .= '<label class="simple">'.DOKU_LF.'<span>'.$this->getLang('view_user').':</span>'.DOKU_LF;
+ $ret .= DOKU_TAB.'<input type="checkbox" name="view_user" value="' . $_SERVER['REMOTE_USER'] . '"';
+ $ret .= ($_REQUEST['view_user']) ? ' checked="checked"' : '';
+ $ret .= '/></label>'.DOKU_LF;
+ }
+
+ $ret .= DOKU_TAB.'<input class="button" type="submit" value="'.$this->getLang('btn_refresh').'" />'.DOKU_LF.
'</form>'.DOKU_LF.
'</div>'.DOKU_LF;
return $ret;
@@ -197,7 +206,7 @@ class syntax_plugin_task_tasks extends DokuWiki_Syntax_Plugin {
*/
function _viewFilters() {
if (!$_SERVER['REMOTE_USER']) $filters = array('all', 'open', 'done');
- else $filters = array('all', 'open', 'my', 'new', 'done');
+ else $filters = array('all', 'open', 'new', 'done');
if ($this->getConf('datefield')) {
$filters[] = 'due';
$filters[] = 'overdue';
@@ -216,9 +225,21 @@ class syntax_plugin_task_tasks extends DokuWiki_Syntax_Plugin {
$ret = array();
for ($i = 1; $i <= $num; $i++) {
- if ($i == $cur) $ret[] = '<strong>'.$i.'</strong>';
- else $ret[] = '<a href="'.wl($ID, array('first' => $perpage * ($i - 1),
- 'filter' => $filter)).'" class="wikilink1" alt="'.$i.'">'.$i.'</a>';
+ if ($i == $cur) {
+ $ret[] = '<strong>'.$i.'</strong>';
+ } else {
+ $opt = array();
+ $opt['first'] = $perpage * ($i - 1);
+ $opt['filter'] = $filer;
+ if(isset($_REQUEST['view_user'])) {
+ $user = array();
+ $user['id'] = $_REQUEST['view_user'];
+ if($this->helper->_isResponsible($user)) {
+ $opt['view_user'] = $_REQUEST['view_user'];
+ }
+ }
+ $ret[] = '<a href="'.wl($ID, $opt).'" class="wikilink1" title="'.$i.'">'.$i.'</a>';
+ }
}
return '<div class="centeralign">'.DOKU_LF.
DOKU_TAB.join(' | ', $ret).DOKU_LF.
syntax/tasks.php
c852fa761b137a030f8c4542772c469174e252ef
Michael Klier
chi@chimeric.de
http://github.com/dokufreaks/plugin-task/commit/cf5f59b25e7bf9131e4fa37f59ef65cbebb2159c
cf5f59b25e7bf9131e4fa37f59ef65cbebb2159c
2009-02-10T08:03:01-08:00
2009-02-10T08:03:01-08:00
possibility to filter own tasks
darcs-hash:20090210160301-23886-6e16ebbbe9cf967ea7fe5cc1b613f94b8027fdaa.gz
885c3978aed40b9dfe1cf0b638b5664793ce4551
Michael Klier
chi@chimeric.de