From 12a8cebf9d87eb043c8bfb715301d2bfc6388892 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr>
Date: Tue, 24 Oct 2023 16:15:55 +0200
Subject: [PATCH] Modification validation
---
.../ValidationInstanceFormAwareTrait.php | 16 +++++-----------
.../ValidationInstanceService.php | 5 +++--
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/UnicaenValidation/Form/ValidationInstance/ValidationInstanceFormAwareTrait.php b/src/UnicaenValidation/Form/ValidationInstance/ValidationInstanceFormAwareTrait.php
index e5d81b5..d3b9c70 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 3c089b7..3a8a5ce 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);
}
--
GitLab