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

Modification validation

parent b98c4a42

src/UnicaenValidation/Form/ValidationInstance/ValidationInstanceFormAwareTrait.php

+5 −11
Original line number Diff line number Diff line
@@ -4,22 +4,16 @@ namespace UnicaenValidation\Form\ValidationInstance; 


trait ValidationInstanceFormAwareTrait {



    private ValidationInstanceForm $validationInstancForm;

    private ValidationInstanceForm $validationInstanceForm;



    /**

     * @return ValidationInstanceForm

     */

    public function getValidationInstancForm() : ValidationInstanceForm

    public function getValidationInstanceForm() : ValidationInstanceForm

    {

        return $this->validationInstancForm;

        return $this->validationInstanceForm;

    }



    /**

     * @param ValidationInstanceForm $validationInstancForm

     */

    public function setValidationInstancForm(ValidationInstanceForm $validationInstancForm) : void

    public function setValidationInstanceForm(ValidationInstanceForm $validationInstanceForm) : void

    {

        $this->validationInstancForm = $validationInstancForm;

        $this->validationInstanceForm = $validationInstanceForm;

    }



}
 
 No newline at end of file

src/UnicaenValidation/Service/ValidationInstance/ValidationInstanceService.php

+3 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ class ValidationInstanceService { 
        return $instance;

    }



    public function setValidationActive(HasValidationsInterface $element, string $code, ?string $justification = null) : HasValidationsInterface

    public function setValidationActive(HasValidationsInterface $element, string $code, bool $refus = false, ?string $justification = null) : HasValidationsInterface

    {

        //historisation de l'état actif actuel (s'il existe)

        $validationActive = $element->getValidationActiveByTypeCode($code);
@@ -235,12 +235,13 @@ class ValidationInstanceService { 
        }



        //creation de la nouvelle instance

        $validation = $this->createWithCode($code, $justification !== null,  $justification);

        $validation = $this->createWithCode($code, $refus,  $justification);



        //ajout à l'element et persist

        $element->addValidation($validation);

        try {

            $this->getEntityManager()->persist($element);

            $this->getEntityManager()->flush($element);

        } catch (ORMException $e) {

            throw new RuntimeException("Un problème est survenu lors de l'ajout de  actif de [".get_class($element)."]",0,$e);

        }