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

fix minor bugs

parent ccd103b6
Loading
Loading
Loading
Loading
+3 −4
Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -138,11 +138,11 @@ class AdmissionController extends AdmissionAbstractController {
        if ($response instanceof Response) {
            return $response;
        }
        $data = $this->multipageForm($this->admissionForm)->getFormSessionData();

        //Récupération de l'objet Admission en BDD
        $admission = $this->getAdmission();
        if(!empty($admission)) {
            $data = $this->multipageForm($this->admissionForm)->getFormSessionData();
            $this->admissionForm->bind($admission);
            if($data['_fieldset'] == "inscription"){
                //Enregistrement des informations de l'inscription
@@ -200,13 +200,13 @@ class AdmissionController extends AdmissionAbstractController {
        if ($response instanceof Response) {
            return $response;
        }
        $data = $this->multipageForm($this->admissionForm)->getFormSessionData();

        //Récupération de l'objet Admission en BDD
        /** @var Admission $admission */
        $admission = $this->getAdmission();

        if(!empty($admission)) {
            $data = $this->multipageForm($this->admissionForm)->getFormSessionData();
            $this->admissionForm->bind($admission);
            if($data['_fieldset'] == "inscription"){
                //Enregistrement des informations de l'inscription
@@ -234,7 +234,6 @@ class AdmissionController extends AdmissionAbstractController {
        if ($response instanceof Response) {
            return $response;
        }
        $data = $this->multipageForm($this->admissionForm)->getFormSessionData();

        //Récupération de l'objet Admission en BDD
        /** @var Admission $admission */
@@ -244,6 +243,7 @@ class AdmissionController extends AdmissionAbstractController {
        $operations = [];
        $dossierValideParGestionnaire = null;
        if(!empty($admission)){
            $data = $this->multipageForm($this->admissionForm)->getFormSessionData();
            $this->admissionForm->bind($admission);
            //Enregistrement des informations de Financement
            $this->enregistrerFinancement($data, $admission);
@@ -262,7 +262,6 @@ class AdmissionController extends AdmissionAbstractController {
            }
        }

        $response->setVariable('dataForm', $data);
        $response->setVariable('admission', $admission);
        $response->setVariable('operations', $operations);
        $response->setVariable('documents', $documentsAdmission);
+4 −1
Changes for module/Admission/view/admission/admission/partial/document/document.phtml: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@
 * @var int $individu
 * @var AdmissionValidation $validation_charte_doctorat
 * @var string $returnUrl
 * @var boolean $showActionButtons
 */

use Admission\Entity\Db\AdmissionValidation;
@@ -36,6 +37,7 @@ $canTelechargerDocument =
                                    <h4 class="modal-title" id="myModalLabel">Charte du doctorat</h4>
                                </div>
                                <div class="modal-body">
                                    <i>Il est nécessaire de lire l'intégralité de cette charte, puis de certifier avoir effectivement pris connaissance de son contenu à la fin du document.</i>
                                    <div class="col-lg-5 upload_file file_charte_doctorat">
                                        <?php
                                        echo $this->formfile($fieldset); ?>
@@ -49,7 +51,8 @@ $canTelechargerDocument =
                                        'operationEnAttente' => null,
                                        'returnUrl' => $returnUrl,
                                        'libelleOperation' => $libelleOperation,
                                        'showRangOperation' => false
                                        'showRangOperation' => false,
                                        'showActionButtons' => $showActionButtons
                                    ]);
                                    ?>
                                </div>
+22 −15
Changes for module/Admission/view/admission/admission/partial/documentInfos.phtml: 22 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@

use Admission\Entity\Db\Admission;
use Admission\Entity\Db\AdmissionOperationInterface;
use Admission\Entity\Db\Etudiant;
use Admission\Entity\Db\Inscription;
use Admission\Entity\Db\TypeValidation;
use Admission\Form\Admission\AdmissionForm;
use Admission\Form\Fieldset\Document\DocumentFieldset;
@@ -15,20 +17,19 @@ use Application\View\Renderer\PhpRenderer;
 * @var Admission $admission
 * @var array[] $operations
 * @var string              $error
 * @var array               $dataForm
 * @var array               $documents
 * @var boolean $dossierValideParGestionnaire
 * @var AdmissionOperationInterface $operationEnAttente
 */
$form->prepare();
$fcg = $this->formControlGroup();

$canAccederCommentaires = $this->isAllowed($admission,AdmissionPrivileges::ADMISSION_ACCEDER_COMMENTAIRES);
$canVerifierAdmission  = $this->isAllowed($admission, AdmissionPrivileges::ADMISSION_VERIFIER);
$canNotifierGestionnairesAdmission  = $this->isAllowed($admission, AdmissionPrivileges::ADMISSION_NOTIFIER_GESTIONNAIRES);
$canNotifierCommentairesAjoutesAdmission  = $this->isAllowed($admission, AdmissionPrivileges::ADMISSION_NOTIFIER_COMMENTAIRES_AJOUTES);
$canNotifierDossierComplet  = $this->isAllowed($admission, AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_COMPLET);
$canGenererRecapitulatif  = $this->isAllowed($admission, AdmissionPrivileges::ADMISSION_GENERER_RECAPITULATIF);

$canModifierAdmission  =
    $this->isAllowed($admission,AdmissionPrivileges::ADMISSION_MODIFIER_TOUS_DOSSIERS_ADMISSION) ||
    $this->isAllowed($admission,AdmissionPrivileges::ADMISSION_MODIFIER_SON_DOSSIER_ADMISSION);
@@ -39,6 +40,10 @@ if(!empty($admission) && !$canModifierAdmission) {
}
$individu = $admission->getIndividu()->getId();
$ecoleDoctoraleRenseignee = $admission && $admission->getInscription()->first()->getEcoleDoctorale() ? 1 : 0;
/** @var Etudiant $etudiant */
$etudiant = $admission->getEtudiant()->first();
/** @var Inscription $inscription */
$inscription = $admission->getInscription()->first();
?>

<script>
@@ -99,10 +104,11 @@ $ecoleDoctoraleRenseignee = $admission && $admission->getInscription()->first()-
        'documents' => $documents,
        'individu' => $individu,
        'validation_charte_doctorat' => $operations[TypeValidation::CODE_ATTESTATION_HONNEUR_CHARTE_DOCTORALE],
        'returnUrl' => $returnUrl
        'returnUrl' => $returnUrl,
        'showActionButtons' => true
    ]);

    if (isset($dataForm['etudiant']['niveauEtude']) && $dataForm['etudiant']['niveauEtude'] == 2) { ?>
    if ($etudiant->getNiveauEtude() == 2) { ?>
        <div class="row subfield">
            <div class="col informations-pieces_justificatives">
                <p>Vous avez un autre diplôme qu'un master français (Dérogation) <label class="titre_sous_partie_en">&nbsp; / If other than a French Master's degree (Derogation)</label></p>
@@ -117,7 +123,7 @@ $ecoleDoctoraleRenseignee = $admission && $admission->getInscription()->first()-
            </div>
        </div>
    <?php }
    if (isset($dataForm['etudiant']['niveauEtude']) && $dataForm['etudiant']['niveauEtude'] == 2 && (isset($dataForm['etudiant']['typeDiplomeAutre']) && $dataForm['etudiant']['typeDiplomeAutre'] == 1)) { ?>
    if ($etudiant->getNiveauEtude() == 2 && $etudiant->getTypeDiplomeAutre() == 1) { ?>
        <div class="row subfield">
            <div class="col informations-pieces_justificatives">
                <p>Vous êtes titulaire d'un titre étranger<label class="titre_sous_partie_en">&nbsp; / If the student has a foreign qualification</label></p>
@@ -140,39 +146,40 @@ $ecoleDoctoraleRenseignee = $admission && $admission->getInscription()->first()-
            'individu' => $individu,
        ]);
    } ?>
    <?php if (isset($dataForm['etudiant']['niveauEtude']) && $dataForm['etudiant']['niveauEtude'] == 2 && (isset($dataForm['etudiant']['typeDiplomeAutre']) && $dataForm['etudiant']['typeDiplomeAutre'] == 2)) {
    <?php if ($etudiant->getNiveauEtude() == 2 && $etudiant->getTypeDiplomeAutre() == 2){ ?>
        <div class="row subfield">
            <div class="col informations-pieces_justificatives">
                <p>Si l'étudiant est titulaire d'un diplôme français ne conférant pas le grade de master</p>
            </div>
        </div>
    <?php
        echo $this->partial('admission/partial/document/document', [
            'fieldset' => $fieldset->get('diplomesTravauxExperiencePro'),
            'documents' => $documents,
            'individu' => $individu,
        ]);
    } ?>
    <?php
    $confidentialiteChecked = isset($dataForm['inscription']['confidentialite']) && $dataForm['inscription']['confidentialite'] == 1;
    $coTutelleChecked = isset($dataForm['inscription']['coTutelle']) && $dataForm['inscription']['coTutelle'] == 1;
    $coEncadrementChecked = isset($dataForm['inscription']['coEncadrement']) && $dataForm['inscription']['coEncadrement'] == 1;
    $coDirectionChecked = isset($dataForm['inscription']['co-direction']) && $dataForm['inscription']['co-direction'] == 1;
    if ($confidentialiteChecked || $coTutelleChecked || $coEncadrementChecked || $coDirectionChecked) { ?>
    <?php if ($inscription->getConfidentialite() || $inscription->getCoTutelle() || $inscription->getCoEncadrement()) { ?>
        <div class="row subfield">
            <div class="col informations-pieces_justificatives">
                <p>Spécificité(s) demandée(s)<label class="titre_sous_partie_en">&nbsp; /  Specificities requested</label></p>
            </div>
        </div>
        <?php if ($confidentialiteChecked) { ?>
        <?php if ($inscription->getConfidentialite()) { ?>
            <div class="row subfield">
                <div class="col-lg-3 col-sm-12 label-file">
                    <?php echo $this->formlabel($fieldset->get('documentsDemandeConfidentialite')) ?>
                </div>
            </div>
        <?php } ?>
        <?php if ($coTutelleChecked) {
        <?php if ($inscription->getCoTutelle()) {
            echo $this->partial('admission/partial/document/document', [
                'fieldset' => $fieldset->get('documentsCotutelle'),
                'documents' => $documents,
                'individu' => $individu,
            ]);
        } ?>
        <?php if ($coEncadrementChecked) {
        <?php if ($inscription->getCoEncadrement()) {
            echo $this->partial('admission/partial/document/document', [
                'fieldset' => $fieldset->get('documentsCoencadrement'),
                'documents' => $documents,
+2 −1
Changes for module/Admission/view/admission/admission/partial/etudiantInfos.phtml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -19,13 +19,14 @@ use Individu\Entity\Db\Individu;
 */

$form->prepare();
$fcg = $this->formControlGroup();

$canAccederCommentaires = $this->isAllowed($admission,AdmissionPrivileges::ADMISSION_ACCEDER_COMMENTAIRES);
$canVerifierAdmission  = $this->isAllowed($admission,AdmissionPrivileges::ADMISSION_VERIFIER);
$canModifierAdmission  =
    $this->isAllowed($admission, AdmissionPrivileges::ADMISSION_MODIFIER_TOUS_DOSSIERS_ADMISSION) ||
    $this->isAllowed($admission, AdmissionPrivileges::ADMISSION_MODIFIER_SON_DOSSIER_ADMISSION);

$fcg = $this->formControlGroup();
if(!empty($admission) && !$canModifierAdmission) {
    foreach ($fieldset->getElements() as $element) {
        $element->setAttribute('readonly', true);
+1 −1
Changes for public/js/admission.js: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ document.addEventListener("DOMContentLoaded", function() {
                disabled: !!readOnly,
                credits: false,
                maxFiles: 1,
                pdfPreviewHeight: inputId === "ADMISSION_CHARTE_DOCTORAT" ? 500 : false,
                pdfPreviewHeight: inputId === "ADMISSION_CHARTE_DOCTORAT" ? "8000" : false,
                pdfComponentExtraParams: inputId === "ADMISSION_CHARTE_DOCTORAT" ? 'toolbar=0&page=1' : false,
                allowPdfPreview: inputId === "ADMISSION_CHARTE_DOCTORAT",
            });