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

Added description field to items

Browse source 
A description field has been added to items in the database, form fields
have been added to both item creation and modification. Removed some
French text that was still around.
This commit is contained in:
Emmanuel BENOîT 2012-02-05 23:04:41 +01:00
parent 55438e6661
commit b6b5cd982e
8 changed files with 102 additions and 41 deletions

36
includes/t-data/dao_items.inc.php
View file

@ -10,26 +10,26 @@ class DAO_Items
private $activeTasksCounted = false;
public function createBefore( $name , $before )
public function createBefore( $name , $before , $description = '' )
{
$query = $this->query( 'SELECT insert_item_before( $1 , $2 ) AS error' );
$result = $query->execute( $name , $before );
$query = $this->query( 'SELECT insert_item_before( $1 , $2 , $3 ) AS error' );
$result = $query->execute( $name , $before , $description );
return $result[ 0 ]->error;
}
public function createUnder( $name , $under )
public function createUnder( $name , $under , $description = '' )
{
$query = $this->query( 'SELECT insert_item_under( $1 , $2 ) AS error' );
$result = $query->execute( $name , $under );
$query = $this->query( 'SELECT insert_item_under( $1 , $2 , $3 ) AS error' );
$result = $query->execute( $name , $under , $description );
return $result[ 0 ]->error;
}
public function createLast( $name )
public function createLast( $name , $description = '' )
{
$query = $this->query( 'SELECT insert_item_last( $1 ) AS error' );
$result = $query->execute( $name );
$query = $this->query( 'SELECT insert_item_last( $1 , $2 ) AS error' );
$result = $query->execute( $name , $description );
return $result[ 0 ]->error;
}
@ -41,12 +41,13 @@ class DAO_Items
return $this->loaded[ $identifier ];
}
$getNameQuery = $this->query( 'SELECT item_name FROM items WHERE item_id = $1' , true );
$getNameQuery = $this->query( 'SELECT item_name , item_description FROM items WHERE item_id = $1' , true );
$result = $getNameQuery->execute( $identifier );
if ( empty( $result ) ) {
$rObj = null;
} else {
$rObj = new Data_Item( $identifier , $result[ 0 ]->item_name );
$rObj->description = $result[ 0 ]->item_description;
}
$this->loaded[ $identifier ] = $rObj;
@ -61,7 +62,7 @@ class DAO_Items
}
$query = $this->query(
'SELECT p.item_id , p.item_name FROM items_tree pt '
'SELECT p.item_id , p.item_name , p.item_description FROM items_tree pt '
. 'INNER JOIN items p '
. 'ON p.item_id = pt.item_id_parent '
. 'WHERE pt.item_id_child = $1 AND pt.pt_depth > 0 '
@ -74,6 +75,7 @@ class DAO_Items
$object = $this->loaded[ $entry->item_id ];
} else {
$object = new Data_Item( $entry->item_id , $entry->item_name );
$object->description = $entry->item_description;
$this->loaded[ $entry->item_id ] = $object;
}
$object->lineage = $stack;
@ -87,7 +89,7 @@ class DAO_Items
private function loadTree( )
{
$query = $this->query(
'SELECT p.item_id , p.item_name , MAX( t.pt_depth ) as depth '
'SELECT p.item_id , p.item_name , p.item_description , MAX( t.pt_depth ) AS depth '
. 'FROM items p '
. 'INNER JOIN items_tree t ON t.item_id_child = p.item_id '
. 'GROUP BY p.item_id, p.item_name , p.item_ordering '
@ -114,6 +116,7 @@ class DAO_Items
$object = $this->loaded[ $entry->item_id ];
} else {
$object = new Data_Item( $entry->item_id , $entry->item_name );
$object->description = $entry->item_description;
$this->loaded[ $entry->item_id ] = $object;
}
$object->children = array( );
@ -172,7 +175,7 @@ class DAO_Items
}
$query = $this->query(
'SELECT p.item_id , p.item_name , COUNT(*) AS t_count '
'SELECT p.item_id , p.item_name , p.item_description , COUNT(*) AS t_count '
. 'FROM items p '
. 'INNER JOIN tasks t USING( item_id ) '
. 'LEFT OUTER JOIN completed_tasks c USING( task_id ) '
@ -185,6 +188,7 @@ class DAO_Items
$object = $this->loaded[ $entry->item_id ];
} else {
$object = new Data_Item( $entry->item_id , $entry->item_name );
$object->description = $entry->item_description;
$this->loaded[ $entry->item_id ] = $object;
}
$object->activeTasks = $entry->t_count;
@ -325,10 +329,10 @@ class DAO_Items
}
public function rename( $item , $name )
public function modify( $item , $name , $description = '' )
{
$result = $this->query( 'SELECT rename_item( $1 , $2 ) AS error' )
->execute( $item , $name );
$result = $this->query( 'SELECT update_item( $1 , $2 , $3 ) AS error' )
->execute( $item , $name , $description );
return $result[ 0 ]->error;
}
}

1
includes/t-data/item.inc.php
View file

@ -4,6 +4,7 @@ class Data_Item
{
public $id;
public $name;
public $description;
public $hasParent;
public $parent;
public $children;

16
includes/t-items/controllers.inc.php
View file

@ -98,15 +98,16 @@ class Ctrl_AddItem
{
$name = $this->form->field( 'name' );
$before = $this->form->field( 'before' );
$description = $this->form->field( 'description' );
list( $after , $id ) = explode( ':' , $before->value( ) );
$items = Loader::DAO( 'items' );
if ( $id === '' ) {
$error = $items->createLast( $name->value( ) );
$error = $items->createLast( $name->value( ) , $description->value( ) );
} elseif ( $after == 1 ) {
$error = $items->createUnder( $name->value( ) , $id );
$error = $items->createUnder( $name->value( ) , $id , $description->value( ) );
} else {
$error = $items->createBefore( $name->value( ) , $id );
$error = $items->createBefore( $name->value( ) , $id , $description->value( ) );
}
switch ( $error ) {
@ -234,22 +235,23 @@ class Ctrl_EditItem
$item = $items->get( $id );
$name = $this->form->field( 'name' );
if ( $name->value( ) === $item->name ) {
$description = $this->form->field( 'description' )->value( );
if ( $name->value( ) === $item->name && $description == $item->description ) {
return true;
}
$error = $items->rename( $id , $name->value( ) );
$error = $items->modify( $id , $name->value( ) , $description );
switch ( $error ) {
case 0:
return true;
case 1:
$name->putError( 'Ce nom n\'est pas unique' );
$name->putError( 'This name is not unique.' );
break;
default:
$name->putError( 'Une erreur inconnue s\'est produite (' . $error . ')' );
$name->putError( 'An unknown error occurred (' . $error . ')' );
break;
}

13
includes/t-items/page_controllers.inc.php
View file

@ -49,6 +49,12 @@ class Ctrl_AddItemForm
->setMandatory( false )
->setModifier( $locationField )
->setValidator( $locationField ) )
->addField( Loader::Create( 'Field' , 'description' , 'textarea' )
->setDescription( 'Description:' )
->setMandatory( false )
->setModifier( Loader::Create( 'Modifier_TrimString' ) )
->setValidator( Loader::Create( 'Validator_StringLength' ,
'This description' , 10 , null , true ) ) )
->addField( Loader::Create( 'Field' , 'from' , 'hidden' ) )
->addController( Loader::Ctrl( 'add_item' ) );
@ -269,6 +275,13 @@ class Ctrl_EditItemForm
->setModifier( Loader::Create( 'Modifier_TrimString' ) )
->setValidator( Loader::Create( 'Validator_StringLength' , 'This name' , 2 , 128 ) )
->setDefaultValue( $item->name ) )
->addField( Loader::Create( 'Field' , 'description' , 'textarea' )
->setDescription( 'Description:' )
->setMandatory( false )
->setModifier( Loader::Create( 'Modifier_TrimString' ) )
->setValidator( Loader::Create( 'Validator_StringLength' ,
'This description' , 10 , null , true ) )
->setDefaultValue( $item->description ) )
->addField( Loader::Create( 'Field' , 'id' , 'hidden' )
->setDefaultValue( $item->id ) )
->addController( Loader::Ctrl( 'edit_item' ) )

10
includes/t-items/views.inc.php
View file

@ -87,10 +87,18 @@ class View_ItemDetails
}
}
return HTML::make( 'dl' )
$details = HTML::make( 'dl' )
->appendElement( HTML::make( 'dt' )->appendText( 'Path:' ) )
->appendElement( HTML::make( 'dd' )
->setAttribute( 'style' , 'font-size: 10pt' )
->append( $contents ) );
if ( $this->item->description !== null ) {
$details->appendElement( HTML::make( 'dt' )->appendText( 'Description:' ) )
->appendElement( HTML::make( 'dd' )
->appendText( $this->item->description ) );
}
return $details;
}
}