Loading CHANGELOG.md +2 −1 Changes for CHANGELOG.md: 2 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -4,7 +4,8 @@ Journal des modifications 6.0.10 ----- - Nouvelle entrée 'Rapports CSI' dans le menu 'Nos thèses' des gestionnaires/responsables d'ED/UR. - [FIX] Correction de l'appel de getNomComplet qui etait utiliser sur un acteur plus qu'un individu lors de l'envoi des convocations - [FIX] Correction de l'appel de getNomComplet qui etait utilisée sur un acteur plus qu'un individu lors de l'envoi des convocations - [FIX] Changement d'action pour la modification de l'adresse de soutenance dans la partie preparation de la soutenance 6.0.9 ----- Loading module/Soutenance/config/others/presoutenance.config.php +0 −12 Changes for module/Soutenance/config/others/presoutenance.config.php: 0 added lines, 12 removed lines. Original line number Diff line number Diff line Loading @@ -71,7 +71,6 @@ return [ 'stopper-demarche', 'avis-soutenance', 'convocations', 'modifier-adresse', 'envoyer-convocation', 'transmettre-documents-direction-these', ], Loading Loading @@ -369,17 +368,6 @@ return [ ], ], ], 'modifier-adresse' => [ 'type' => Literal::class, 'may_terminate' => true, 'options' => [ 'route' => '/modifier-adresse', 'defaults' => [ 'controller' => PresoutenanceController::class, 'action' => 'modifier-adresse', ], ], ], ], ], ], Loading module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php +1 −27 Changes for module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php: 1 added line, 27 removed lines. Original line number Diff line number Diff line Loading @@ -133,6 +133,7 @@ class PresoutenanceController extends AbstractController 'proposition' => $proposition, 'rapporteurs' => $rapporteurs, 'engagements' => $engagements, 'adresse' => $proposition->getAdresseActive(), 'avis' => $avis, 'tousLesEngagements' => count($engagements) === $nbRapporteurs, 'tousLesAvis' => count($avis) === $nbRapporteurs, Loading Loading @@ -432,33 +433,6 @@ class PresoutenanceController extends AbstractController } public function modifierAdresseAction() : ViewModel { $these = $this->requestedThese(); $proposition = $this->getPropositionService()->findOneForThese($these); $form = $this->getAdresseSoutenanceForm(); $form->setAttribute('action', $this->url()->fromRoute('soutenance/presoutenance/modifier-adresse', ['these' => $these->getId()], [], true)); $form->bind($proposition); $request = $this->getRequest(); if ($request->isPost()) { $data = $request->getPost(); $form->setData($data); if ($form->isValid()) { $this->getPropositionService()->update($proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Adresse du lieu de soutenance"); } } return new ViewModel([ 'title' => "Modifier l'adresse exacte de la soutenance", 'these' => $these, 'form' => $form, ]); } /** Document pour la signature en présidence */ #[NoReturn] public function procesVerbalSoutenanceAction(): void { Loading module/Soutenance/view/soutenance/presoutenance/modifier-adresse.phtmldeleted 100644 → 0 +0 −40 Changes for module/Soutenance/view/soutenance/presoutenance/modifier-adresse.phtml: 0 added lines, 40 removed lines. Original line number Diff line number Diff line <?php /** * @see \Soutenance\Controller\PresoutenanceController::modifierAdresseAction(); * * @var These $these * @var RefusForm $form */ use These\Entity\Db\These; use Soutenance\Form\Refus\RefusForm; ?> <?php echo $this->form($form); ?> <script> $(document).ready(function() { // tinymce.remove(); tinymce.init({ selector: '.motif', toolbar: 'newdocument undo redo | bold italic', resize: true, language: 'fr_FR', plugins: 'lists', statusbar: true, browser_spellcheck: true, branding: false, menu: {}, body_id: 'adresse', setup: function (editor) { editor.on("focusout", function () { console.log(tinymce.get('adresse').getContent()); $('textarea#adresse').val(tinymce.get('adresse').getContent()); }); } }); }); </script> module/Soutenance/view/soutenance/presoutenance/presoutenance.phtml +35 −8 Changes for module/Soutenance/view/soutenance/presoutenance/presoutenance.phtml: 35 added lines, 8 removed lines. Original line number Diff line number Diff line Loading @@ -9,6 +9,7 @@ * @var Membre[] $rapporteurs * @var Validation[] $engagements * @var Avis[] $avis * @var Adresse $adresse * @var bool $justificatifsOk * @var array $justificatifs * @var UrlFichierThese $urlFichierThese Loading @@ -21,6 +22,7 @@ use Application\Constants; use Application\Entity\Db\Validation; use Depot\Controller\Plugin\UrlFichierThese; use Soutenance\Entity\Adresse; use Soutenance\Entity\Avis; use Soutenance\Entity\Etat; use Soutenance\Entity\Justificatif; Loading Loading @@ -270,26 +272,51 @@ $canSimulerRemonter = $this->isAllowed(PresoutenancePrivileges::getResourceId(Pr <?php if ($proposition->getEtat()->getCode() === Etat::COMPLET OR $proposition->getEtat()->getCode() === Etat::VALIDEE): ?> <div class="box card"> <div class="card-header bg-dark text-white"> <h2> Édition du procès verbal de soutenance </h2> <h2> Adresse de soutenance et édition du procès-verbal de soutenance </h2> </div> <div class="card-body"> <div class="row"> <div class="col-md-3"> <?php if ($canModifierAdresse) : ?> <a <?php /** @see \Soutenance\Controller\PresoutenanceController::modifierAdresseAction() */ ?> href="<?php echo $this->url('soutenance/presoutenance/modifier-adresse', ['these' => $these->getId()], [] ,true); ?>" class="btn btn-primary ajax-modal" data-event="modification-adresse"> <span class="icon icon-editer"></span> Modifier l'adresse <?php if ($adresse === null) : ?> <?php /** @see \Soutenance\Controller\PropositionController::ajouterAdresseAction() */ ?> <a href="<?php echo $this->url('soutenance/proposition/ajouter-adresse', ['these' => $these->getId(), 'proposition' => $proposition->getId()], [], true); ?>" class="btn btn-primary ajax-modal" data-event="modification"> <span class="icon icon-ajouter"> Ajouter une adresse</span> </a> <?php else: ?> <?php /** @see \Soutenance\Controller\PropositionController::modifierAdresseAction() */ ?> <a href="<?php echo $this->url('soutenance/proposition/modifier-adresse', ['these' => $these->getId(), 'adresse' => $adresse->getId()], [], true); ?>" class="btn btn-primary ajax-modal" data-event="modification"> <span class="icon icon-ajouter"> Modifier l'adresse</span> </a> <?php /** @see \Soutenance\Controller\PropositionController::historiserAdresseAction() */ ?> <a href="<?php echo $this->url('soutenance/proposition/historiser-adresse', ['these' => $these->getId(), 'adresse' => $adresse->getId()], [], true); ?>" class="btn btn-danger"> <span class="icon icon-historiser"> Supprimer l'adresse</span> </a> <?php endif; ?> <?php endif; ?> </div> <div class="col-md-9"> <?php echo $this->dernierHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Adresse du lieu de soutenance"); ?> <?php if ($adresse !== null) : ?> <?php echo $adresse->format(); ?> <?php else: ?> <span class="text-warning"> <span class="icon icon-attention"></span> Aucune adresse de renseignée ! </span> <?php endif; ?> </div> </div> <br/> <div> <?php echo $this->dernierHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Adresse du lieu de soutenance"); ?> </div> <div class="row"> <div class="col-md-3"> <?php if ($canGenererDocument) : ?> Loading Loading
CHANGELOG.md +2 −1 Changes for CHANGELOG.md: 2 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -4,7 +4,8 @@ Journal des modifications 6.0.10 ----- - Nouvelle entrée 'Rapports CSI' dans le menu 'Nos thèses' des gestionnaires/responsables d'ED/UR. - [FIX] Correction de l'appel de getNomComplet qui etait utiliser sur un acteur plus qu'un individu lors de l'envoi des convocations - [FIX] Correction de l'appel de getNomComplet qui etait utilisée sur un acteur plus qu'un individu lors de l'envoi des convocations - [FIX] Changement d'action pour la modification de l'adresse de soutenance dans la partie preparation de la soutenance 6.0.9 ----- Loading
module/Soutenance/config/others/presoutenance.config.php +0 −12 Changes for module/Soutenance/config/others/presoutenance.config.php: 0 added lines, 12 removed lines. Original line number Diff line number Diff line Loading @@ -71,7 +71,6 @@ return [ 'stopper-demarche', 'avis-soutenance', 'convocations', 'modifier-adresse', 'envoyer-convocation', 'transmettre-documents-direction-these', ], Loading Loading @@ -369,17 +368,6 @@ return [ ], ], ], 'modifier-adresse' => [ 'type' => Literal::class, 'may_terminate' => true, 'options' => [ 'route' => '/modifier-adresse', 'defaults' => [ 'controller' => PresoutenanceController::class, 'action' => 'modifier-adresse', ], ], ], ], ], ], Loading
module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php +1 −27 Changes for module/Soutenance/src/Soutenance/Controller/PresoutenanceController.php: 1 added line, 27 removed lines. Original line number Diff line number Diff line Loading @@ -133,6 +133,7 @@ class PresoutenanceController extends AbstractController 'proposition' => $proposition, 'rapporteurs' => $rapporteurs, 'engagements' => $engagements, 'adresse' => $proposition->getAdresseActive(), 'avis' => $avis, 'tousLesEngagements' => count($engagements) === $nbRapporteurs, 'tousLesAvis' => count($avis) === $nbRapporteurs, Loading Loading @@ -432,33 +433,6 @@ class PresoutenanceController extends AbstractController } public function modifierAdresseAction() : ViewModel { $these = $this->requestedThese(); $proposition = $this->getPropositionService()->findOneForThese($these); $form = $this->getAdresseSoutenanceForm(); $form->setAttribute('action', $this->url()->fromRoute('soutenance/presoutenance/modifier-adresse', ['these' => $these->getId()], [], true)); $form->bind($proposition); $request = $this->getRequest(); if ($request->isPost()) { $data = $request->getPost(); $form->setData($data); if ($form->isValid()) { $this->getPropositionService()->update($proposition); $this->getHorodatageService()->addHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Adresse du lieu de soutenance"); } } return new ViewModel([ 'title' => "Modifier l'adresse exacte de la soutenance", 'these' => $these, 'form' => $form, ]); } /** Document pour la signature en présidence */ #[NoReturn] public function procesVerbalSoutenanceAction(): void { Loading
module/Soutenance/view/soutenance/presoutenance/modifier-adresse.phtmldeleted 100644 → 0 +0 −40 Changes for module/Soutenance/view/soutenance/presoutenance/modifier-adresse.phtml: 0 added lines, 40 removed lines. Original line number Diff line number Diff line <?php /** * @see \Soutenance\Controller\PresoutenanceController::modifierAdresseAction(); * * @var These $these * @var RefusForm $form */ use These\Entity\Db\These; use Soutenance\Form\Refus\RefusForm; ?> <?php echo $this->form($form); ?> <script> $(document).ready(function() { // tinymce.remove(); tinymce.init({ selector: '.motif', toolbar: 'newdocument undo redo | bold italic', resize: true, language: 'fr_FR', plugins: 'lists', statusbar: true, browser_spellcheck: true, branding: false, menu: {}, body_id: 'adresse', setup: function (editor) { editor.on("focusout", function () { console.log(tinymce.get('adresse').getContent()); $('textarea#adresse').val(tinymce.get('adresse').getContent()); }); } }); }); </script>
module/Soutenance/view/soutenance/presoutenance/presoutenance.phtml +35 −8 Changes for module/Soutenance/view/soutenance/presoutenance/presoutenance.phtml: 35 added lines, 8 removed lines. Original line number Diff line number Diff line Loading @@ -9,6 +9,7 @@ * @var Membre[] $rapporteurs * @var Validation[] $engagements * @var Avis[] $avis * @var Adresse $adresse * @var bool $justificatifsOk * @var array $justificatifs * @var UrlFichierThese $urlFichierThese Loading @@ -21,6 +22,7 @@ use Application\Constants; use Application\Entity\Db\Validation; use Depot\Controller\Plugin\UrlFichierThese; use Soutenance\Entity\Adresse; use Soutenance\Entity\Avis; use Soutenance\Entity\Etat; use Soutenance\Entity\Justificatif; Loading Loading @@ -270,26 +272,51 @@ $canSimulerRemonter = $this->isAllowed(PresoutenancePrivileges::getResourceId(Pr <?php if ($proposition->getEtat()->getCode() === Etat::COMPLET OR $proposition->getEtat()->getCode() === Etat::VALIDEE): ?> <div class="box card"> <div class="card-header bg-dark text-white"> <h2> Édition du procès verbal de soutenance </h2> <h2> Adresse de soutenance et édition du procès-verbal de soutenance </h2> </div> <div class="card-body"> <div class="row"> <div class="col-md-3"> <?php if ($canModifierAdresse) : ?> <a <?php /** @see \Soutenance\Controller\PresoutenanceController::modifierAdresseAction() */ ?> href="<?php echo $this->url('soutenance/presoutenance/modifier-adresse', ['these' => $these->getId()], [] ,true); ?>" class="btn btn-primary ajax-modal" data-event="modification-adresse"> <span class="icon icon-editer"></span> Modifier l'adresse <?php if ($adresse === null) : ?> <?php /** @see \Soutenance\Controller\PropositionController::ajouterAdresseAction() */ ?> <a href="<?php echo $this->url('soutenance/proposition/ajouter-adresse', ['these' => $these->getId(), 'proposition' => $proposition->getId()], [], true); ?>" class="btn btn-primary ajax-modal" data-event="modification"> <span class="icon icon-ajouter"> Ajouter une adresse</span> </a> <?php else: ?> <?php /** @see \Soutenance\Controller\PropositionController::modifierAdresseAction() */ ?> <a href="<?php echo $this->url('soutenance/proposition/modifier-adresse', ['these' => $these->getId(), 'adresse' => $adresse->getId()], [], true); ?>" class="btn btn-primary ajax-modal" data-event="modification"> <span class="icon icon-ajouter"> Modifier l'adresse</span> </a> <?php /** @see \Soutenance\Controller\PropositionController::historiserAdresseAction() */ ?> <a href="<?php echo $this->url('soutenance/proposition/historiser-adresse', ['these' => $these->getId(), 'adresse' => $adresse->getId()], [], true); ?>" class="btn btn-danger"> <span class="icon icon-historiser"> Supprimer l'adresse</span> </a> <?php endif; ?> <?php endif; ?> </div> <div class="col-md-9"> <?php echo $this->dernierHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Adresse du lieu de soutenance"); ?> <?php if ($adresse !== null) : ?> <?php echo $adresse->format(); ?> <?php else: ?> <span class="text-warning"> <span class="icon icon-attention"></span> Aucune adresse de renseignée ! </span> <?php endif; ?> </div> </div> <br/> <div> <?php echo $this->dernierHorodatage($proposition, HorodatageService::TYPE_MODIFICATION, "Adresse du lieu de soutenance"); ?> </div> <div class="row"> <div class="col-md-3"> <?php if ($canGenererDocument) : ?> Loading