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

fix témoin état de la thèse sur la fiche, amélioration des modals pour la modification de la thèse

parent 53774d0a

module/These/src/These/Controller/TheseSaisieController.php

+2 −1
Changes for module/These/src/These/Controller/TheseSaisieController.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ class TheseSaisieController extends AbstractController 


        $this->flashMessenger()->addSuccessMessage("Thèse modifiée avec succès.");



        return $this->redirect()->toRoute('these/identite', ['these' => $these->getId()], [], true);

//        return $this->redirect()->toRoute('these/identite', ['these' => $these->getId()], [], true);

    }



    private function getErrorMessages(): array
@@ -182,6 +182,7 @@ class TheseSaisieController extends AbstractController 
        $viewModel = new ViewModel([

            'these' => $these,

            'form' => $form,

            'title' => "Modification de la thèse de ".$these->getDoctorant()

        ]);

        $viewModel->setTemplate("these/these-saisie/partial/$domaine");

module/These/src/These/Fieldset/Generalites/GeneralitesHydrator.php

+4 −4
Changes for module/These/src/These/Fieldset/Generalites/GeneralitesHydrator.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -88,10 +88,10 @@ class GeneralitesHydrator extends DoctrineObject 
        }



        //problème sinon lors de l'hydratation, objet TitreAcces a comme clé "financements" -> gros mystère

        if (array_key_exists("financements", $data)) {

            $data["titreAcces"] = $data["financements"];

            unset($data["financements"]);

        }

//        if (array_key_exists("financements", $data)) {

//            $data["titreAcces"] = $data["financements"];

//            unset($data["financements"]);

//        }



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

    }

module/These/view/these/these-saisie/partial/direction.phtml

+1 −1
Changes for module/These/view/these/these-saisie/partial/direction.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ use These\Fieldset\Direction\DirectionFieldset; 


<script>

    $(function() {

        $("select.select2").select2();

        $("select").selectpicker();



        const updateCodirecteurDiv = function($enabler) {

            const codirId = $enabler.data('codirecteur-id');

module/These/view/these/these-saisie/partial/financements.phtml

+1 −0
Changes for module/These/view/these/these-saisie/partial/financements.phtml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ 
    $(document).on('click', '.collection-add-link', function() {

        $('select').selectpicker();

    });

    $('select').selectpicker();

</script>
 
 No newline at end of file

module/These/view/these/these-saisie/partial/generalites.phtml

+11 −0
Changes for module/These/view/these/these-saisie/partial/generalites.phtml: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -145,3 +145,14 @@ use These\Fieldset\Generalites\GeneralitesFieldset; 
    <?php endif ?>



</fieldset>

<script>

    $('select').selectpicker();

    var codeDeptInput = '#codeDeptTitreAcces'

    var nomDeptInput = '#nomDeptTitreAcces'

    //Gestion de la sélection du département

    initializeAutoCompleteDepartement(codeDeptInput, nomDeptInput)

    $(nomDeptInput).on('input', function() {

        $(codeDeptInput).val('');

    });

    setupAutocompleteDepartement(nomDeptInput, codeDeptInput);

</script>
 
 No newline at end of file