diff --git a/src/UnicaenValidation/Form/ValidationInstance/ValidationInstanceFormAwareTrait.php b/src/UnicaenValidation/Form/ValidationInstance/ValidationInstanceFormAwareTrait.php index e5d81b5d0fb258339f0e55379496a7d3490f77ed..d3b9c707a97faeb443a18d5c15a1736c38243574 100644 --- a/src/UnicaenValidation/Form/ValidationInstance/ValidationInstanceFormAwareTrait.php +++ b/src/UnicaenValidation/Form/ValidationInstance/ValidationInstanceFormAwareTrait.php @@ -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 diff --git a/src/UnicaenValidation/Service/ValidationInstance/ValidationInstanceService.php b/src/UnicaenValidation/Service/ValidationInstance/ValidationInstanceService.php index 3c089b791cee4d0df083f68e9566a4cd20853ded..3a8a5cef3a87597b066dec8d826aa38ae9017ff2 100644 --- a/src/UnicaenValidation/Service/ValidationInstance/ValidationInstanceService.php +++ b/src/UnicaenValidation/Service/ValidationInstance/ValidationInstanceService.php @@ -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); }