Commit bb77abd1 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

Version fonctionnelle pour SyGal TEST

parent de04239d
Loading
Loading
Loading
Loading
+0 −29
Changes for module/Admission/src/Admission/Entity/Db/Etudiant.php: 0 added lines, 29 removed lines.
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ class Etudiant implements HistoriqueAwareInterface{
     */
    private $civilite;

    /**
     * @var Individu
     */
    private $individu;

    /**
     * @var string|null
     */
@@ -1065,28 +1060,4 @@ class Etudiant implements HistoriqueAwareInterface{
    {
        return $this->verificationEtudiant;
    }

    /**
     * Set individu.
     *
     * @param Individu|null $individu
     *
     * @return Etudiant
     */
    public function setIndividu(Individu $individu = null)
    {
        $this->individu = $individu;

        return $this;
    }

    /**
     * Get individu.
     *
     * @return Individu|null
     */
    public function getIndividu()
    {
        return $this->individu;
    }
}
+5 −5
Changes for module/Admission/src/Admission/Entity/Db/Mapping/Admission.Entity.Db.Etudiant.dcm.xml: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -50,11 +50,11 @@
            </join-columns>
        </many-to-one>

        <many-to-one field="individu" target-entity="Individu\Entity\Db\Individu">
            <join-columns>
                <join-column name="INDIVIDU_ID" referenced-column-name="ID"/>
            </join-columns>
        </many-to-one>
<!--        <many-to-one field="individu" target-entity="Individu\Entity\Db\Individu">-->
<!--            <join-columns>-->
<!--                <join-column name="INDIVIDU_ID" referenced-column-name="ID"/>-->
<!--            </join-columns>-->
<!--        </many-to-one>-->

        <many-to-one field="paysNaissance" target-entity="Application\Entity\Db\Pays">
            <join-columns>
+2 −5
Changes for module/Admission/src/Admission/Hydrator/Etudiant/EtudiantHydrator.php: 2 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -35,11 +35,8 @@ class EtudiantHydrator extends DoctrineObject

    public function hydrate(array $data, object $object): object
    {

//        $data["paysNaissance"] = empty($data["paysNaissance"]["id"]) ? null : $data["paysNaissance"]["id"];
        $data["paysNaissance"] = $data["paysNaissanceId"];
//        $data["nationalite"] = empty($data["nationalite"]["id"]) ? null : $data["nationalite"]["id"];
        $data["nationalite"] = $data["nationaliteId"];
        $data["paysNaissance"] = !empty($data["paysNaissanceId"]) ? $data["paysNaissanceId"] : null;
        $data["nationalite"] = !empty($data["nationaliteId"]) ? $data["nationaliteId"] : null;
        $data["adresseCodePostal"] = empty($data["adresseCodePostal"]) ? null : $data["adresseCodePostal"];

        //Si la case niveauEtude n'est pas le diplôme national, on met à null les valeurs des champs reliés