Commit 1529a0cd authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

HasDescritpion pour les Niveau de maitrises

parent 6f14fe69

module/Application/src/Application/Entity/Db/MaitriseNiveau.php

+4 −21
Changes for module/Application/src/Application/Entity/Db/MaitriseNiveau.php: 4 added lines, 21 removed lines.
Original line number Diff line number Diff line
@@ -2,11 +2,14 @@ 


namespace Application\Entity\Db;



use Application\Entity\Db\Interfaces\HasDescriptionInterface;

use Application\Entity\Db\Traits\HasDescriptionTrait;

use UnicaenUtilisateur\Entity\HistoriqueAwareInterface;

use UnicaenUtilisateur\Entity\HistoriqueAwareTrait;



class MaitriseNiveau implements HistoriqueAwareInterface {

class MaitriseNiveau implements HistoriqueAwareInterface, HasDescriptionInterface {

    use HistoriqueAwareTrait;

    use HasDescriptionTrait;



    /** @var integer */

    private $id;
@@ -16,8 +19,6 @@ class MaitriseNiveau implements HistoriqueAwareInterface { 
    private $libelle;

    /** @var integer */

    private $niveau;

    /** @var string */

    private $description;



    /**

     * @return int
@@ -81,22 +82,4 @@ class MaitriseNiveau implements HistoriqueAwareInterface { 
        return $this;

    }



    /**

     * @return string|null

     */

    public function getDescription(): ?string

    {

        return $this->description;

    }



    /**

     * @param string|null $description

     * @return MaitriseNiveau

     */

    public function setDescription(?string $description): MaitriseNiveau

    {

        $this->description = $description;

        return $this;

    }



}
 
 No newline at end of file

module/Application/src/Application/Form/MaitriseNiveau/MaitriseNiveauForm.php

+4 −9
Changes for module/Application/src/Application/Form/MaitriseNiveau/MaitriseNiveauForm.php: 4 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Application\Form\MaitriseNiveau;



use Application\Form\HasDescription\HasDescriptionFieldset;

use Application\Service\MaitriseNiveau\MaitriseNiveauServiceAwareTrait;

use Zend\Form\Element\Button;

use Zend\Form\Element\Hidden;
@@ -69,16 +70,10 @@ class MaitriseNiveauForm extends Form { 
        ]);

        // description

        $this->add([

            'name' => 'description',

            'type' => 'textarea',

            'options' => [

                'label' => 'Description : ',

                'label_attributes' => [

                    'class' => 'control-label',

                ],

            ],

            'name' => 'HasDescription',

            'type' => HasDescriptionFieldset::class,

            'attributes' => [

                'class' => 'type2 form-control',

                'id' => 'description',

            ]

        ]);

        //type

module/Application/src/Application/Form/MaitriseNiveau/MaitriseNiveauHydrator.php

+2 −2
Changes for module/Application/src/Application/Form/MaitriseNiveau/MaitriseNiveauHydrator.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ class MaitriseNiveauHydrator implements HydratorInterface { 
        $data = [

            'libelle' => $object->getLibelle(),

            'niveau' => $object->getNiveau(),

            'description' => $object->getDescription(),

            'HasDescription' => ['description' => $object->getDescription()],

            'type' => $object->getType(),

        ];

        return $data;
@@ -32,7 +32,7 @@ class MaitriseNiveauHydrator implements HydratorInterface { 
        $libelle = (isset($data['libelle']) AND trim($data['libelle']) !== '')?trim($data['libelle']):null;

        $niveau = (isset($data['niveau']))?$data['niveau']:null;

        $type = (isset($data['type']))?$data['type']:null;

        $description = (isset($data['description']) AND trim($data['description']) !== '')?trim($data['description']):null;

        $description = (isset($data['HasDescription']) AND isset($data['HasDescription']['description']) && trim($data['HasDescription']['description']) != '')?trim($data['HasDescription']['description']):null;



        $object->setLibelle($libelle);

        $object->setType($type);