diff --git a/src/UnicaenAutoform/Entity/Db/FormulaireInstance.php b/src/UnicaenAutoform/Entity/Db/FormulaireInstance.php index 32ca29b2038356c0a7380fe14664b8e5200f7c39..21d25d7b468dbbe9de9663c8b79dd495fb5b16af 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 f297fa6c964c063eb5e2c8d3686b93177a4b5479..1bd18a68c14a22cbae572f61a8047db9c4a75961 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 1f660a44316be7994a7fe190fdce956b6bbbcb87..a926d96cef8794bc3de01fa46f7d29a3bd7b9128 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); }