Commit 4e20aa6b authored by thomas.hamel's avatar thomas.hamel Committed by Thomas Hamel
Browse files

WIP: ajout du script sql de création des tables admissions

parent 288c9aab
Loading
Loading
Loading
Loading
+126 −0
Changes for module/Admission/Sql/admission.sql: 126 added lines, 0 removed lines.
Original line number Diff line number Diff line
create table admission_admission
(
    id                    bigserial                                                    not null
        primary key,
    etat_id               bigint,
    histo_createur_id     bigint                                                       not null REFERENCES utilisateur (id),
    histo_creation        timestamp default ('now'::text)::timestamp without time zone not null,
    histo_modificateur_id bigint REFERENCES utilisateur (id),
    histo_modification    timestamp,
    histo_destructeur_id  bigint REFERENCES utilisateur (id),
    histo_destruction     timestamp
);

create table admission_individu
(
    id                               bigserial                                                    not null
        primary key,
    admission_id                     bigint REFERENCES admission_admission (id),
    civilite                         varchar(5),
    nom_usuel                        varchar(60),
    nom_famille                      varchar(60),
    prenom                           varchar(60),
    prenom2                          varchar(60),
    prenom3                          varchar(60),
    date_naissance                   timestamp,
    ville_naissance                  varchar(60),
    nationalite                      varchar(128),
    pays_naissance_id                bigint REFERENCES pays (id),
    code_nationalite                 varchar(5),
    ine                              varchar(11),
    adresse_code_pays                varchar(5),
    adresse_ligne1_etage             varchar(45),
    adresse_ligne2_etage             varchar(45),
    adresse_ligne3_batiment          varchar(45),
    adresse_ligne3_bvoie             varchar(45),
    adresse_ligne4_complement        varchar(45),
    adresse_code_postal              bigint,
    adresse_code_commune             varchar(10),
    adresse_cp_ville_etrangere       varchar(10),
    numero_telephone1                varchar(20),
    numero_telephone2                varchar(20),
    courriel                         varchar(255),
    situation_handicap               boolean,
    niveau_etude                     boolean,
    intitule_du_diplome              varchar(128),
    annee_dobtention_diplome         integer,
    etablissement_dobtention_diplome varchar(128),
    type_diplome_autre               boolean,
    histo_createur_id                bigint                                                       not null REFERENCES utilisateur (id),
    histo_creation                   timestamp default ('now'::text)::timestamp without time zone not null,
    histo_modificateur_id            bigint REFERENCES utilisateur (id),
    histo_modification               timestamp,
    histo_destructeur_id             bigint REFERENCES utilisateur (id),
    histo_destruction                timestamp
);

create table admission_inscription
(
    id                    bigserial                                                    not null
        primary key,
    admission_id          bigint REFERENCES admission_admission (id),
    discipline_doctorat   varchar(60),
    composante_doctorat_id   bigint REFERENCES structure (id),
    ecole_doctorale_id       bigint REFERENCES ecole_doct (id),
    unite_recherche_id      bigint REFERENCES unite_rech (id),
    nom_directeur_these   varchar(60),
    nom_codirecteur_these varchar(60),
    titre_these           varchar(60),
    confidentialite       boolean,
    date_confidentialite  timestamp,
    co_tutelle            boolean,
    pays_co_tutelle       varchar(60),
    co_encadrement        boolean,
    co_direction          boolean,
    histo_createur_id     bigint                                                       not null REFERENCES utilisateur (id),
    histo_creation        timestamp default ('now'::text)::timestamp without time zone not null,
    histo_modificateur_id bigint REFERENCES utilisateur (id),
    histo_modification    timestamp,
    histo_destructeur_id  bigint REFERENCES utilisateur (id),
    histo_destruction     timestamp
);

create table admission_financement
(
    id                      bigserial                                                    not null
        primary key,
    admission_id            bigint REFERENCES admission_admission (id),
    contrat_doctoral        boolean,
    employeur_contrat       varchar(60),
    detail_contrat_doctoral varchar(1024),
    histo_createur_id       bigint                                                       not null REFERENCES utilisateur (id),
    histo_creation          timestamp default ('now'::text)::timestamp without time zone not null,
    histo_modificateur_id   bigint REFERENCES utilisateur (id),
    histo_modification      timestamp,
    histo_destructeur_id    bigint REFERENCES utilisateur (id),
    histo_destruction       timestamp
);

create table admission_type_validation
(
    id                    bigserial                                                    not null
        primary key,
    code                  varchar(50)                                                  not null,
    libelle               varchar(100),
    histo_createur_id     bigint                                                       not null REFERENCES utilisateur (id),
    histo_creation        timestamp default ('now'::text)::timestamp without time zone not null,
    histo_modificateur_id bigint REFERENCES utilisateur (id),
    histo_modification    timestamp,
    histo_destructeur_id  bigint REFERENCES utilisateur (id),
    histo_destruction     timestamp
);

create table admission_validation
(
    id                    bigserial                                                    not null
        primary key,
    admission_id          bigint REFERENCES admission_admission (id),
    type_validation_id    bigint                                                       not null REFERENCES admission_type_validation (id),
    individu_id           bigint                                                       not null REFERENCES utilisateur (id),
    histo_createur_id     bigint                                                       not null REFERENCES utilisateur (id),
    histo_creation        timestamp default ('now'::text)::timestamp without time zone not null,
    histo_modificateur_id bigint REFERENCES utilisateur (id),
    histo_modification    timestamp,
    histo_destructeur_id  bigint REFERENCES utilisateur (id),
    histo_destruction     timestamp
);
+2 −4
Changes for module/Admission/config/module.config.php: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -59,10 +59,8 @@ return array(
                        'validation',
                        'confirmer',
                        'annuler',
                        'addInformationsEtudiant',
                        'addInformationsInscription',
                        'addInformationsFinancement',
                        'addInformationsJustificatifs'
                        'etudiantEnregistrer',
                        'enregistrer'
                    ]
                ]
            ]
+40 −37
Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 40 added lines, 37 removed lines.
Original line number Diff line number Diff line
@@ -35,52 +35,53 @@ class AdmissionController extends AdmissionAbstractController {
            ->start(); // réinit du plugin et redirection vers la 1ère étape
    }

    public function etudiantEnregistrerAction(){
        $data = $this->multipageForm($this->getEtudiantForm())->getFormSessionData();
        $this->getEtudiantForm()->bindValues($data);
//        var_dump($data);

        $request = $this->getRequest();
//        var_dump($request->isPost());
        if ($request->isPost()) {
            $postData = $request->getPost();
            var_dump($postData); // Affichez les données pour déboguer
        }
    }

    public function etudiantAction(): Response|ViewModel
    {
        $this->getEtudiantForm()->get('etudiant')->setUrlPaysNationalite($this->url()->fromRoute('pays/rechercher-pays', [], [], true));
        $this->getEtudiantForm()->get('etudiant')->setUrlNationalite($this->url()->fromRoute('pays/rechercher-nationalite', [], [], true));
        $request = $this->getRequest();
        var_dump($request);
        die();
//        $response = $this->processMultipageForm($this->getEtudiantForm());
//        if ($response instanceof Response) {
//            return $response;
//        }
//
//        $response->setTemplate('admission/ajouter-etudiant');

        var_dump($this->params()->fromPost());

        var_dump($this->getEtudiantForm()->get('etudiant')->getHydrator());

        $response = $this->processMultipageForm($this->getEtudiantForm());
        $data = $this->multipageForm($this->getEtudiantForm())->getFormSessionData();
        $this->getEtudiantForm()->bindValues($data);

        /** @var IndividuHydrator $individuObject */
        $individuObject = $this->getEtudiantForm()->getObject();
        var_dump($data);

        try {
        /** @var Individu $individu */
            $individuData = $this->getEtudiantForm()->getData();
            $individu = $this->individuService->create($individuData);
        $individu = $this->getEtudiantForm()->get('etudiant')->populateValues($data["etudiant"]);
        var_dump($individu);
//        $event = $this->individuService->create($individu);

            var_dump("c'est good!");
        }
        catch (\Exception $e) {
            var_dump("ça a pas marché");
        var_dump($this->getEtudiantForm()->get('etudiant')->getObject());
        if ($response instanceof Response) {
            return $response;
        }
//        if ($request->isGet()) {
//            $data = $request->getPost();
//            var_dump($data);
//            $this->getEtudiantForm()->setData($data);
//            if (!$this->getEtudiantForm()->isValid()) {
//                var_dump("pas bon");
//                return $response;
//            }
//            var_dump("bon");
//        }

        $response->setTemplate('admission/ajouter-etudiant');

        return $response;
    }

    public function inscriptionAction(): Response|ViewModel
    {
//        var_dump($this->getRequest()->getPost()['inscription']['_nav']);
        var_dump($this->params()->fromPost());

        //Partie Informations sur l'inscription
        $this->getEtudiantForm()->get('inscription')->setUrlDirecteurThese($this->url()->fromRoute('utilisateur/rechercher-individu', [], ["query" => []], true));
        $this->getEtudiantForm()->get('inscription')->setUrlCoDirecteurThese($this->url()->fromRoute('utilisateur/rechercher-individu', [], ["query" => []], true));
@@ -149,14 +150,16 @@ class AdmissionController extends AdmissionAbstractController {
        return array('form' => $this->getEtudiantForm());
    }

//    public function ajouterEnregistrerAction()
//    {
//        $data = $this->multipageForm($this->getForm())->getFormSessionData();
//        // ...
//        // enregistrement en base de données (par exemple)
//        // ...
//        return $this->redirect()->toRoute('home');
//    }
    public function enregistrerAction()
    {
        $data = $this->multipageForm($this->getEtudiantForm())->getFormSessionData();
        var_dump($data);

        // ...
        // enregistrement en base de données (par exemple)
        // ...
        return "";
    }

    public function envoyerMailAction(): Response
    {
+176 −0
Changes for module/Admission/src/Admission/Entity/Db/Admission.php: 176 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php
namespace Admission\Entity\Db;

use Doctrine\Common\Collections\Collection;
use UnicaenApp\Entity\HistoriqueAwareInterface;
use UnicaenApp\Entity\HistoriqueAwareTrait;

@@ -18,6 +19,37 @@ class Admission implements HistoriqueAwareInterface{
     */
    private $id;

    /**
     * @var Collection
     */
    private $financements;

    /**
     * @var Collection
     */
    private $individus;

    /**
     * @var Collection
     */
    private $inscriptions;

    /**
     * @var Collection
     */
    private $validations;

    /**
     * Constructor
     */
    public function __construct()
    {
        $this->financements = new \Doctrine\Common\Collections\ArrayCollection();
        $this->individus = new \Doctrine\Common\Collections\ArrayCollection();
        $this->inscriptions = new \Doctrine\Common\Collections\ArrayCollection();
        $this->validations = new \Doctrine\Common\Collections\ArrayCollection();
    }

    /**
     * Set etatId.
     *
@@ -51,4 +83,148 @@ class Admission implements HistoriqueAwareInterface{
    {
        return $this->id;
    }

    /**
     * Add financement.
     *
     * @param Financement $financement
     *
     * @return Admission
     */
    public function addFinancement(Financement $financement)
    {
        $this->financements[] = $financement;

        return $this;
    }

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

    /**
     * Get financements.
     *
     * @return Collection
     */
    public function getFinancements()
    {
        return $this->financements;
    }

    /**
     * Add individu.
     *
     * @param Individu $individu
     *
     * @return Admission
     */
    public function addIndividu(Individu $individu)
    {
        $this->individus[] = $individu;

        return $this;
    }

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

    /**
     * Get individus.
     *
     * @return Collection
     */
    public function getIndividus()
    {
        return $this->individus;
    }

    /**
     * Add inscription.
     *
     * @param Inscription $inscription
     *
     * @return Admission
     */
    public function addInscription(Inscription $inscription)
    {
        $this->inscriptions[] = $inscription;

        return $this;
    }

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

    /**
     * Get inscriptions.
     *
     * @return Collection
     */
    public function getInscriptions()
    {
        return $this->inscriptions;
    }

    /**
     * Add validation.
     *
     * @param Validation $validation
     *
     * @return Admission
     */
    public function addValidation(Validation $validation)
    {
        $this->validations[] = $validation;

        return $this;
    }

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

    /**
     * Get validations.
     *
     * @return Collection
     */
    public function getValidations()
    {
        return $this->validations;
    }
}
+176 −0
Changes for module/Admission/src/Admission/Entity/Db/Admission.php~: 176 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php
namespace Admission\Entity\Db;

use Doctrine\Common\Collections\Collection;
use UnicaenApp\Entity\HistoriqueAwareInterface;
use UnicaenApp\Entity\HistoriqueAwareTrait;

@@ -18,6 +19,37 @@ class Admission implements HistoriqueAwareInterface{
     */
    private $id;

    /**
     * @var Collection
     */
    private $financements;

    /**
     * @var Collection
     */
    private $individus;

    /**
     * @var Collection
     */
    private $inscriptions;

    /**
     * @var Collection
     */
    private $validations;

    /**
     * Constructor
     */
    public function __construct()
    {
        $this->financements = new \Doctrine\Common\Collections\ArrayCollection();
        $this->individus = new \Doctrine\Common\Collections\ArrayCollection();
        $this->inscriptions = new \Doctrine\Common\Collections\ArrayCollection();
        $this->validations = new \Doctrine\Common\Collections\ArrayCollection();
    }

    /**
     * Set etatId.
     *
@@ -51,4 +83,148 @@ class Admission implements HistoriqueAwareInterface{
    {
        return $this->id;
    }

    /**
     * Add financement.
     *
     * @param Financement $financement
     *
     * @return Admission
     */
    public function addFinancement(Financement $financement)
    {
        $this->financements[] = $financement;

        return $this;
    }

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

    /**
     * Get financements.
     *
     * @return Collection
     */
    public function getFinancements()
    {
        return $this->financements;
    }

    /**
     * Add individu.
     *
     * @param Individu $individu
     *
     * @return Admission
     */
    public function addIndividu(Individu $individu)
    {
        $this->individus[] = $individu;

        return $this;
    }

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

    /**
     * Get individus.
     *
     * @return Collection
     */
    public function getIndividus()
    {
        return $this->individus;
    }

    /**
     * Add inscription.
     *
     * @param Inscription $inscription
     *
     * @return Admission
     */
    public function addInscription(Inscription $inscription)
    {
        $this->inscriptions[] = $inscription;

        return $this;
    }

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

    /**
     * Get inscriptions.
     *
     * @return Collection
     */
    public function getInscriptions()
    {
        return $this->inscriptions;
    }

    /**
     * Add validation.
     *
     * @param Validation $validation
     *
     * @return Admission
     */
    public function addValidation(Validation $validation)
    {
        $this->validations[] = $validation;

        return $this;
    }

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

    /**
     * Get validations.
     *
     * @return Collection
     */
    public function getValidations()
    {
        return $this->validations;
    }
}
Loading