Commit 4d46b7e6 authored by Bertrand Gauthier's avatar Bertrand Gauthier Committed by Thomas Hamel
Browse files

WIP fix mapping

parent 0ee1d26d
Loading
Loading
Loading
Loading
+37 −52
Changes for module/Admission/src/Admission/Entity/Db/Admission.php: 37 added lines, 52 removed lines.
Original line number Diff line number Diff line
@@ -88,105 +88,90 @@ class Admission implements HistoriqueAwareInterface{

    /**
     * Add financement.
     *
     * @param Financement $financement
     *
     * @return Admission
     */
    public function addFinancement(Financement $financement): Admission
    public function addFinancement(Collection $financements): Admission
    {
        $this->financement[] = $financement;
        foreach ($financements as $f) {
            $this->financement->add($f);
        }

        return $this;
    }

    /**
     * Remove financement.
     *
     * @param Financement $financement
     *
     * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
     * Remove financements.
     */
    public function removeFinancement(Financement $financement): bool
    public function removeFinancement(Collection $financements): void
    {
        return $this->financement->removeElement($financement);
        foreach ($financements as $f) {
            $this->financement->removeElement($f);
        }
    }

    /**
     * Add individu.
     *
     * @param Individu $individu
     *
     * @return Admission
     */
    public function addIndividu(Individu $individu): Admission
    public function addIndividu(Collection $individus): Admission
    {
        $this->individu[] = $individu;
        foreach ($individus as $i) {
            $this->individu->add($i);
        }

        return $this;
    }

    /**
     * Remove individu.
     *
     * @param Individu $individu
     *
     * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
     * Remove individus.
     */
    public function removeIndividu(Individu $individu)
    public function removeIndividu(Collection $individus): void
    {
        return $this->individu->removeElement($individu);
        foreach ($individus as $i) {
            $this->individu->removeElement($i);
        }
    }

    /**
     * Add inscription.
     *
     * @param Inscription $inscription
     *
     * @return Admission
     * Add inscriptions.
     */
    public function addInscription(Inscription $inscription): Admission
    public function addInscription(Collection $inscriptions): Admission
    {
        $this->inscription[] = $inscription;
        foreach ($inscriptions as $i) {
            $this->inscription->add($i);
        }

        return $this;
    }

    /**
     * Remove inscription.
     *
     * @param Inscription $inscription
     *
     * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
     * Remove inscriptions.
     */
    public function removeInscription(Inscription $inscription): bool
    public function removeInscription(Collection $inscriptions): void
    {
        return $this->inscription->removeElement($inscription);
        foreach ($inscriptions as $i) {
            $this->inscription->removeElement($i);
        }
    }

    /**
     * Add validation.
     *
     * @param Validation $validation
     *
     * @return Admission
     */
    public function addValidation(Validation $validation)
    public function addValidation(Collection $validations): self
    {
        $this->validation[] = $validation;
        foreach ($validations as $v) {
            $this->validation->add($v);
        }

        return $this;
    }

    /**
     * Remove validation.
     *
     * @param Validation $validation
     *
     * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
     */
    public function removeValidation(Validation $validation)
    public function removeValidation(Collection $validations): void
    {
        return $this->validation->removeElement($validation);
        foreach ($validations as $v) {
            $this->validation->removeElement($v);
        }
    }

    /**
+1 −0
Changes for module/Admission/src/Admission/Form/Admission/AdmissionForm.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Admission\Form\Fieldset\Etudiant\EtudiantFieldset;
use Admission\Form\Fieldset\Financement\FinancementFieldset;
use Admission\Form\Fieldset\Inscription\InscriptionFieldset;
use Admission\Form\Fieldset\Validation\ValidationFieldset;
use Laminas\Form\Element\Collection;
use UnicaenApp\Form\Fieldset\MultipageFormNavFieldset;
use UnicaenApp\Form\MultipageForm;

+12 −19
Changes for module/Admission/src/Admission/Hydrator/AdmissionHydrator.php: 12 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -22,25 +22,18 @@ class AdmissionHydrator extends DoctrineObject

    public function hydrate(array $data, object $object): object
    {
//        if (isset($data['inscription'])) {
//            $data['inscriptions'][] = $data['inscription'];
//            unset($data['inscription']);
//        }
//
//        if (isset($data['financement'])) {
//            $data['financements'][] = $data['financement'];
//            unset($data['financement']);
//        }
//
//        if (isset($data['individu'])) {
//            $data['individus'][] = $data['individu'];
//            unset($data['individu']);
//        }
//
//        if (isset($data['validation'])) {
//            $data['validations'][] = $data['validation'];
//            unset($data['validation']);
//        }
        if (isset($data['inscription']) && !is_array($data['inscription'])) {
            $data['inscription'] = [$data['inscription']];
        }
        if (isset($data['financement']) && !is_array($data['financement'])) {
            $data['financement'] = [$data['financement']];
        }
        if (isset($data['individu']) && !is_array($data['individu'])) {
            $data['individu'] = [$data['individu']];
        }
        if (isset($data['validation']) && !is_array($data['validation'])) {
            $data['validation'] = [$data['validation']];
        }

        return parent::hydrate($data, $object);
    }