Commit 93f227ed authored by thomas.hamel's avatar thomas.hamel Committed by Thomas Hamel
Browse files

version test fonctionnelle

parent 34384a03
Loading
Loading
Loading
Loading
+33 −7
Changes for module/Admission/Sql/admission.sql: 33 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ create table admission_admission
(
    id                    bigserial not null
        primary key,
    individu_id           bigint REFERENCES individu (id),
    etat_id               bigint,
    histo_createur_id     bigint    not null REFERENCES utilisateur (id),
    histo_creation        timestamp default ('now'::text):: timestamp without time zone not null,
@@ -24,7 +25,7 @@ create table admission_individu
    prenom3                                   varchar(60),
    date_naissance                            timestamp,
    ville_naissance                           varchar(60),
    nationalite                      varchar(128),
    nationalite_id                            bigint REFERENCES pays (id),
    pays_naissance_id                         bigint REFERENCES pays (id),
    code_nationalite                          varchar(5),
    ine                                       varchar(11),
@@ -41,11 +42,14 @@ create table admission_individu
    numero_telephone2                         varchar(20),
    courriel                                  varchar(255),
    situation_handicap                        boolean,
    niveau_etude                     boolean,
    intitule_du_diplome              varchar(128),
    annee_dobtention_diplome         integer,
    etablissement_dobtention_diplome varchar(128),
    niveau_etude                              integer,
    intitule_du_diplome_national              varchar(128),
    annee_dobtention_diplome_national         integer,
    etablissement_dobtention_diplome_national varchar(128),
    type_diplome_autre                        boolean,
    intitule_du_diplome_autre                 varchar(128),
    annee_dobtention_diplome_autre            integer,
    etablissement_dobtention_diplome_autre    varchar(128),
    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),
@@ -60,16 +64,23 @@ create table admission_inscription
        primary key,
    admission_id             bigint REFERENCES admission_admission (id),
    discipline_doctorat      varchar(60),
    composante_doctorat_id   bigint REFERENCES structure (id),
    specialite_doctorat      varchar(60),
    composante_doctorat_id   bigint REFERENCES etablissement (id),
    ecole_doctorale_id       bigint REFERENCES ecole_doct (id),
    unite_recherche_id       bigint REFERENCES unite_rech (id),
    directeur_these_id       bigint REFERENCES individu (id),
    prenom_directeur_these   varchar(60),
    nom_directeur_these      varchar(60),
    mail_directeur_these     varchar(255),
    codirecteur_these_id     bigint REFERENCES individu (id),
    prenom_codirecteur_these varchar(60),
    nom_codirecteur_these    varchar(60),
    mail_codirecteur_these   varchar(255),
    titre_these              varchar(60),
    confidentialite          boolean,
    date_confidentialite     timestamp,
    co_tutelle               boolean,
    pays_co_tutelle       varchar(60),
    pays_co_tutelle_id       bigint REFERENCES pays (id),
    co_encadrement           boolean,
    co_direction             boolean,
    histo_createur_id        bigint    not null REFERENCES utilisateur (id),
@@ -124,3 +135,18 @@ create table admission_validation
    histo_destructeur_id  bigint REFERENCES utilisateur (id),
    histo_destruction     timestamp
);

create table admission_document
(
    id                    bigserial not null
        primary key,
    admission_id          bigint REFERENCES admission_admission (id),
    nature_id             bigint REFERENCES nature_fichier (id),
    fichier_id            bigint REFERENCES fichier (id),
    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),
    histo_modification    timestamp,
    histo_destructeur_id  bigint REFERENCES utilisateur (id),
    histo_destruction     timestamp
);
+12 −10
Changes for module/Admission/config/module.config.php: 12 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ use Admission\Entity\Db\Repository\IndividuRepository;
use Admission\Entity\Db\Repository\IndividuRepositoryFactory;
use Admission\Form\Admission\AdmissionForm;
use Admission\Form\Admission\AdmissionFormFactory;
use Admission\Form\Fieldset\Etudiant\EtudiantFieldset;
use Admission\Form\Fieldset\Etudiant\EtudiantFieldsetFactory;
use Admission\Form\Fieldset\Individu\IndividuFieldset;
use Admission\Form\Fieldset\Individu\IndividuFieldsetFactory;
use Admission\Form\Fieldset\Financement\FinancementFieldset;
use Admission\Form\Fieldset\Financement\FinancementFieldsetFactory;
use Admission\Form\Fieldset\Inscription\InscriptionFieldset;
@@ -29,6 +29,8 @@ use Admission\Hydrator\ValidationHydrator;
use Admission\Hydrator\ValidationHydratorFactory;
use Admission\Service\Admission\AdmissionService;
use Admission\Service\Admission\AdmissionServiceFactory;
use Admission\Service\Document\DocumentService;
use Admission\Service\Document\DocumentServiceFactory;
use Admission\Service\Financement\FinancementService;
use Admission\Service\Financement\FinancementServiceFactory;
use Admission\Service\Individu\IndividuService;
@@ -67,14 +69,14 @@ return array(
                [
                    'controller' => AdmissionController::class,
                    'action' => [
                        'index',
                        'ajouter',
                        'etudiant',
                        'individu',
                        'inscription',
                        'financement',
                        'validation',
                        'confirmer',
                        'annuler',
                        'etudiantEnregistrer',
                        'enregistrer',
                        'rechercher-individu'
                    ]
@@ -90,7 +92,7 @@ return array(
                'options' => [
                    'route' => '/admission',
                    'defaults' => [
                        'action' => 'ajouter',
                        'action' => 'index',
                        'controller' => AdmissionController::class,
                    ],
                ],
@@ -101,11 +103,10 @@ return array(
                            'route' => '/:action/:individu',
                            'constraints' => [
                                /**
                                 * @see AdmissionController::etudiantAction()
                                 * @see AdmissionController::individuAction()
                                 * @see AdmissionController::inscriptionAction()
                                 * @see AdmissionController::financementAction()
                                 * @see AdmissionController::validationAction()Action()
                                 *
                                 * @see AdmissionController::validationAction()
                                 */
                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
                                'individu' => '[0-9]*'
@@ -136,7 +137,7 @@ return array(
    'form_elements' => [
        'factories' => [
            AdmissionForm::class => AdmissionFormFactory::class,
            EtudiantFieldset::class => EtudiantFieldsetFactory::class,
            IndividuFieldset::class => IndividuFieldsetFactory::class,
            InscriptionFieldset::class => InscriptionFieldsetFactory::class,
            FinancementFieldset::class => FinancementFieldsetFactory::class,
            ValidationFieldset::class => ValidationFieldsetFactory::class
@@ -159,7 +160,8 @@ return array(
            FinancementService::class => FinancementServiceFactory::class,
            IndividuService::class => IndividuServiceFactory::class,
            InscriptionService::class => InscriptionServiceFactory::class,
            ValidationService::class => ValidationServiceFactory::class
            ValidationService::class => ValidationServiceFactory::class,
            DocumentService::class => DocumentServiceFactory::class
        ],
    ],

+1 −1
Changes for module/Admission/config/others/admission.config.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ return array(

    'form_manager' => [
        'factories' => [
//            EtudiantFieldset::class => InvokableFactory::class,
//            IndividuFieldset::class => InvokableFactory::class,
//            InscriptionFieldset::class => InvokableFactory::class,
//            FinancementFieldset::class => InvokableFactory::class,
//            ValidationFieldset::class => InvokableFactory::class
+2 −0
Changes for module/Admission/src/Admission/Controller/AdmissionAbstractController.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ namespace Admission\Controller;

use Admission\Form\Admission\AdmissionForm;
use Laminas\Http\Response;
use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;
use Laminas\View\Model\ViewModel;
use UnicaenApp\Controller\Plugin\MultipageFormPlugin;
use UnicaenApp\Form\MultipageForm;
@@ -13,6 +14,7 @@ use Laminas\Mvc\Controller\AbstractActionController;
 * Class AdmissionAbstractController
 *
 * @method MultipageFormPlugin multipageForm(?MultipageForm $form = null)
 * @method FlashMessenger flashMessenger()
 */
class AdmissionAbstractController extends AbstractActionController
{
+240 −136

File changed.

Preview size limit exceeded, changes collapsed.

Loading