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

Remise en ordre WIP

parent a25ea0ad
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -17,11 +17,10 @@ use Application\Service\Activite\ActiviteServiceAwareTrait;
use Application\Service\Agent\AgentServiceAwareTrait;
use Application\Service\Competence\CompetenceServiceAwareTrait;
use Application\Service\CompetenceElement\CompetenceElementServiceAwareTrait;
use Application\Service\CompetenceMaitrise\CompetenceMaitriseServiceAwareTrait;
use Application\Service\MaitriseNiveau\MaitriseNiveauServiceAwareTrait;
use Application\Service\CompetenceTheme\CompetenceThemeServiceAwareTrait;
use Application\Service\CompetenceType\CompetenceTypeServiceAwareTrait;
use Application\Service\FicheMetier\FicheMetierServiceAwareTrait;
use Application\Service\MaitriseNiveau\MaitriseNiveauServiceAwareTrait;
use Zend\Http\Request;
use Zend\Mvc\Controller\AbstractActionController;
use Zend\View\Model\ViewModel;
+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@

namespace Application\Controller;

use Application\Form\SelectionCompetenceMaitrise\SelectionCompetenceMaitriseFormAwareTrait;
use Application\Form\SelectionMaitriseNiveau\SelectionMaitriseNiveauFormAwareTrait;
use Application\Service\ApplicationElement\ApplicationElementServiceAwareTrait;
use Application\Service\CompetenceElement\CompetenceElementServiceAwareTrait;
use Formation\Service\FormationElement\FormationElementServiceAwareTrait;
@@ -14,7 +14,7 @@ class ElementController extends AbstractActionController {
    use ApplicationElementServiceAwareTrait;
    use CompetenceElementServiceAwareTrait;
    use FormationElementServiceAwareTrait;
    use SelectionCompetenceMaitriseFormAwareTrait;
    use SelectionMaitriseNiveauFormAwareTrait;

    const TYPE_APPLICATION = 'Application';
    const TYPE_COMPETENCE = 'Competence';
@@ -104,7 +104,7 @@ class ElementController extends AbstractActionController {
                break;
        }

        $form = $this->getSelectionCompetenceMaitriseForm();
        $form = $this->getSelectionMaitriseNiveauForm();
        $form->setAttribute('action', $this->url()->fromRoute('element/changer-niveau', ['type' => $elementType, 'id' => $element->getId(), 'clef' => $clef], [], true));
        $form->bind($element);
        if ($clef === 'masquer') $form->masquerClef();
+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@

namespace Application\Controller;

use Application\Form\SelectionCompetenceMaitrise\SelectionCompetenceMaitriseForm;
use Application\Form\SelectionMaitriseNiveau\SelectionMaitriseNiveauForm;
use Application\Service\ApplicationElement\ApplicationElementService;
use Application\Service\CompetenceElement\CompetenceElementService;
use Formation\Service\FormationElement\FormationElementService;
@@ -26,15 +26,15 @@ class ElementControllerFactory {
        $formationElementService = $container->get(FormationElementService::class);

        /**
         * @var SelectionCompetenceMaitriseForm $selectionMaitriseForm
         * @var SelectionMaitriseNiveauForm $selectionMaitriseForm
         */
        $selectionMaitriseForm = $container->get('FormElementManager')->get(SelectionCompetenceMaitriseForm::class);
        $selectionMaitriseForm = $container->get('FormElementManager')->get(SelectionMaitriseNiveauForm::class);

        $controller = new ElementController();
        $controller->setApplicationElementService($applicationElementService);
        $controller->setCompetenceElementService($competenceElementService);
        $controller->setFormationElementService($formationElementService);
        $controller->setSelectionCompetenceMaitriseForm($selectionMaitriseForm);
        $controller->setSelectionMaitriseNiveauForm($selectionMaitriseForm);
        return $controller;
    }
}
 No newline at end of file
+3 −4
Original line number Diff line number Diff line
@@ -3,17 +3,16 @@
namespace Application\Form\ApplicationElement;

use Application\Service\Application\ApplicationServiceAwareTrait;
use Application\Service\CompetenceMaitrise\CompetenceMaitriseServiceAwareTrait;
use Application\Service\MaitriseNiveau\MaitriseNiveauServiceAwareTrait;
use Zend\Form\Element\Button;
use Zend\Form\Element\Checkbox;
use Zend\Form\Element\Number;
use Zend\Form\Element\Select;
use Zend\Form\Form;
use Zend\InputFilter\Factory;

class ApplicationElementForm extends Form {
    use ApplicationServiceAwareTrait;
    use CompetenceMaitriseServiceAwareTrait;
    use MaitriseNiveauServiceAwareTrait;

    public function init()
    {
@@ -45,7 +44,7 @@ class ApplicationElementForm extends Form {
                    'class' => 'control-label',
                ],
                'empty_option' => "Sélectionner un niveau ... ",
                'value_options' => $this->getCompetenceMaitriseService()->getCompetencesMaitrisesAsOptions(),
                'value_options' => $this->getMaitriseNiveauService()->getMaitrisesNiveauxAsOptions("Application"),
            ],
            'attributes' => [
                'id'                => 'niveau',
+4 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
namespace Application\Form\ApplicationElement;

use Application\Service\Application\ApplicationService;
use Application\Service\CompetenceMaitrise\CompetenceMaitriseService;
use Application\Service\MaitriseNiveau\MaitriseNiveauService;
use Interop\Container\ContainerInterface;

class ApplicationElementFormFactory {
@@ -16,10 +16,10 @@ class ApplicationElementFormFactory {
    {
        /**
         * @var ApplicationService $applicationService
         * @var CompetenceMaitriseService $competenceMaitriseService
         * @var MaitriseNiveauService $MaitriseNiveauService
         */
        $applicationService = $container->get(ApplicationService::class);
        $competenceMaitriseService = $container->get(CompetenceMaitriseService::class);
        $MaitriseNiveauService = $container->get(MaitriseNiveauService::class);

        /** @var ApplicationElementHydrator $hydrator */
        $hydrator = $container->get('HydratorManager')->get(ApplicationElementHydrator::class);
@@ -27,7 +27,7 @@ class ApplicationElementFormFactory {
        /** @var ApplicationElementForm $form */
        $form = new ApplicationElementForm();
        $form->setApplicationService($applicationService);
        $form->setCompetenceMaitriseService($competenceMaitriseService);
        $form->setMaitriseNiveauService($MaitriseNiveauService);
        $form->setHydrator($hydrator);
        return $form;
    }
Loading