projects/tasks
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial sub-tasks support

Browse source 
In addition to normal dependencies, the application now supports
sub-tasks. Sub-tasks can be added into any existing task (including
other sub-tasks, Inception-style).

Dependencies can only be added between global tasks, or between
sub-tasks of the same task. It is no longer possible to mark a task as
finished if it has incomplete sub-tasks, and conversedly, it is not
possible to reactivate a sub-task if its parent is marked as completed.

A pair of buttons allowing tasks to be moved up and down in the task
hierarachy have been added.
This commit is contained in:
Emmanuel BENOîT 2012-02-09 18:50:54 +01:00
parent 49cc53e31f
commit d28f5741fe
18 changed files with 1658 additions and 132 deletions
includes/t-tasks
views.inc.php

69
includes/t-tasks/views.inc.php
View file

@ -60,7 +60,7 @@ class View_TasksList
->appendElement( HTML::make( 'a' )
->setAttribute( 'href' , $this->base . '/tasks/view?id=' . $task->id )
->appendText( $task->title ) ) );
$this->addItem( $cell , $task );
$this->addParent( $cell , $task );
$classes = array( );
$addedAt = strtotime( $task->added_at );
@ -75,6 +75,9 @@ class View_TasksList
if ( $task->missing_dependencies !== null ) {
$this->generateMissingDependencies( $cell , $classes , $task );
}
if ( $task->missing_subtasks !== null ) {
$this->generateMissingSubtasks( $cell , $classes , $task );
}
if ( $task->assigned_to !== null ) {
$this->generateAssignedTask( $cell , $classes , $task );
}
@ -82,19 +85,28 @@ class View_TasksList
if ( ! empty( $classes ) ) {
foreach ( $cell as $entry ) {
$entry->setAttribute( 'class' , join( ' ' , $classes ) );
$entry->setAttribute( 'class' , join( ' ' , array_unique( $classes ) ) );
}
}
return $cell;
}
protected function addItem( &$cell , $task )
protected function addParent( &$cell , $task )
{
if ( ! array_key_exists( 'item' , $this->features ) ) {
return;
}
if ( $task->item !== null ) {
$this->addItem( $cell , $task );
} else {
$this->addParentTask( $cell , $task );
}
}
protected function addItem( &$cell , $task )
{
$itemsDao = Loader::DAO( 'items' );
$item = $itemsDao->get( $task->item );
$lineage = $itemsDao->getLineage( $item );
@ -114,6 +126,17 @@ class View_TasksList
array_push( $cell , HTML::make( 'dd' )->append( $contents ) );
}
protected function addParentTask( &$cell , $task )
{
$parent = $this->dao->get( $task->parent_task );
array_push( $cell , HTML::make( 'dd' )
->appendText( 'Sub-task of ' )
->appendElement( HTML::make( 'a' )
->setAttribute( 'href' , $this->base . '/tasks/view?id=' . $parent->id )
->appendText( $parent->title ) ) );
}
protected function generateMissingDependencies( &$cell , &$classes , $task )
{
if ( ! array_key_exists( 'deps' , $this->features ) ) {
@ -134,6 +157,23 @@ class View_TasksList
array_push( $classes , 'missing-deps' );
}
protected function generateMissingSubtasks( &$cell , &$classes , $task )
{
if ( ! array_key_exists( 'deps' , $this->features ) ) {
return;
}
if ( $task->missing_subtasks > 1 ) {
$end = 's';
} else {
$end = '';
}
array_push( $cell ,
$md = HTML::make( 'dd' )->appendText( "{$task->missing_subtasks} incomplete sub-task$end" ) );
array_push( $classes , 'missing-deps' );
}
protected function generateAssignedTask( &$cell , &$classes , $task )
{
if ( ! array_key_exists( 'assigned' , $this->features ) ) {
@ -173,11 +213,22 @@ class View_TaskDetails
public function render( )
{
$list = HTML::make( 'dl' )
->setAttribute( 'class' , 'tasks' )
->appendElement( HTML::make( 'dt' )
->appendText( 'On item:' ) )
->appendElement( HTML::make( 'dd' )
->append( $this->formatPlaceLineage( $this->task->item ) ) );
->setAttribute( 'class' , 'tasks' );
if ( $this->task->item !== null ) {
$list->appendElement( HTML::make( 'dt' )
->appendText( 'On item:' ) )
->appendElement( HTML::make( 'dd' )
->append( $this->formatPlaceLineage( $this->task->item ) ) );
} else {
$list->appendElement( HTML::make( 'dt' )
->appendText( 'Sub-task of:' ) )
->appendElement( HTML::make( 'dd' )
->appendElement( HTML::make( 'a' )
->setAttribute( 'href' , $this->base .
'/tasks/view?id=' . $this->task->parent_task->id )
->appendText( $this->task->parent_task->title ) ) );
}
if ( $this->task->description != '' ) {
$list->appendElement( HTML::make( 'dt' )
@ -317,6 +368,8 @@ class View_TaskDependencies
->appendText( $dependency->item_name ) )
->appendElement( $itemList ) );
$prevItem = $dependency->item;
} elseif ( $itemList === null ) {
$itemList = $list;
}
$entry = HTML::make( 'li' )->appendElement(