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

[WIP] add ConventionFormationDoctorale

parent ea353732
Loading
Loading
Loading
Loading
+362 −131

File changed.

Preview size limit exceeded, changes collapsed.

+26 −2
Changes for module/Admission/config/module.config.php: 26 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ use Admission\Event\Validation\AdmissionValidationEventListener;
use Admission\Event\Validation\AdmissionValidationEventListenerFactory;
use Admission\Form\Admission\AdmissionForm;
use Admission\Form\Admission\AdmissionFormFactory;
use Admission\Form\ConventionFormationDoctorale\ConventionFormationDoctoraleForm;
use Admission\Form\ConventionFormationDoctorale\ConventionFormationDoctoraleFormFactory;
use Admission\Form\Fieldset\Document\DocumentFieldset;
use Admission\Form\Fieldset\Document\DocumentFieldsetFactory;
use Admission\Form\Fieldset\Etudiant\EtudiantFieldset;
@@ -31,6 +33,8 @@ use Admission\Form\Fieldset\Verification\VerificationFieldset;
use Admission\Form\Fieldset\Verification\VerificationFieldsetFactory;
use Admission\Hydrator\Admission\AdmissionHydrator;
use Admission\Hydrator\Admission\AdmissionHydratorFactory;
use Admission\Hydrator\ConventionFormationDoctorale\ConventionFormationDoctoraleHydrator;
use Admission\Hydrator\ConventionFormationDoctorale\ConventionFormationDoctoraleHydratorFactory;
use Admission\Hydrator\Document\DocumentHydrator;
use Admission\Hydrator\Document\DocumentHydratorFactory;
use Admission\Hydrator\Etudiant\EtudiantHydrator;
@@ -46,6 +50,8 @@ use Admission\Hydrator\Verification\VerificationHydratorFactory;
use Admission\Provider\Privilege\AdmissionPrivileges;
use Admission\Service\Admission\AdmissionService;
use Admission\Service\Admission\AdmissionServiceFactory;
use Admission\Service\ConventionFormationDoctorale\ConventionFormationDoctoraleService;
use Admission\Service\ConventionFormationDoctorale\ConventionFormationDoctoraleServiceFactory;
use Admission\Service\Document\DocumentService;
use Admission\Service\Document\DocumentServiceFactory;
use Admission\Service\Etudiant\EtudiantService;
@@ -110,6 +116,7 @@ return array(
                            AdmissionPrivileges::ADMISSION_NOTIFIER_COMMENTAIRES_AJOUTES,
                            AdmissionPrivileges::ADMISSION_NOTIFIER_GESTIONNAIRES,
                            AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_COMPLET,
                            AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_INCOMPLET,
                            AdmissionPrivileges::ADMISSION_GENERER_RECAPITULATIF
                        ],
                        'resources'  => ['Admission'],
@@ -186,9 +193,11 @@ return array(
                    'controller' => AdmissionController::class,
                    'action' => [
                        'notifier-dossier-complet',
                        'notifier-dossier-incomplet',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_COMPLET,
                        AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_INCOMPLET,
                    ],
                    'assertion' => AdmissionAssertion::class,
                ],
@@ -278,6 +287,20 @@ return array(
                            ],
                        ],
                    ],
                    'notifier-dossier-incomplet' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/notifier-dossier-incomplet/:admission',
                            'constraints' => [
                                'admission' => '[0-9]*'
                            ],
                            'defaults' => [
                                'controller' => AdmissionController::class,
                                'action' => 'notifier-dossier-incomplet',
                                /* @see AdmissionController::notifierDossierIncompletAction() */
                            ],
                        ],
                    ],
                    'generer-recapitulatif' => [
                        'type'  => Segment::class,
                        'may_terminate' => true,
@@ -330,7 +353,7 @@ return array(
            InscriptionFieldset::class => InscriptionFieldsetFactory::class,
            FinancementFieldset::class => FinancementFieldsetFactory::class,
            VerificationFieldset::class => VerificationFieldsetFactory::class,
            DocumentFieldset::class => DocumentFieldsetFactory::class
            DocumentFieldset::class => DocumentFieldsetFactory::class,
        ],
    ],

@@ -342,7 +365,8 @@ return array(
            FinancementHydrator::class => FinancementHydratorFactory::class,
            AdmissionValidationHydrator::class => AdmissionValidationHydratorFactory::class,
            VerificationHydrator::class => VerificationHydratorFactory::class,
            DocumentHydrator::class => DocumentHydratorFactory::class
            DocumentHydrator::class => DocumentHydratorFactory::class,
            ConventionFormationDoctoraleHydrator::class => ConventionFormationDoctoraleHydratorFactory::class
        ],
    ],

+141 −0
Changes for module/Admission/config/others/convention.config.php: 141 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Admission;

use Admission\Assertion\ConventionFormationDoctorale\ConventionFormationDoctoraleAssertion;
use Admission\Assertion\ConventionFormationDoctorale\ConventionFormationDoctoraleAssertionFactory;
use Admission\Controller\ConventionFormationDoctorale\ConventionFormationDoctoraleController;
use Admission\Controller\ConventionFormationDoctorale\ConventionFormationDoctoraleControllerFactory;
use Admission\Form\ConventionFormationDoctorale\ConventionFormationDoctoraleForm;
use Admission\Form\ConventionFormationDoctorale\ConventionFormationDoctoraleFormFactory;
use Admission\Hydrator\ConventionFormationDoctorale\ConventionFormationDoctoraleHydrator;
use Admission\Hydrator\ConventionFormationDoctorale\ConventionFormationDoctoraleHydratorFactory;
use Admission\Provider\Privilege\AdmissionPrivileges;
use Admission\Service\ConventionFormationDoctorale\ConventionFormationDoctoraleService;
use Admission\Service\ConventionFormationDoctorale\ConventionFormationDoctoraleServiceFactory;
use Admission\Service\Exporter\ConventionFormationDoctorale\ConventionFormationDoctoraleExporter;
use Admission\Service\Exporter\ConventionFormationDoctorale\ConventionFormationDoctoraleExporterFactory;
use Laminas\Router\Http\Segment;
use UnicaenAuth\Guard\PrivilegeController;
use UnicaenAuth\Provider\Rule\PrivilegeRuleProvider;

return array(
    'bjyauthorize' => [
        'resource_providers' => [
            'BjyAuthorize\Provider\Resource\Config' => [
                'ConventionFormationDoctorale' => []
            ],
        ],
        'rule_providers'     => [
            PrivilegeRuleProvider::class => [
                'allow' => [
                    [
                        'privileges' => [
                            AdmissionPrivileges::ADMISSION_CONVENTION_FORMATION_MODIFIER,
                            AdmissionPrivileges::ADMISSION_CONVENTION_FORMATION_VISUALISER,
                            AdmissionPrivileges::ADMISSION_CONVENTION_FORMATION_GENERER,
                        ],
                        'resources'  => ['ConventionFormationDoctorale'],
                        'assertion'  => ConventionFormationDoctoraleAssertion::class,
                    ],
                ],
            ],
        ],
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => ConventionFormationDoctoraleController::class,
                    'action' => [
                        'modifier-convention-formation',
                        'ajouter-convention-formation',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_CONVENTION_FORMATION_MODIFIER,
                        AdmissionPrivileges::ADMISSION_CONVENTION_FORMATION_VISUALISER,
                    ],
                    'assertion' => ConventionFormationDoctoraleAssertion::class,
                ],
                [
                    'controller' => ConventionFormationDoctoraleController::class,
                    'action' => [
                        'generer-convention-formation',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_CONVENTION_FORMATION_GENERER,
                    ],
                    'assertion' => ConventionFormationDoctoraleAssertion::class,
                ],
            ]
        ],
    ],
    'router' => [
        'routes' => [
            'admission' => [
                'child_routes' => [
                    'generer-convention-formation' => [
                        'type'  => Segment::class,
                        'may_terminate' => true,
                        'options' => [
                            'route'    => '/generer-convention-formation/:admission',
                            'defaults' => [
                                'controller' => ConventionFormationDoctoraleController::class,
                                'action'     => 'generer-convention-formation',
                                /* @see ConventionFormationDoctoraleController::genererConventionFormationAction() */
                            ],
                        ],
                    ],
                    'ajouter-convention-formation' => [
                        'type'  => Segment::class,
                        'may_terminate' => true,
                        'options' => [
                            'route'    => '/convention-formation/ajouter/:admission',
                            'defaults' => [
                                'controller' => ConventionFormationDoctoraleController::class,
                                'action'     => 'ajouter-convention-formation',
                                /* @see ConventionFormationDoctoraleController::ajouterConventionFormationAction() */
                            ],
                        ],
                    ],
                    'modifier-convention-formation' => [
                        'type'  => Segment::class,
                        'may_terminate' => true,
                        'options' => [
                            'route'    => '/convention-formation/modifier/:admission',
                            'defaults' => [
                                'controller' => ConventionFormationDoctoraleController::class,
                                'action'     => 'modifier-convention-formation',
                                /* @see ConventionFormationDoctoraleController::modifierConventionFormationAction() */
                            ],
                        ],
                    ],
                ]
            ]
        ]
    ],

    'controllers' => [
        'factories' => [
            ConventionFormationDoctoraleController::class => ConventionFormationDoctoraleControllerFactory::class,
        ],
    ],

    'form_elements' => [
        'factories' => [
            ConventionFormationDoctoraleForm::class => ConventionFormationDoctoraleFormFactory::class
        ],
    ],

    'service_manager' => [
        'factories' => [
            ConventionFormationDoctoraleService::class => ConventionFormationDoctoraleServiceFactory::class,
            ConventionFormationDoctoraleAssertion::class => ConventionFormationDoctoraleAssertionFactory::class,
            ConventionFormationDoctoraleExporter::class => ConventionFormationDoctoraleExporterFactory::class
        ],
    ],

    'hydrators' => [
        'factories' => [
            ConventionFormationDoctoraleHydrator::class => ConventionFormationDoctoraleHydratorFactory::class
        ],
    ],
);
+139 −0
Changes for module/Admission/src/Admission/Assertion/AdmissionAbstractAssertion.php: 139 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Admission\Assertion;

use Admission\Entity\Db\AdmissionValidation;
use Admission\Entity\Db\TypeValidation;
use Admission\Rule\Operation\AdmissionOperationRuleAwareTrait;
use Admission\Service\Admission\AdmissionServiceAwareTrait;
use Application\Assertion\AbstractAssertion;
use Application\Assertion\ThrowsFailedAssertionExceptionTrait;
use Application\Entity\Db\Role;
use Application\RouteMatch;
use Application\Service\UserContextServiceAwareInterface;
use Admission\Entity\Db\Admission;
use UnicaenApp\Service\MessageCollectorAwareInterface;
use UnicaenApp\Service\MessageCollectorAwareTrait;

class AdmissionAbstractAssertion extends AbstractAssertion
    implements UserContextServiceAwareInterface, MessageCollectorAwareInterface
{
    use ThrowsFailedAssertionExceptionTrait;
    use MessageCollectorAwareTrait;

    use AdmissionServiceAwareTrait;
    use AdmissionOperationRuleAwareTrait;

    /**
     * @param array $page
     * @return bool
     */
    public function __invoke(array $page): bool
    {
        return $this->assertPage($page);
    }

    /**
     * @param array $page
     * @return bool
     */
    private function assertPage(array $page): bool
    {
        return true;
    }

    protected function assertEtatAdmission(Admission $admission)
    {
        $this->assertTrue(
            in_array($admission->getEtat()->getCode(), [Admission::ETAT_EN_COURS_SAISIE, Admission::ETAT_EN_COURS_VALIDATION]),
            "Le dossier d'admission doit être en cours"
        );
    }

    protected function assertDossierCompletAdmission(AdmissionValidation $admissionValidation)
    {
        //cette condition ne concerne pas la première validation du dossier
        if($admissionValidation->getTypeValidation()->getCode() == TypeValidation::CODE_ATTESTATION_HONNEUR_CHARTE_DOCTORALE){
            return;
        }
        $this->assertTrue(
            $admissionValidation->getAdmission()->isDossierComplet() === true,
            "Le dossier d'admission doit être en complet"
        );
    }

    /**
     * todo :
     */
    protected function assertAppartenanceAdmission(Admission $admission)
    {
        $role = $this->userContextService->getSelectedIdentityRole();

        if ($role->getRoleId() == Role::ROLE_ID_USER) {
            $individu = $this->userContextService->getIdentityIndividu();

            $this->assertTrue(
                $admission->getIndividu()->getId() === $individu->getId(),
                "Le dossier d'admission n'appartient pas à l'individu " . $individu
            );
        }

        // rôles structure-dépendants : ED, UR
        $role = $this->userContextService->getSelectedIdentityRole();
        if ($role->isStructureDependant()) {
            $structure = null;
            if ($role->getTypeStructureDependant()->isEcoleDoctorale()) {
                $structure = $admission->getInscription()->first()->getEcoleDoctorale()->getStructure();
            } elseif ($role->getTypeStructureDependant()->isUniteRecherche()) {
                $structure = $admission->getInscription()->first()->getUniteRecherche()->getStructure();
            }
            if ($structure !== null) {
                $this->assertTrue(
                    $structure->getId() === $role->getStructure()->getId(),
                    "Le dossier d'admission n'est pas rattaché à la structure '{$role->getStructure()->getCode()}' ({$role->getStructure()->getTypeStructure()})"
                );
            }
        }

        // rôle directeur de thèse
        if ($this->userContextService->getSelectedRoleDirecteurThese()) {
            $individuUtilisateur = $this->userContextService->getIdentityDb()->getIndividu();
            $this->assertTrue(
                $individuUtilisateur->getId() == $admission->getInscription()->first()->getDirecteur()->getId(),
                "Le dossier d'admission n'est pas dirigé par " . $individuUtilisateur
            );
        }

        // rôle codirecteur de thèse
        if ($this->userContextService->getSelectedRoleCodirecteurThese()) {
            $individuUtilisateur = $this->userContextService->getIdentityDb()->getIndividu();
            $this->assertTrue(
                $individuUtilisateur->getId() == $admission->getInscription()->first()->getCoDirecteur()->getId(),
                "Le dossier d'admission n'est pas co-dirigé par " . $individuUtilisateur
            );
        }
    }
    protected function getRequestedAdmission(): ?Admission
    {
        $admission = null;
        if (($routeMatch = $this->getRouteMatch()) && $id = $routeMatch->getParam('individu')) {
            $admission = $this->admissionService->getRepository()->findOneByIndividu($id);
        }

        if (empty($admission)) {
            if (($routeMatch = $this->getRouteMatch()) && $id = $routeMatch->getParam('admission')) {
                $admission = $this->admissionService->getRepository()->findOneById($id);
            }
        }

        return $admission;
    }

    protected function getRouteMatch(): ?RouteMatch
    {
        /** @var \Application\RouteMatch $rm */
        $rm = $this->getMvcEvent()->getRouteMatch();
        return $rm;
    }

}
 No newline at end of file
+48 −41
Changes for module/Admission/src/Admission/Assertion/AdmissionAssertion.php: 48 added lines, 41 removed lines.
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ class AdmissionAssertion extends AbstractAssertion implements UserContextService
                case 'notifier-gestionnaire':
                case 'notifier-dossier-complet':
                case 'generer-recapitulatif':
                case 'ajouter-convention-formation' :
                    if ($this->admission !== null) {
                        $this->assertAppartenanceAdmission($this->admission);
                    }
@@ -92,9 +93,7 @@ class AdmissionAssertion extends AbstractAssertion implements UserContextService
            switch ($action) {
                case 'enregistrer-document':
                case 'supprimer-document':
                case 'notifier-commentaires-ajoutes':
                case 'notifier-gestionnaire':
                case 'notifier-dossier-complet':
                    if ($this->admission !== null) {
                        $this->assertEtatAdmission($this->admission);
                    }
@@ -113,8 +112,9 @@ class AdmissionAssertion extends AbstractAssertion implements UserContextService
                case 'notifier-commentaires-ajoutes':
                case 'notifier-gestionnaire':
                case 'notifier-dossier-complet':
                case 'notifier-dossier-incomplet':
                    if ($this->admission !== null) {
                        $this->assertCanNotifierCommentairesAjoutes($this->admission->getAdmissionValidations());
                        $this->assertCanGestionnaireGererAdmission($this->admission->getAdmissionValidations());
                    }
                    break;
            }
@@ -147,16 +147,21 @@ class AdmissionAssertion extends AbstractAssertion implements UserContextService
                case AdmissionPrivileges::ADMISSION_MODIFIER_SON_DOSSIER_ADMISSION:
                case AdmissionPrivileges::ADMISSION_SUPPRIMER_TOUS_DOSSIERS_ADMISSION:
                case AdmissionPrivileges::ADMISSION_SUPPRIMER_SON_DOSSIER_ADMISSION:
                case AdmissionPrivileges::ADMISSION_VERIFIER:
                case AdmissionPrivileges::ADMISSION_ACCEDER_COMMENTAIRES:
                case AdmissionPrivileges::ADMISSION_TELEVERSER_TOUT_DOCUMENT:
                case AdmissionPrivileges::ADMISSION_TELEVERSER_SON_DOCUMENT:
                case AdmissionPrivileges::ADMISSION_SUPPRIMER_TOUT_DOCUMENT:
                case AdmissionPrivileges::ADMISSION_SUPPRIMER_SON_DOCUMENT:
                case AdmissionPrivileges::ADMISSION_NOTIFIER_GESTIONNAIRES:
                    $this->assertEtatAdmission($this->admission);
            }

            switch ($privilege) {
                case AdmissionPrivileges::ADMISSION_ACCEDER_COMMENTAIRES:
                case AdmissionPrivileges::ADMISSION_NOTIFIER_COMMENTAIRES_AJOUTES:
                case AdmissionPrivileges::ADMISSION_VERIFIER:
                case AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_COMPLET:
                    $this->assertEtatAdmission($this->admission);
                case AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_INCOMPLET:
                    $this->assertCanGestionnaireGererAdmission($this->admission->getAdmissionValidations());
            }

            switch ($privilege) {
@@ -170,6 +175,7 @@ class AdmissionAssertion extends AbstractAssertion implements UserContextService
                case AdmissionPrivileges::ADMISSION_NOTIFIER_COMMENTAIRES_AJOUTES:
                case AdmissionPrivileges::ADMISSION_VERIFIER:
                case AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_COMPLET:
                case AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_INCOMPLET:
                    $this->assertAppartenanceAdmission($this->admission);
            }

@@ -203,6 +209,8 @@ class AdmissionAssertion extends AbstractAssertion implements UserContextService
                (int)$id === $individu->getId(),
                "Le dossier d'admission n'appartient pas à l'individu " . $individu
            );
        }else{ // à faire évoluer lorsque il y aura les nouveaux rôles pour le directeur de thèse
//            throw new FailedAssertionException("Vous n'avez pas les droits pour initialiser un dossier d'admission");
        }
    }

@@ -213,46 +221,34 @@ class AdmissionAssertion extends AbstractAssertion implements UserContextService
            return;
        }

        $isNotDirecteurOfAdmission = false;
        $isNotEtudiantOfAdmission = false;
        $isNotCoDirecteurOfAdmission = false;

        //Si le rôle connecté est Authentifié
        if ($role->getRoleId() == Role::ROLE_ID_USER) {
            $individu = $this->userContextService->getIdentityIndividu();
//            if($admission->getIndividu()->getId() !== $individu->getId()){
//                $isNotEtudiantOfAdmission = true;
//            }
            $this->assertTrue(
                $admission->getIndividu()->getId() === $individu->getId(),
                "Le dossier d'admission n'appartient pas à l'individu " . $individu
            );
            //Si l'étudiant attaché au dossier est bien celui de l'individu connecté
            if($admission->getIndividu()->getId() !== $individu->getId()){
                $isNotEtudiantOfAdmission = true;
            }

//            $individuUtilisateur = $this->userContextService->getIdentityDb()->getIndividu();
//            if($admission->getInscription()->first()){
//                if($individuUtilisateur->getId() !== $admission->getInscription()->first()->getDirecteur()->getId()){
//                    $isNotDirecteurOfAdmission = true;
//                }
//            }

//            // cas du directeur de thèse
//            $this->assertTrue(
//                $individuUtilisateur->getId() == $admission->getInscription()->first()->getDirecteur()->getId(),
//                "Le dossier d'admission n'est pas dirigé par " . $individuUtilisateur
//            );

//            if($admission->getInscription()->first()) {
//                if ($individuUtilisateur->getId() !== $admission->getInscription()->first()->getDirecteur()->getId()) {
//                    $isNotCoDirecteurOfAdmission = true;
//                }
//            }
//
//            if($isNotEtudiantOfAdmission && $isNotDirecteurOfAdmission && $isNotCoDirecteurOfAdmission){
//                throw new FailedAssertionException("Vous ne pouvez pas à accéder à cette page");
//            }

//            // cas du codirecteur de thèse
//            $this->assertTrue(
//                    $individuUtilisateur->getId() == $admission->getInscription()->first()->getCoDirecteur()->getId(),
//                    "Le dossier d'admission n'est pas co-dirigé par " . $individuUtilisateur
//            );
            $individuUtilisateur = $this->userContextService->getIdentityDb()->getIndividu();
            if($admission->getInscription()->first()){
                //Si le directeur attaché au dossier n'est pas celui de l'individu connecté
                if(!$admission->getInscription()->first()->getDirecteur() || $admission->getInscription()->first()->getDirecteur() && $individuUtilisateur->getId() !== $admission->getInscription()->first()->getDirecteur()->getId()){
                    $isNotDirecteurOfAdmission = true;
                }

                //Si le co-directeur attaché au dossier n'est pas celui de l'individu connecté
                if (!$admission->getInscription()->first()->getCoDirecteur() || $admission->getInscription()->first()->getCoDirecteur() && $individuUtilisateur->getId() !== $admission->getInscription()->first()->getCoDirecteur()->getId()) {
                    $isNotCoDirecteurOfAdmission = true;
                }
            }

            if($isNotEtudiantOfAdmission && $isNotDirecteurOfAdmission && $isNotCoDirecteurOfAdmission){
                throw new FailedAssertionException("Vous ne pouvez pas à accéder à cette page");
            }
        } elseif ($roleEcoleDoctorale = $this->userContextService->getSelectedRoleEcoleDoctorale()) {
            $message = "Le dossier d'admission n'est pas rattachée à l'ED " . $roleEcoleDoctorale->getStructure()->getCode();
            if ($admission->getInscription()->first() && $admission->getInscription()->first()->getEcoleDoctorale()) {
@@ -323,6 +319,17 @@ class AdmissionAssertion extends AbstractAssertion implements UserContextService
        }
    }

    protected function assertCanGestionnaireGererAdmission(Collection $admissionValidations)
    {
        foreach ($admissionValidations as $admissionValidation) {
            $this->assertTrue(
                TypeValidation::CODE_VALIDATION_GESTIONNAIRE !== $admissionValidation->getTypeValidation()->getCode(),
                "Le gestionnaire peut gérer le dossier (ajouter des commentaires, notifier l'étudiant) seulement si leur validation
                                 n'a pas encore été effectuée"
            );
        }
    }

    protected function assertCanGenererRecapitulatif(Collection $admissionValidations)
    {
        $canGenerate = false;
Loading