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

Polishing

parent 3275121a

module/Carriere/config/merged/niveau.config.php

+0 −6
Original line number Diff line number Diff line
@@ -4,10 +4,6 @@ namespace Carriere; 


use Carriere\Controller\NiveauController;

use Carriere\Controller\NiveauControllerFactory;

use Carriere\Form\ModifierNiveau\ModifierNiveauForm;

use Carriere\Form\ModifierNiveau\ModifierNiveauFormFactory;

use Carriere\Form\ModifierNiveau\ModifierNiveauHydrator;

use Carriere\Form\ModifierNiveau\ModifierNiveauHydratorFactory;

use Carriere\Form\Niveau\NiveauForm;

use Carriere\Form\Niveau\NiveauFormFactory;

use Carriere\Form\Niveau\NiveauHydrator;
@@ -188,14 +184,12 @@ return [ 
    ],

    'form_elements' => [

        'factories' => [

            ModifierNiveauForm::class => ModifierNiveauFormFactory::class,

            NiveauForm::class => NiveauFormFactory::class,

            NiveauEnveloppeForm::class => NiveauEnveloppeFormFactory::class,

        ],

    ],

    'hydrators' => [

        'factories' => [

            ModifierNiveauHydrator::class => ModifierNiveauHydratorFactory::class,

            NiveauHydrator::class => NiveauHydratorFactory::class,

            NiveauEnveloppeHydrator::class => NiveauEnveloppeHydratorFactory::class,

        ],

module/Carriere/src/Carriere/Entity/Db/Grade.php

+1 −2
Original line number Diff line number Diff line
@@ -86,8 +86,7 @@ class Grade implements HasPeriodeInterface { 


    public function generateTooltip() : string

    {

        $text  = "";

        $text .= "Libelle court : <strong>". $this->getLibelleCourt() . "</strong>";

        $text  = "Libelle court : <strong>". $this->getLibelleCourt() . "</strong>";

        $text .= "<br/>";

        $text .= "Libelle long : <strong>". $this->getLibelleLong() . "</strong>";

        $text .= "<br/>";

module/Carriere/src/Carriere/Form/ModifierNiveau/ModifierNiveauForm.php

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
<?php



namespace Carriere\Form\ModifierNiveau;



use Carriere\Service\Niveau\NiveauServiceAwareTrait;

use Laminas\Form\Element\Button;

use Laminas\Form\Element\Select;

use Laminas\Form\Form;

use Laminas\InputFilter\Factory;



class ModifierNiveauForm extends Form {

    use NiveauServiceAwareTrait;



    public function init()

    {

        //niveau :: number

        $this->add([

            'type' => Select::class,

            'name' => 'niveau',

            'options' => [

                'label' => "Niveau :",

                'empty_option' => "Sélectionner un niveau",

                'value_options' => $this->getNiveauService()->getNiveauxAsOptions(),

            ],

            'attributes' => [

                'id' => 'niveau',

            ],

        ]);

        //button

        $this->add([

            'type' => Button::class,

            'name' => 'creer',

            'options' => [

                'label' => '<i class="fas fa-save"></i> Enregistrer',

                'label_options' => [

                    'disable_html_escape' => true,

                ],

            ],

            'attributes' => [

                'type' => 'submit',

                'class' => 'btn btn-primary',

            ],

        ]);



        $this->setInputFilter((new Factory())->createInputFilter([

            'niveau'             => [ 'required' => false,  ],

        ]));

    }

}
 
 No newline at end of file

module/Carriere/src/Carriere/Form/ModifierNiveau/ModifierNiveauFormAwareTrait.php

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<?php



namespace Carriere\Form\ModifierNiveau;



trait ModifierNiveauFormAwareTrait {



    /** @var ModifierNiveauForm */

    private $modifierNiveauForm;



    /**

     * @return ModifierNiveauForm

     */

    public function getModifierNiveauForm()

    {

        return $this->modifierNiveauForm;

    }



    /**

     * @param ModifierNiveauForm $modifierNiveauForm

     * @return ModifierNiveauFormAwareTrait

     */

    public function setModifierNiveauForm($modifierNiveauForm)

    {

        $this->modifierNiveauForm = $modifierNiveauForm;

        return $this;

    }



}
 
 No newline at end of file

module/Carriere/src/Carriere/Form/ModifierNiveau/ModifierNiveauFormFactory.php

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<?php



namespace Carriere\Form\ModifierNiveau;



use Carriere\Service\Niveau\NiveauService;

use Interop\Container\ContainerInterface;



class ModifierNiveauFormFactory

{

    /**

     * @param ContainerInterface $container

     * @return ModifierNiveauForm

     */

    public function __invoke(ContainerInterface $container)

    {

        /** @var NiveauService $niveauService */

        $niveauService = $container->get(NiveauService::class);



        /** @var ModifierNiveauHydrator $hydrator */

        $hydrator = $container->get('HydratorManager')->get(ModifierNiveauHydrator::class);



        /** @var ModifierNiveauForm $form */

        $form = new ModifierNiveauForm();

        $form->setNiveauService($niveauService);

        $form->setHydrator($hydrator);

        return $form;

    }

}
 
 No newline at end of file