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

Ajout des colonnes gaethan ici en attendant de faire mieux ...

parent 0042ca8e
No related branches found
No related tags found
No related merge requests found
Pipeline #22894 passed
...@@ -65,6 +65,7 @@ class FormulaireInstance implements HistoriqueAwareInterface { ...@@ -65,6 +65,7 @@ class FormulaireInstance implements HistoriqueAwareInterface {
public function getValidationByType(?string $type): ?Validation public function getValidationByType(?string $type): ?Validation
{ {
/** @var Validation $validation */
foreach($this->validations as $validation) { foreach($this->validations as $validation) {
if ($validation->getHistoDestruction() === null && $validation->getType() === $type) return $validation; if ($validation->getHistoDestruction() === null && $validation->getType() === $type) return $validation;
} }
......
...@@ -30,5 +30,9 @@ ...@@ -30,5 +30,9 @@
<many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur"> <many-to-one target-entity="UnicaenUtilisateur\Entity\Db\User" field="histoDestructeur">
<join-column name="histo_destructeur_id" referenced-column-name="ID"/> <join-column name="histo_destructeur_id" referenced-column-name="ID"/>
</many-to-one> </many-to-one>
<field name="complement" column="complement" type="string" length="9999" nullable="true" />
<field name="informations" column="informations" type="string" length="9999" nullable="true" />
<field name="differences" column="differences" type="string" length="9999" nullable="true" />
</entity> </entity>
</doctrine-mapping> </doctrine-mapping>
\ No newline at end of file
...@@ -23,6 +23,10 @@ class Validation implements HistoriqueAwareInterface ...@@ -23,6 +23,10 @@ class Validation implements HistoriqueAwareInterface
private ?FormulaireInstance $reference = null; private ?FormulaireInstance $reference = null;
private Collection $reponses; private Collection $reponses;
private ?string $complement = null;
private ?string $differences = null;
private ?string $informations = null;
public function __construct() public function __construct()
{ {
$this->reponses = new ArrayCollection(); $this->reponses = new ArrayCollection();
...@@ -95,4 +99,36 @@ class Validation implements HistoriqueAwareInterface ...@@ -95,4 +99,36 @@ class Validation implements HistoriqueAwareInterface
$this->reference = $reference; $this->reference = $reference;
} }
public function getComplement(): ?string
{
return $this->complement;
}
public function setComplement(?string $complement): void
{
$this->complement = $complement;
}
public function getDifferences(): ?string
{
return $this->differences;
}
public function setDifferences(?string $differences): void
{
$this->differences = $differences;
}
public function getInformations(): ?string
{
return $this->informations;
}
public function setInformations(?string $informations): void
{
$this->informations = $informations;
}
} }
\ No newline at end of file
...@@ -104,7 +104,8 @@ class FormulaireInstanceService { ...@@ -104,7 +104,8 @@ class FormulaireInstanceService {
->addSelect('formulaire')->join('formulaire_instance.formulaire', 'formulaire') ->addSelect('formulaire')->join('formulaire_instance.formulaire', 'formulaire')
->addSelect('categorie')->join('formulaire.categories', 'categorie') ->addSelect('categorie')->join('formulaire.categories', 'categorie')
->addSelect('champ')->join('categorie.champs', 'champ') ->addSelect('champ')->join('categorie.champs', 'champ')
->addSelect('reponse')->leftJoin('formulaire_instance.reponses', 'reponse'); ->addSelect('reponse')->leftJoin('formulaire_instance.reponses', 'reponse')
->addSelect('validation')->leftJoin('formulaire_instance.validations', 'validation');
} catch (NotSupported $e) { } catch (NotSupported $e) {
throw new RuntimeException("Un problème est survnu lors de la creation du QueryBuilder de [".FormulaireInstance::class."]",0,$e); throw new RuntimeException("Un problème est survnu lors de la creation du QueryBuilder de [".FormulaireInstance::class."]",0,$e);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment