Commit 09a5e77b authored by Thomas Hamel's avatar Thomas Hamel
Browse files

Merge branch 'feature_annulation_soutenance' into release_8.1.0

parents e1eb2ef1 50ad36a0

module/Soutenance/config/others/proposition.config.php

+2 −2
Changes for module/Soutenance/config/others/proposition.config.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ return [ 
                            PropositionPrivileges::PROPOSITION_VALIDER_BDD,

                            PropositionPrivileges::PROPOSITION_REVOQUER_STRUCTURE,

                            PropositionPrivileges::PROPOSITION_PRESIDENCE,

                            PropositionPrivileges::PROPOSITION_SUPPRIMER_INFORMATIONS,



                            PropositionPrivileges::PROPOSITION_DECLARATION_HONNEUR_VALIDER,

                            PropositionPrivileges::PROPOSITION_DECLARATION_HONNEUR_REVOQUER,
@@ -179,10 +180,9 @@ return [ 
                [

                    'controller' => PropositionController::class,

                    'action' => [

                        'toggle-sursis',

                        'suppression',

                    ],

                    'privileges' => PropositionPrivileges::PROPOSITION_SURSIS,

                    'privileges' => PropositionPrivileges::PROPOSITION_SUPPRIMER_INFORMATIONS,

                ],

                [

                    'controller' => PropositionController::class,

module/Soutenance/src/Soutenance/Assertion/PropositionAssertion.php

+4 −3
Changes for module/Soutenance/src/Soutenance/Assertion/PropositionAssertion.php: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ class PropositionAssertion implements AssertionInterface { 
                    default:

                        return false;

                }

            case PropositionPrivileges::PROPOSITION_DECLARATION_HONNEUR_REVOQUER:

            case PropositionPrivileges::PROPOSITION_MODIFIER_GESTION:

                switch ($role) {

                    case Role::CODE_ADMIN_TECH :
@@ -244,12 +245,12 @@ class PropositionAssertion implements AssertionInterface { 
                    default:

                    return false;

                }

            case PropositionPrivileges::PROPOSITION_DECLARATION_HONNEUR_REVOQUER:

            case PropositionPrivileges::PROPOSITION_SUPPRIMER_INFORMATIONS:

                switch ($role) {

                    case Role::CODE_ADMIN_TECH :

                        return true;

                    case Role::CODE_BDD :

                        return ($these->getEtablissement()->getStructure() === $structure);

                    case Role::CODE_GEST_ED :

                        return $structure === $these->getEcoleDoctorale()->getStructure();

                    default:

                        return false;

                }

module/Soutenance/src/Soutenance/Controller/PropositionController.php

+11 −1
Changes for module/Soutenance/src/Soutenance/Controller/PropositionController.php: 11 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -717,7 +717,17 @@ class PropositionController extends AbstractController 
            $this->getValidationService()->historise($validation);

        }



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

        try {

            $notif = $this->soutenanceNotificationFactory->createNotificationSuppressionProposition($these);

            $this->notifierService->trigger($notif);

        } catch (\Notification\Exception\RuntimeException $e) {

            // aucun destinataire , todo : cas à gérer !

        }



        if ($redirectUrl = $this->params()->fromQuery('redirect')) {

            return $this->redirect()->toUrl($redirectUrl);

        }

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

    }



    public function afficherSoutenancesParEcoleDoctoraleAction(): ViewModel

module/Soutenance/src/Soutenance/Provider/Privilege/PropositionPrivileges.php

+1 −0
Changes for module/Soutenance/src/Soutenance/Provider/Privilege/PropositionPrivileges.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -19,4 +19,5 @@ class PropositionPrivileges extends Privileges 
    const PROPOSITION_DECLARATION_HONNEUR_VALIDER = 'soutenance-declaration-honneur-valider';

    const PROPOSITION_DECLARATION_HONNEUR_REVOQUER = 'soutenance-declaration-honneur-revoquer';

    const PROPOSITION_REVOQUER_STRUCTURE = 'soutenance-proposition-revoquer-structure';

    const PROPOSITION_SUPPRIMER_INFORMATIONS = 'soutenance-proposition-supprimer';

}
 
 No newline at end of file

module/Soutenance/src/Soutenance/Provider/Template/MailTemplates.php

+1 −0
Changes for module/Soutenance/src/Soutenance/Provider/Template/MailTemplates.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ class MailTemplates 


    /** GESTION DES VALIDATIONS ***************************************************************************************/

    const PROPOSITION_REFUS = 'PROPOSITION_REFUS';

    const PROPOSITION_SUPPRESSION = 'PROPOSITION_SUPPRESSION';

    const SOUTENANCE_TOUS_AVIS_RENDUS = 'SOUTENANCE_TOUS_AVIS_RENDUS';

    const SOUTENANCE_TOUS_AVIS_RENDUS_DIRECTION = 'SOUTENANCE_TOUS_AVIS_RENDUS_DIRECTION';

    const SOUTENANCE_VALIDATION_ANNULEE = 'SOUTENANCE_VALIDATION_ANNULEE';