Commit 70955f26 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

téléversement/téléchargement des documents fonctionnel

parent eb5d229b
Loading
Loading
Loading
Loading
+82 −12
Changes for module/Admission/Sql/admission.sql: 82 added lines, 12 removed lines.
Original line number Diff line number Diff line
create table admission_admission
create table IF NOT EXISTS admission_admission
(
    id                    bigserial                                                    not null
        primary key,
    individu_id           bigint REFERENCES individu (id),
    etat_id               bigint,
    etat_code             varchar(1) REFERENCES admission_etat (code),
    histo_createur_id     bigint                                                       not null REFERENCES utilisateur (id),
    histo_creation        timestamp default ('now'::text)::timestamp without time zone not null,
    histo_modificateur_id bigint REFERENCES utilisateur (id),
@@ -12,7 +12,7 @@ create table admission_admission
    histo_destruction     timestamp
);

create table admission_etudiant
create table IF NOT EXISTS admission_etudiant
(
    id                                        bigserial                                                    not null
        primary key,
@@ -58,7 +58,7 @@ create table admission_etudiant
    histo_destruction                         timestamp
);

create table admission_inscription
create table IF NOT EXISTS admission_inscription
(
    id                       bigserial                                                    not null
        primary key,
@@ -91,7 +91,7 @@ create table admission_inscription
    histo_destruction        timestamp
);

create table admission_financement
create table IF NOT EXISTS admission_financement
(
    id                      bigserial                                                    not null
        primary key,
@@ -107,7 +107,7 @@ create table admission_financement
    histo_destruction       timestamp
);

create table admission_type_validation
create table IF NOT EXISTS admission_type_validation
(
    id                    bigserial                                                    not null
        primary key,
@@ -121,7 +121,7 @@ create table admission_type_validation
    histo_destruction     timestamp
);

create table admission_validation
create table IF NOT EXISTS admission_validation
(
    id                    bigserial                                                    not null
        primary key,
@@ -136,7 +136,54 @@ create table admission_validation
    histo_destruction     timestamp
);

create table admission_document
-- Nouvelle table
create table IF NOT EXISTS admission_etat
(
    code        varchar(1) not null primary key,
    libelle     varchar(1024),
    description text,
    icone       varchar(1024),
    couleur     varchar(1024),
    ordre       bigint
);

INSERT INTO admission_etat (code, libelle, description, icone, couleur, ordre)
VALUES ('C', 'En cours', 'Dossier d''admission en cours de saisie', '', '', 1),
       ('A', 'Abandonné', 'Dossier d''admission abandonné', '', '', 3),
       ('V', 'Validé', 'Dossier d''admission validé', '', '', 2)
ON CONFLICT DO NOTHING;

-- Changement de nom de la colonne etat_id en etat_code
DO
$$
    BEGIN
        IF EXISTS (SELECT 1
                   FROM information_schema.columns
                   WHERE table_name = 'admission_admission'
                     AND column_name = 'etat_id') THEN
            ALTER TABLE admission_admission
                RENAME COLUMN etat_id TO etat_code;
        END IF;
    END
$$;

-- Création de la clé étrangère d'admission_admission(etat_code) vers admission_etat(code)
DO
$$
    BEGIN
        IF NOT EXISTS (SELECT 1
                       FROM information_schema.table_constraints
                       WHERE table_name = 'admission_admission'
                         AND constraint_name = 'fk_admission_etat') THEN
            ALTER TABLE admission_admission
                ADD CONSTRAINT fk_admission_etat
                    FOREIGN KEY (etat_code)
                        REFERENCES admission_etat (code);
        END IF;
    END
$$;

create table IF NOT EXISTS admission_document
(
    id                    bigserial                                                    not null
        primary key,
@@ -151,7 +198,7 @@ create table admission_document
    histo_destruction     timestamp
);

create table admission_verification
create table IF NOT EXISTS admission_verification
(
    id                       bigserial                                                    not null
        primary key,
@@ -170,11 +217,32 @@ create table admission_verification
    histo_destruction        timestamp
);

INSERT INTO nature_fichier (id, code, libelle)
VALUES (207, 'ADMISSION_DIPLOME_BAC', 'Diplôme de Bac + 5 permettant l''accès au doctorat'),
       (208, 'ADMISSION_CURRICULUM_VITAE', 'Curriculum Vitae'),
       (209, 'ADMISSION_FINANCEMENT', 'Justificatif du financement (contrat, attestation de l''employeur)'),
       (210, 'ADMISSION_PROJET_THESE', 'Le projet de thèse et son titre'),
       (211, 'ADMISSION_CONVENTION', 'Convention de formation doctorale'),
       (212, 'ADMISSION_CHARTE_DOCTORAT', 'Charte du doctorat'),
       (213, 'ADMISSION_DIPLOMES_RELEVES_TRADUITS',
        'Diplômes et relevés de notes traduits en français avec tampons originaux'),
       (214, 'ADMISSION_ACTE_NAISSANCE', 'Extrait d''acte de naissance'),
       (215, 'ADMISSION_PASSEPORT',
        'Photocopie du passeport (ou de la carte d''identité pour les ressortissants européens)'),
       (216, 'ADMISSION_DIPLOMES_TRAVAUX_EXPERIENCE_PRO', 'Diplômes, travaux et expérience professionnelle détaillés'),
       (217, 'ADMISSION_DEMANDE_COTUTELLE', 'Formulaire de demande de cotutelle'),
       (218, 'ADMISSION_DEMANDE_COENCADREMENT', 'Formulaire de demande de co-encadrement')
ON CONFLICT DO NOTHING;

-- GESTION DES PRIVILÈGES
--
-- Nouvelle catégorie de privilèges : Admission.
--
insert into CATEGORIE_PRIVILEGE(ID, CODE, LIBELLE, ORDRE)
select nextval('categorie_privilege_id_seq'), 'admission', 'Admission', 11000;
INSERT INTO CATEGORIE_PRIVILEGE (ID, CODE, LIBELLE, ORDRE)
SELECT nextval('categorie_privilege_id_seq'), 'admission', 'Admission', 11000
WHERE NOT EXISTS (SELECT 1
                  FROM CATEGORIE_PRIVILEGE
                  WHERE CODE = 'admission');

--
-- Nouveaux privilèges.
@@ -210,7 +278,9 @@ with d(ordre, code, lib) as (select 1,
select nextval('privilege_id_seq'), cp.id, d.code, d.lib, d.ordre
from d
         join CATEGORIE_PRIVILEGE cp on cp.CODE = 'admission'
;
WHERE NOT EXISTS (SELECT 1
                  FROM PRIVILEGE p
                  WHERE p.CODE = d.code);

--
-- Accord de privilèges à des profils.
+53 −4
Changes for module/Admission/config/module.config.php: 53 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ use Admission\Controller\AdmissionControllerFactory;
use Admission\Entity\Db\Repository\IndividuRepositoryFactory;
use Admission\Form\Admission\AdmissionForm;
use Admission\Form\Admission\AdmissionFormFactory;
use Admission\Form\Fieldset\Document\DocumentFieldset;
use Admission\Form\Fieldset\Document\DocumentFieldsetFactory;
use Admission\Form\Fieldset\Etudiant\EtudiantFieldset;
use Admission\Form\Fieldset\Etudiant\EtudiantFieldsetFactory;
use Admission\Form\Fieldset\Financement\FinancementFieldset;
@@ -22,6 +24,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\Document\DocumentHydrator;
use Admission\Hydrator\Document\DocumentHydratorFactory;
use Admission\Hydrator\Etudiant\EtudiantHydrator;
use Admission\Hydrator\Etudiant\EtudiantHydratorFactory;
use Admission\Hydrator\Financement\FinancementHydrator;
@@ -49,6 +53,7 @@ use Admission\Service\Verification\VerificationService;
use Admission\Service\Verification\VerificationServiceFactory;
use Doctrine\ORM\Mapping\Driver\XmlDriver;
use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
use Laminas\Router\Http\Literal;
use Laminas\Router\Http\Segment;
use UnicaenAuth\Guard\PrivilegeController;
use UnicaenAuth\Provider\Rule\PrivilegeRuleProvider;
@@ -107,7 +112,10 @@ return array(
                        'index',
                        'confirmer',
                        'enregistrer',
                        'rechercher-individu'
                        'rechercher-individu',
                        'enregistrer-document',
                        'supprimer-document',
                        'telecharger-document'
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_LISTER_SON_DOSSIER_ADMISSION,
@@ -130,7 +138,7 @@ return array(
                        'etudiant',
                        'inscription',
                        'financement',
                        'validation',
                        'document',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION,
@@ -180,6 +188,9 @@ return array(
                            ],
                        ],
                    ],
                    /**
                     * @see AdmissionController::rechercherIndividuAction()
                     */
                    'rechercher-individu' => [
                        'type'          => Segment::class,
                        'options'       => [
@@ -189,6 +200,42 @@ return array(
                            ],
                        ],
                    ],
                    /**
                     * @see AdmissionController::enregistrerDocumentAction()
                     */
                    'enregistrer-document' => [
                        'type'          => Literal::class,
                        'options'       => [
                            'route'       => '/enregistrer-document',
                            'defaults'    => [
                                'action' => 'enregistrer-document',
                            ],
                        ],
                    ],
                    /**
                     * @see AdmissionController::supprimerDocumentAction()
                     */
                    'supprimer-document' => [
                        'type'          => Literal::class,
                        'options'       => [
                            'route'       => '/supprimer-document',
                            'defaults'    => [
                                'action' => 'supprimer-document',
                            ],
                        ],
                    ],
                    /**
                     * @see AdmissionController::telechargerDocumentAction()
                     */
                    'telecharger-document' => [
                        'type'          => Literal::class,
                        'options'       => [
                            'route'       => '/telecharger-document',
                            'defaults'    => [
                                'action' => 'telecharger-document',
                            ],
                        ],
                    ],
                ],
            ],

@@ -208,7 +255,8 @@ return array(
            InscriptionFieldset::class => InscriptionFieldsetFactory::class,
            FinancementFieldset::class => FinancementFieldsetFactory::class,
            ValidationFieldset::class => ValidationFieldsetFactory::class,
            VerificationFieldset::class => VerificationFieldsetFactory::class
            VerificationFieldset::class => VerificationFieldsetFactory::class,
            DocumentFieldset::class => DocumentFieldsetFactory::class
        ],
    ],

@@ -219,7 +267,8 @@ return array(
            InscriptionHydrator::class => InscriptionHydratorFactory::class,
            FinancementHydrator::class => FinancementHydratorFactory::class,
            ValidationHydrator::class => ValidationHydratorFactory::class,
            VerificationHydrator::class => VerificationHydratorFactory::class
            VerificationHydrator::class => VerificationHydratorFactory::class,
            DocumentHydrator::class => DocumentHydratorFactory::class
        ],
    ],

+183 −36

File changed.

Preview size limit exceeded, changes collapsed.

+10 −1
Changes for module/Admission/src/Admission/Controller/AdmissionControllerFactory.php: 10 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -12,8 +12,11 @@ use Admission\Service\Notification\NotificationFactory;
use Admission\Service\Validation\ValidationService;
use Admission\Service\Verification\VerificationService;
use Application\Service\Discipline\DisciplineService;
use Fichier\Entity\Db\VersionFichier;
use Fichier\Service\Fichier\FichierService;
use Fichier\Service\Fichier\FichierStorageService;
use Fichier\Service\NatureFichier\NatureFichierService;
use Fichier\Service\VersionFichier\VersionFichierService;
use Individu\Service\IndividuService;
use Interop\Container\ContainerInterface;
use Laminas\ServiceManager\Factory\FactoryInterface;
@@ -38,6 +41,7 @@ class AdmissionControllerFactory implements FactoryInterface
         * @var NotificationFactory $notificationFactory
         * @var NotifierService $notifierService
         */
        $entityManager = $container->get('doctrine.entitymanager.orm_default');
        $structureService = $container->get(StructureService::class);
        $etudiantService = $container->get(EtudiantService::class);
        $individuService = $container->get(IndividuService::class);
@@ -52,6 +56,9 @@ class AdmissionControllerFactory implements FactoryInterface
        $natureFichierService = $container->get(NatureFichierService::class);
        $fichierService = $container->get(FichierService::class);
        $documentService = $container->get(DocumentService::class);
        $versionFichierService = $container->get(VersionFichierService::class);
        $fichierStorageService = $container->get(FichierStorageService::class);


        /**
         * @var AdmissionForm $etudiantForm
@@ -59,7 +66,7 @@ class AdmissionControllerFactory implements FactoryInterface
        $admissionForm = $container->get('FormElementManager')->get(AdmissionForm::class);

        $controller = new AdmissionController();

        $controller->setEntityManager($entityManager);
        $controller->setStructureService($structureService);
        $controller->setEtudiantService($etudiantService);
        $controller->setInscriptionService($inscriptionService);
@@ -73,7 +80,9 @@ class AdmissionControllerFactory implements FactoryInterface
        $controller->setNotifierService($notifierService);
        $controller->setNatureFichierService($natureFichierService);
        $controller->setFichierService($fichierService);
        $controller->setFichierStorageService($fichierStorageService);
        $controller->setDocumentService($documentService);
        $controller->setVersionFichierService($versionFichierService);
        $controller->setAdmissionForm($admissionForm);

        return $controller;
+179 −0
Changes for module/Admission/src/Admission/Controller/AdmissionRechercheController.php: 179 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Admission\Controller;

use Application\Controller\AbstractController;
use Application\Entity\Db\Role;
use Application\Search\Controller\SearchControllerInterface;
use Application\Search\Controller\SearchControllerTrait;
use Application\Search\SearchResultPaginator;
use Application\Search\SearchServiceAwareTrait;
use Application\Service\Role\RoleServiceAwareTrait;
use Laminas\Http\Response;
use Laminas\View\Model\ViewModel;
use These\Entity\Db\These;
use These\Service\These\TheseSearchService;
use These\Service\These\TheseServiceAwareTrait;

/**
 * Class AdmissionRechercheController
 *
 * @property TheseSearchService $searchService
 */
class AdmissionRechercheController extends AbstractController implements SearchControllerInterface
{
    use SearchServiceAwareTrait;
    use SearchControllerTrait;

    use RoleServiceAwareTrait;
    use TheseServiceAwareTrait;

    /**
     * @var array
     */
    private $queryParams;

    /**
     * @var array
     */
    private $searchIfRequired = false; // todo : ne pas mettre à true car impossible de dépasser la page 1 !! :-(

    /**
     * @return ViewModel|Response
     */
    public function indexAction()
    {
        $text = $this->params()->fromQuery('text');

        /** @see TheseSearchService */
        $result = $this->searchIfRequired ? $this->searchIfRequested() : $this->search();
        if ($result instanceof Response) {
            return $result;
        }
        /** @var SearchResultPaginator $paginator */
        $paginator = $result;

        $etablissement = $this->searchService->getEtablissementInscSearchFilter()->getValue();
        $etatThese = $this->searchService->getFilterValueByName(TheseSearchService::NAME_etatThese);

        return new ViewModel([
            'theses' => $paginator,
            'text' => $text,
            'roleDirecteurThese' => $this->roleService->getRepository()->findOneBy(['sourceCode' => Role::CODE_DIRECTEUR_THESE]),
            'displayEtablissement' => !$etablissement,
            'displayDateSoutenance' => $etatThese === These::ETAT_SOUTENUE || !$etatThese,
            'etatThese' => $etatThese,
            'filtersRoute' => 'these/recherche/filters',
        ]);
    }

    /**
     * @return ViewModel
     */
    public function indexFiltersAction(): ViewModel
    {
        $filters = $this->filters();

        $vm = new ViewModel([
            'filters' => $filters,
            'message' => "coucou!",
        ]);
        $vm->setTemplate('these/these-recherche/filters');

        return $vm;
    }

//    /**
//     * Pour les acteurs de thèses en général (Doctorant, Dir, Codir, etc.)
//     *
//     * @return ViewModel|Response
//     */
//    public function miennesAction()
//    {
//        /** @var Role $role */
//        $role = $this->userContextService->getSelectedIdentityRole();
//        $individu = $this->userContextService->getIdentityIndividu();
//        $etats = [These::ETAT_EN_COURS];
//
//        switch (true) {
//            case $role->isDoctorant() :
//                $theses = $this->theseService->getRepository()->findThesesByDoctorantAsIndividu($individu, $etats);
//                break;
//            case $role->isActeurDeThese() :
//                $theses = $this->theseService->getRepository()->findThesesByActeur($individu, $role, $etats);
//                break;
//            default:
//                return $this->redirect()->toRoute('home');
//        }
//
//        return new ViewModel([
//            'theses' => $theses,
//        ]);
//    }

    /**
     * Prévu pour ED, UR, MDD.
     *
     * @return ViewModel
     */
    public function notresAction()
    {
        $this->restrictFilters();

        $this->searchIfRequired = false;

        $viewModel = $this->indexAction();
        $viewModel->setTemplate('these/these-recherche/index');
        $viewModel->setVariables([
            'filtersRoute' => 'these/recherche/notres/filters',
        ]);

        return $viewModel;
    }

    /**
     * @return ViewModel
     */
    public function notresFiltersAction(): ViewModel
    {
        $this->restrictFilters();

        $filters = $this->filters();

        $vm = new ViewModel([
            'filters' => $filters,
            'message' => "coucou!",
        ]);
        $vm->setTemplate('these/these-recherche/filters');

        return $vm;
    }

    private function restrictFilters()
    {
        /** @var Role $role */
        $role = $this->userContextService->getSelectedIdentityRole();

        switch (true) {
            case $role->isEcoleDoctoraleDependant():
                $filter = $this->searchService->getEcoleDoctoraleSearchFilter();
                $entity = $role->getStructure()->getEcoleDoctorale();
                break;
            case $role->isUniteRechercheDependant():
                $filter = $this->searchService->getUniteRechercheSearchFilter();
                $entity = $role->getStructure()->getUniteRecherche();
                break;
            case $role->isEtablissementDependant():
                $filter = $this->searchService->getEtablissementInscSearchFilter();
                $entity = $role->getStructure()->getEtablissement();
                break;
            default:
                return;
        }

        $filter
            ->setData([$entity])
            ->setDefaultValueAsObject($entity)
            ->setAllowsEmptyOption(false);
    }
}
 No newline at end of file
Loading