diff --git a/module/my/js/todo.js b/module/my/js/todo.js index bf9b0b0c00..63544fc788 100644 --- a/module/my/js/todo.js +++ b/module/my/js/todo.js @@ -21,4 +21,22 @@ $(function() type: 'iframe' }).trigger('click'); } + + $('#todoForm').table( + { + replaceId: 'todoIDList', + statisticCreator: function(table) + { + var $table = table.getTable(); + var $checkedRows = $table.find('tbody>tr.checked'); + var checkedTotal = $checkedRows.length; + var checkedWait = $checkedRows.filter("[data-status=wait]").length; + var checkedDoing = $checkedRows.filter("[data-status=doing]").length; + var checkedStatistics = checkedSummary.replace('%total%', checkedTotal) + .replace('%wait%', checkedWait) + .replace('%doing%', checkedDoing); + + return checkedTotal ? checkedStatistics : pageSummary; + } + }); }); diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index d5dc31bba4..15fbc5f468 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -126,11 +126,6 @@ storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?> {$this->lang->my->storyChanged}") : print(" " . $this->processStatus('task', $task) . "");?> - pri;?>' title='task->priList, $task->pri);?>'>task->priList, $task->pri);?> - - storyStatus) and $task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion and !in_array($task->status, array('cancel', 'closed')));?> - {$this->lang->my->storyChanged}") : print(" " . $this->processStatus('task', $task) . "");?> - systemMode == 'new'):?> execution]->name) ? $projects[$task->execution]->name : '';?> execution]->id) ? $projects[$task->execution]->id : 0;?> diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php index d8d09f7f81..d8d0dbc992 100644 --- a/module/my/view/todo.html.php +++ b/module/my/view/todo.html.php @@ -56,6 +56,10 @@ +
@@ -67,7 +71,7 @@

-
+ - + status == 'wait') $waitCount ++;?> + status == 'doing') $doingCount ++;?> +
@@ -192,10 +198,13 @@ } ?>
+
todo->summary, count($todos), $waitCount, $doingCount);?>
show('right', 'pagerjs');?>
+todo->summary, count($todos), $waitCount, $doingCount));?> +todo->checkedSummary);?> diff --git a/module/project/view/browsebylist.html.php b/module/project/view/browsebylist.html.php index 34d17c17e4..354022aa8b 100644 --- a/module/project/view/browsebylist.html.php +++ b/module/project/view/browsebylist.html.php @@ -56,6 +56,12 @@ +
config->systemMode == 'new'):?>