Skip to content
Snippets Groups Projects
Commit 12a8cebf authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Modification validation

parent b98c4a42
Branches
Tags
No related merge requests found
Pipeline #24027 passed
...@@ -4,22 +4,16 @@ namespace UnicaenValidation\Form\ValidationInstance; ...@@ -4,22 +4,16 @@ namespace UnicaenValidation\Form\ValidationInstance;
trait ValidationInstanceFormAwareTrait { trait ValidationInstanceFormAwareTrait {
private ValidationInstanceForm $validationInstancForm; private ValidationInstanceForm $validationInstanceForm;
/** public function getValidationInstanceForm() : ValidationInstanceForm
* @return ValidationInstanceForm
*/
public function getValidationInstancForm() : ValidationInstanceForm
{ {
return $this->validationInstancForm; return $this->validationInstanceForm;
} }
/** public function setValidationInstanceForm(ValidationInstanceForm $validationInstanceForm) : void
* @param ValidationInstanceForm $validationInstancForm
*/
public function setValidationInstancForm(ValidationInstanceForm $validationInstancForm) : void
{ {
$this->validationInstancForm = $validationInstancForm; $this->validationInstanceForm = $validationInstanceForm;
} }
} }
\ No newline at end of file
...@@ -226,7 +226,7 @@ class ValidationInstanceService { ...@@ -226,7 +226,7 @@ class ValidationInstanceService {
return $instance; 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) //historisation de l'état actif actuel (s'il existe)
$validationActive = $element->getValidationActiveByTypeCode($code); $validationActive = $element->getValidationActiveByTypeCode($code);
...@@ -235,12 +235,13 @@ class ValidationInstanceService { ...@@ -235,12 +235,13 @@ class ValidationInstanceService {
} }
//creation de la nouvelle instance //creation de la nouvelle instance
$validation = $this->createWithCode($code, $justification !== null, $justification); $validation = $this->createWithCode($code, $refus, $justification);
//ajout à l'element et persist //ajout à l'element et persist
$element->addValidation($validation); $element->addValidation($validation);
try { try {
$this->getEntityManager()->persist($element); $this->getEntityManager()->persist($element);
$this->getEntityManager()->flush($element);
} catch (ORMException $e) { } catch (ORMException $e) {
throw new RuntimeException("Un problème est survenu lors de l'ajout de actif de [".get_class($element)."]",0,$e); throw new RuntimeException("Un problème est survenu lors de l'ajout de actif de [".get_class($element)."]",0,$e);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment