From 83cc04989801ff4bf2a046b538fcdc768335c9d7 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr> Date: Tue, 10 Oct 2023 15:15:00 +0200 Subject: [PATCH] Oubli --- .../Entity/Db/FormulaireInstance.php | 25 ------------------- ...oform.Entity.Db.FormulaireInstance.dcm.xml | 2 -- .../Formulaire/FormulaireInstanceService.php | 2 +- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/src/UnicaenAutoform/Entity/Db/FormulaireInstance.php b/src/UnicaenAutoform/Entity/Db/FormulaireInstance.php index 32ca29b..21d25d7 100644 --- a/src/UnicaenAutoform/Entity/Db/FormulaireInstance.php +++ b/src/UnicaenAutoform/Entity/Db/FormulaireInstance.php @@ -57,31 +57,6 @@ class FormulaireInstance implements HistoriqueAwareInterface { $this->reponses->removeElement($reponse); } - /** @return Validation[] */ - public function getValidations(): array - { - return $this->validations->toArray(); - } - - public function getValidationByType(?string $type): ?Validation - { - /** @var Validation $validation */ - foreach($this->validations as $validation) { - if ($validation->getHistoDestruction() === null && $validation->getType() === $type) return $validation; - } - return null; - } - - public function addValidation(Validation $validation): void - { - $this->validations->add($validation); - } - - public function removeValidation(Validation $validation): void - { - $this->validations->removeElement($validation); - } - public function getChamp(?int $to): ?Champ { foreach ($this->getFormulaire()->getCategories() as $categorie) { diff --git a/src/UnicaenAutoform/Entity/Db/Mapping/UnicaenAutoform.Entity.Db.FormulaireInstance.dcm.xml b/src/UnicaenAutoform/Entity/Db/Mapping/UnicaenAutoform.Entity.Db.FormulaireInstance.dcm.xml index f297fa6..1bd18a6 100644 --- a/src/UnicaenAutoform/Entity/Db/Mapping/UnicaenAutoform.Entity.Db.FormulaireInstance.dcm.xml +++ b/src/UnicaenAutoform/Entity/Db/Mapping/UnicaenAutoform.Entity.Db.FormulaireInstance.dcm.xml @@ -9,9 +9,7 @@ <many-to-one target-entity="UnicaenAutoform\Entity\Db\Formulaire" field="formulaire"> <join-column name="formulaire" referenced-column-name="id"/> </many-to-one> - <one-to-many target-entity="UnicaenAutoform\Entity\Db\FormulaireReponse" mapped-by="instance" field="reponses"/> - <one-to-many target-entity="UnicaenAutoform\Entity\Db\Validation" mapped-by="instance" field="validations"/> <field name="histoCreation" type="datetime" column="histo_creation" nullable="false"/> <field name="histoModification" type="datetime" column="histo_modification" nullable="false"/> diff --git a/src/UnicaenAutoform/Service/Formulaire/FormulaireInstanceService.php b/src/UnicaenAutoform/Service/Formulaire/FormulaireInstanceService.php index 1f660a4..a926d96 100644 --- a/src/UnicaenAutoform/Service/Formulaire/FormulaireInstanceService.php +++ b/src/UnicaenAutoform/Service/Formulaire/FormulaireInstanceService.php @@ -106,7 +106,7 @@ class FormulaireInstanceService { ->addSelect('categorie')->join('formulaire.categories', 'categorie') ->addSelect('champ')->join('categorie.champs', 'champ') ->addSelect('reponse')->leftJoin('formulaire_instance.reponses', 'reponse') - ->addSelect('validation')->leftJoin('formulaire_instance.validations', 'validation'); + ; } catch (NotSupported $e) { throw new RuntimeException("Un problème est survnu lors de la creation du QueryBuilder de [".FormulaireInstance::class."]",0,$e); } -- GitLab