Commit 37f2e4a2 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

Modif du sql

parent 8e4f9f3d
Loading
Loading
Loading
Loading
+156 −137
Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 156 added lines, 137 removed lines.
Original line number Diff line number Diff line
@@ -144,6 +144,159 @@ class AdmissionController extends AdmissionAbstractController {
        /** @var Admission $admission */
        $admission = $this->getAdmission();

        //Enregistrement des informations de l'Etudiant
        $this->enregistrerEtudiant($data, $admission);

        $this->getAdmissionForm()->bind($admission);

        if ($response instanceof Response) {
            return $response;
        }

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

        return $response;
    }

    public function financementAction() : Response|ViewModel
    {
        $response = $this->processMultipageForm($this->getAdmissionForm());
        $data = $this->multipageForm($this->getAdmissionForm())->getFormSessionData();

        /** @var Admission $admission */
        $admission = $this->getAdmission();

        if(!empty($admission)) {
            $this->getAdmissionForm()->bind($admission);
            //Enregistrement des informations concernant l'inscription
            $this->enregistrerInscription($data, $admission);
        }

        if ($response instanceof Response) {
            return $response;
        }

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

        return $response;
    }


    public function validationAction(): Response|ViewModel
    {
        $response = $this->processMultipageForm($this->getAdmissionForm());
        $data = $this->multipageForm($this->getAdmissionForm())->getFormSessionData();

        /** @var Admission $admission */
        $admission = $this->getAdmission();

        if(!empty($admission)){
            $this->getAdmissionForm()->bind($admission);
            //Enregistrement des informations de Financement
            $this->enregistrerFinancement($data, $admission);
        }

        if ($response instanceof Response) {
            return $response;
        }

        $response->setVariable('dataForm', $data);
        $response->setTemplate('admission/ajouter-validation');

        return $response;
    }

    public function annulerAction(): Response
    {
        $this->multipageForm()->clearSession();

        // todo: fournir une page de demande de confirmation d'annulation via le plugin multipageForm() ?
        return $this->redirect()->toRoute('admission/ajouter/etudiant');
    }

    public function confirmerAction()
    {
        $response = $this->processMultipageForm($this->getAdmissionForm());
        $data = $this->multipageForm($this->getAdmissionForm())->getFormSessionData();

        /** @var Admission $admission */
        $admission = $this->getAdmission();

        if(!empty($admission)){
            //Enregistrement des Documents ajoutéss
            $this->enregistrerDocument($data);
        }

        if ($response instanceof Response) {
            return $response;
        }

        $response->setVariable('dataForm', $data);
        $response->setTemplate('admission/ajouter-confirmer');

        return $response;
    }

    public function enregistrerAction()
    {
        $response = $this->processMultipageForm($this->getAdmissionForm());
        $this->multipageForm($this->getAdmissionForm())->clearSession();

        if ($response instanceof Response) {
            return $response;
        }
        return $response;
    }

    public function envoyerMailAction(): Response
    {
        try {
            $notif = $this->notificationFactory->createNotificationEnvoyerMail();
            $this->notifierService->trigger($notif);
        } catch (RuntimeException $e) {
            throw new RuntimeException("Un problème est survenu lors de l'envoi du mail [".MailTemplates::ENVOYER_MAIL."]",0,$e);
        }

        return $this->redirect()->toRoute('home', [], [], true );
    }

    public function rechercherIndividuAction(?string $type = null) : JsonModel
    {
        $type = $this->params()->fromQuery('type');
        if (($term = $this->params()->fromQuery('term'))) {
            $rows = $this->individuService->getRepository()->findByText($term, $type);
            $result = [];
            foreach ($rows as $row) {
                $prenoms = implode(' ', array_filter([$row['prenom1'], $row['prenom2'], $row['prenom3']]));
                // mise en forme attendue par l'aide de vue FormSearchAndSelect
                $label = $row['nom_usuel'] . ' ' . $prenoms;
                $extra = array(
                    'prenoms' => $prenoms,
                    'nom' => $row['nom_usuel'],
                    'email' => $row['email']
                );
                $result[] = array(
                    'id' => $row['id'], // identifiant unique de l'item
                    'label' => $label,     // libellé de l'item
                    'extras' => $extra,     // infos complémentaires (facultatives) sur l'item
                );
            }
            usort($result, function ($a, $b) {
                return strcmp($a['label'], $b['label']);
            });

            return new JsonModel($result);
        }
        exit;
    }

    public function getAdmission(): Admission|null
    {
        $individu=$this->individuService->getRepository()->findRequestedIndividu($this);
        return $this->admissionService->getRepository()->findOneByIndividu($individu);
    }

    public function enregistrerEtudiant($data, $admission){
        //Si le fieldset d'où l'on vient est etudiant,  on crée/enregistre ses données
        if ($data['_fieldset'] == "etudiant") {
            //Si l'etudiant ne possède pas de dossier d'admission, on lui crée puis associe un fieldset individu
@@ -202,30 +355,11 @@ class AdmissionController extends AdmissionAbstractController {
                }
            }
        }

        $this->getAdmissionForm()->bind($admission);

        if ($response instanceof Response) {
            return $response;
        }

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

        return $response;
    }

    public function financementAction() : Response|ViewModel
    {
        $response = $this->processMultipageForm($this->getAdmissionForm());
        $data = $this->multipageForm($this->getAdmissionForm())->getFormSessionData();

        /** @var Admission $admission */
        $admission = $this->getAdmission();

        if(!empty($admission)) {
    public function enregistrerInscription($data, $admission){
        /** @var Inscription $inscription */
        $inscription = $this->getInscriptionService()->getRepository()->findOneByAdmission($admission);
            $this->getAdmissionForm()->bind($admission);

        //Si le fieldset d'où l'on vient est inscription,  on crée/enregistre ses données
        if ($data['_fieldset'] == "inscription") {
@@ -256,33 +390,13 @@ class AdmissionController extends AdmissionAbstractController {
//                        var_dump($e);
                    $this->flashMessenger()->addErrorMessage("Échec de la modification des informations.");
                }

            }
        }
    }

        if ($response instanceof Response) {
            return $response;
        }

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

        return $response;
    }


    public function validationAction(): Response|ViewModel
    {
        $response = $this->processMultipageForm($this->getAdmissionForm());
        $data = $this->multipageForm($this->getAdmissionForm())->getFormSessionData();

        /** @var Admission $admission */
        $admission = $this->getAdmission();

        if(!empty($admission)){
    public function enregistrerFinancement($data, $admission){
        /** @var Financement $financement */
        $financement = $this->getFinancementService()->getRepository()->findOneByAdmission($admission);
            $this->getAdmissionForm()->bind($admission);

        //Si le fieldset d'où l'on vient est financement,  on crée/enregistre ses données
        if($data['_fieldset'] == "financement") {
@@ -316,33 +430,7 @@ class AdmissionController extends AdmissionAbstractController {
        }
    }

        if ($response instanceof Response) {
            return $response;
        }

        $response->setVariable('dataForm', $data);
        $response->setTemplate('admission/ajouter-validation');

        return $response;
    }

    public function annulerAction(): Response
    {
        $this->multipageForm()->clearSession();

        // todo: fournir une page de demande de confirmation d'annulation via le plugin multipageForm() ?
        return $this->redirect()->toRoute('admission/ajouter/etudiant');
    }

    public function confirmerAction()
    {
        $response = $this->processMultipageForm($this->getAdmissionForm());
        $data = $this->multipageForm($this->getAdmissionForm())->getFormSessionData();

        /** @var Admission $admission */
        $admission = $this->getAdmission();

        if(!empty($admission)){
    public function enregistrerDocument($data){
        if($data['_fieldset'] == "validation") {
            //Si le fieldest Validation n'était pas encore en BDD
            //            if (!$validationFieldset instanceof Financement) {
@@ -367,73 +455,4 @@ class AdmissionController extends AdmissionAbstractController {

        }
    }

        if ($response instanceof Response) {
            return $response;
        }

        $response->setVariable('dataForm', $data);
        $response->setTemplate('admission/ajouter-confirmer');

        return $response;
    }

    public function enregistrerAction()
    {
        $response = $this->processMultipageForm($this->getAdmissionForm());
        $this->multipageForm($this->getAdmissionForm())->clearSession();

        if ($response instanceof Response) {
            return $response;
        }
        return $response;
    }

    public function envoyerMailAction(): Response
    {
        try {
            $notif = $this->notificationFactory->createNotificationEnvoyerMail();
            $this->notifierService->trigger($notif);
        } catch (RuntimeException $e) {
            throw new RuntimeException("Un problème est survenu lors de l'envoi du mail [".MailTemplates::ENVOYER_MAIL."]",0,$e);
        }

        return $this->redirect()->toRoute('home', [], [], true );
    }

    public function rechercherIndividuAction(?string $type = null) : JsonModel
    {
        $type = $this->params()->fromQuery('type');
        if (($term = $this->params()->fromQuery('term'))) {
            $rows = $this->individuService->getRepository()->findByText($term, $type);
            $result = [];
            foreach ($rows as $row) {
                $prenoms = implode(' ', array_filter([$row['prenom1'], $row['prenom2'], $row['prenom3']]));
                // mise en forme attendue par l'aide de vue FormSearchAndSelect
                $label = $row['nom_usuel'] . ' ' . $prenoms;
                $extra = array(
                    'prenoms' => $prenoms,
                    'nom' => $row['nom_usuel'],
                    'email' => $row['email']
                );
                $result[] = array(
                    'id' => $row['id'], // identifiant unique de l'item
                    'label' => $label,     // libellé de l'item
                    'extras' => $extra,     // infos complémentaires (facultatives) sur l'item
                );
            }
            usort($result, function ($a, $b) {
                return strcmp($a['label'], $b['label']);
            });

            return new JsonModel($result);
        }
        exit;
    }

    public function getAdmission(): Admission|null
    {
        $individu=$this->individuService->getRepository()->findRequestedIndividu($this);
        return $this->admissionService->getRepository()->findOneByIndividu($individu);
    }
}
 No newline at end of file
+2 −2
Changes for module/Admission/src/Admission/Provider/Privilege/AdmissionPrivileges.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ use UnicaenAuth\Provider\Privilege\Privileges;

class AdmissionPrivileges extends Privileges {

    const ADMISSION_INDEX      = 'admission_admission-index';
    const ADMISSION_LISTER      = 'admission_admission-lister';
    const ADMISSION_AFFICHER   = 'admission_admission-afficher';
    const ADMISSION_AJOUTER    = 'admission_admission-ajouter';
    const ADMISSION_MODIFIER   = 'admission_admission-modifier';
    const ADMISSION_HISTORISER = 'admission_admission-historiser';
    const ADMISSION_SUPPRIMER  = 'admission_admission-supprimer';
    const ADMISSION_COMMENTER  = 'admission_admission-commenter';
    const ADMISSION_VERIFIER  = 'admission_admission-verifier';
}
 No newline at end of file