Commit 24f0f4bf authored by Thomas Hamel's avatar Thomas Hamel
Browse files

modif sql

parent 37f2e4a2
Loading
Loading
Loading
Loading
+98 −1
Changes for module/Admission/Sql/admission.sql: 98 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ create table admission_admission
    histo_destruction     timestamp
);

create table admission_individu
create table admission_etudiant
(
    id                                        bigserial                                                    not null
        primary key,
@@ -150,3 +150,100 @@ create table admission_document
    histo_destructeur_id  bigint REFERENCES utilisateur (id),
    histo_destruction     timestamp
);

create table admission_verification
(
    id                       bigserial                                                    not null
        primary key,
    admission_etudiant_id    bigint REFERENCES admission_etudiant (id),
    admission_inscription_id bigint REFERENCES admission_inscription (id),
    admission_financement_id bigint REFERENCES admission_financement (id),
    admission_document_id    bigint REFERENCES admission_document (id),
    est_complet boolean,
    individu_id              bigint REFERENCES individu (id),
    commentaire              text,
    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
);

--
-- Nouvelle catégorie.
--
insert into CATEGORIE_PRIVILEGE(ID, CODE, LIBELLE, ORDRE)
select nextval('categorie_privilege_id_seq'), 'admission', 'Admission', 11000;

--
-- Nouveaux privilèges.
--
insert into PRIVILEGE(ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE)
with d(ordre, code, lib) as (
    select 1, 'admission-lister', 'Lister le(s) dossier(s) d''admission en cours' union
    select 2, 'admission-afficher', 'Consulter un dossier d''admission' union
    select 3, 'admission-ajouter', 'Ajouter un dossier d''admission' union
    select 4, 'admission-modifier', 'Modifier un dossier d''admission' union
    select 5, 'admission-historiser', 'Historiser un dossier d''admission' union
    select 6, 'admission-supprimer', 'Supprimer un dossier d''admission' union
    select 7, 'admission-verifier', 'Ajouter des commentaires au dossier d''admission'
)
select nextval('privilege_id_seq'), cp.id, d.code, d.lib, d.ordre
from d
         join CATEGORIE_PRIVILEGE cp on cp.CODE = 'admission'
;

--
-- Accord de privilèges à des profils.
--
INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID)
with data(categ, priv) as (
    select 'admission', 'admission-lister' union
    select 'admission', 'admission-afficher' union
    select 'admission', 'admission-ajouter' union
    select 'admission', 'admission-modifier' union
    select 'admission', 'admission-historiser' union
    select 'admission', 'admission-supprimer' union
    select 'admission', 'admission-verifier'
)
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
         join PROFIL on profil.ROLE_ID in (
                                           'ADMIN_TECH',
                                           'GEST_ED'
    )
         join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ
         join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv
where not exists (
    select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id
) ;

INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID)
with data(categ, priv) as (
    select 'admission', 'admission-lister' union
    select 'admission', 'admission-afficher' union
    select 'admission', 'admission-ajouter' union
    select 'admission', 'admission-modifier' union
    select 'admission', 'admission-supprimer'
)
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
         join PROFIL on profil.ROLE_ID in (
    'DOCTORANT'
    )
         join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ
         join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv
where not exists (
    select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id
) ;

insert into ROLE_PRIVILEGE (ROLE_ID, PRIVILEGE_ID)
select p2r.ROLE_ID, pp.PRIVILEGE_ID
from PROFIL_TO_ROLE p2r
         join profil pr on pr.id = p2r.PROFIL_ID
         join PROFIL_PRIVILEGE pp on pp.PROFIL_ID = pr.id
where not exists (
    select * from role_privilege where role_id = p2r.role_id and privilege_id = pp.privilege_id
)
;
 No newline at end of file
+57 −19
Changes for module/Admission/config/module.config.php: 57 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -5,45 +5,53 @@ namespace Admission;

use Admission\Controller\AdmissionController;
use Admission\Controller\AdmissionControllerFactory;
use Admission\Entity\Db\Repository\IndividuRepository;
use Admission\Entity\Db\Repository\EtudiantRepository;
use Admission\Entity\Db\Repository\IndividuRepositoryFactory;
use Admission\Form\Admission\AdmissionForm;
use Admission\Form\Admission\AdmissionFormFactory;
use Admission\Form\Fieldset\Individu\IndividuFieldset;
use Admission\Form\Fieldset\Individu\IndividuFieldsetFactory;
use Admission\Form\Fieldset\Etudiant\EtudiantFieldset;
use Admission\Form\Fieldset\Etudiant\EtudiantFieldsetFactory;
use Admission\Form\Fieldset\Financement\FinancementFieldset;
use Admission\Form\Fieldset\Financement\FinancementFieldsetFactory;
use Admission\Form\Fieldset\Inscription\InscriptionFieldset;
use Admission\Form\Fieldset\Inscription\InscriptionFieldsetFactory;
use Admission\Form\Fieldset\Validation\ValidationFieldset;
use Admission\Form\Fieldset\Validation\ValidationFieldsetFactory;
use Admission\Form\Fieldset\Verification\VerificationFieldset;
use Admission\Form\Fieldset\Verification\VerificationFieldsetFactory;
use Admission\Hydrator\AdmissionHydrator;
use Admission\Hydrator\AdmissionHydratorFactory;
use Admission\Hydrator\FinancementHydrator;
use Admission\Hydrator\FinancementHydratorFactory;
use Admission\Hydrator\IndividuHydrator;
use Admission\Hydrator\IndividuHydratorFactory;
use Admission\Hydrator\EtudiantHydrator;
use Admission\Hydrator\EtudiantHydratorFactory;
use Admission\Hydrator\InscriptionHydrator;
use Admission\Hydrator\InscriptionHydratorFactory;
use Admission\Hydrator\ValidationHydrator;
use Admission\Hydrator\ValidationHydratorFactory;
use Admission\Hydrator\VerificationHydrator;
use Admission\Hydrator\VerificationHydratorFactory;
use Admission\Provider\Privilege\AdmissionPrivileges;
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;
use Admission\Service\Individu\IndividuServiceFactory;
use Admission\Service\Etudiant\EtudiantService;
use Admission\Service\Etudiant\EtudiantServiceFactory;
use Admission\Service\Inscription\InscriptionService;
use Admission\Service\Inscription\InscriptionServiceFactory;
use Admission\Service\Validation\ValidationService;
use Admission\Service\Validation\ValidationServiceFactory;
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\Segment;
use Laminas\ServiceManager\Factory\InvokableFactory;
use UnicaenAuth\Guard\PrivilegeController;
use UnicaenAuth\Provider\Rule\PrivilegeRuleProvider;

return array(
    'doctrine' => [
@@ -70,17 +78,44 @@ return array(
                    'controller' => AdmissionController::class,
                    'action' => [
                        'index',
//                        'confirmer',
//                        'enregistrer',
                        'rechercher-individu'
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_LISTER,
                    ],
                ],
                [
                    'controller' => AdmissionController::class,
                    'action' => [
                        'ajouter',
                        'individu',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_AJOUTER,
                    ],
                ],
                [
                    'controller' => AdmissionController::class,
                    'action' => [
                        'etudiant',
                        'inscription',
                        'financement',
                        'validation',
                        'confirmer',
                    ],
//                    'privileges' => [
//                        AdmissionPrivileges::ADMISSION_AFFICHER,
//                    ],
                ],
                [
                    'controller' => AdmissionController::class,
                    'action' => [
                        'annuler',
                        'enregistrer',
                        'rechercher-individu'
                    ]
                ]
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_SUPPRIMER,
                    ],
                ],
            ]
        ],
    ],
@@ -137,20 +172,22 @@ return array(
    'form_elements' => [
        'factories' => [
            AdmissionForm::class => AdmissionFormFactory::class,
            IndividuFieldset::class => IndividuFieldsetFactory::class,
            EtudiantFieldset::class => EtudiantFieldsetFactory::class,
            InscriptionFieldset::class => InscriptionFieldsetFactory::class,
            FinancementFieldset::class => FinancementFieldsetFactory::class,
            ValidationFieldset::class => ValidationFieldsetFactory::class
            ValidationFieldset::class => ValidationFieldsetFactory::class,
            VerificationFieldset::class => VerificationFieldsetFactory::class
        ],
    ],

    'hydrators' => [
        'factories' => [
            AdmissionHydrator::class => AdmissionHydratorFactory::class,
            IndividuHydrator::class => IndividuHydratorFactory::class,
            EtudiantHydrator::class => EtudiantHydratorFactory::class,
            InscriptionHydrator::class => InscriptionHydratorFactory::class,
            FinancementHydrator::class => FinancementHydratorFactory::class,
            ValidationHydrator::class => ValidationHydratorFactory::class
            ValidationHydrator::class => ValidationHydratorFactory::class,
            VerificationHydrator::class => VerificationHydratorFactory::class
        ],
    ],

@@ -158,10 +195,11 @@ return array(
        'factories' => [
            AdmissionService::class => AdmissionServiceFactory::class,
            FinancementService::class => FinancementServiceFactory::class,
            IndividuService::class => IndividuServiceFactory::class,
            EtudiantService::class => EtudiantServiceFactory::class,
            InscriptionService::class => InscriptionServiceFactory::class,
            ValidationService::class => ValidationServiceFactory::class,
            DocumentService::class => DocumentServiceFactory::class
            DocumentService::class => DocumentServiceFactory::class,
            VerificationService::class => VerificationServiceFactory::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' => [
//            IndividuFieldset::class => InvokableFactory::class,
//            EtudiantFieldset::class => InvokableFactory::class,
//            InscriptionFieldset::class => InvokableFactory::class,
//            FinancementFieldset::class => InvokableFactory::class,
//            ValidationFieldset::class => InvokableFactory::class
+1 −1
Changes for module/Admission/view/admission/admission/ajouter-etudiant.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -20,6 +20,6 @@ use Application\View\Renderer\PhpRenderer;

<?php
$multipageFormFieldset = $this->multipageFormFieldset();
$multipageFormFieldset->setPartial('admission/partial/individuInfos');
$multipageFormFieldset->setPartial('admission/partial/etudiantInfos');
echo $multipageFormFieldset;
?>
+6 −8
Changes for module/Admission/view/admission/admission/partial/etudiantInfos.phtml: 6 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ use Application\View\Renderer\PhpRenderer;
 *
 * @see \Admission\Controller\AdmissionController::etudiantAction()
 */

//$this->isAllowed(FormationPrivileges::getResourceId(FormationPrivileges::FORMATION_AFFICHER));
$fcg = $this->formControlGroup();
?>
<div class="modal hide fade" tabindex="-1" role="dialog">
@@ -148,16 +150,12 @@ $fcg = $this->formControlGroup();
            </div>
        </div>
    </div>
    <div class="row boutons_gestionnaires">
        <div class="col">
            <a title="Cette partie du formulaire est incomplète" class="btn btn-danger bouton_gestionnaire incomplet">Incomplet</a>
            <a title="Cette partie du formulaire est complète" class="btn btn-success bouton_gestionnaire complet">Complet</a>
        </div>
    </div>
        <div class="row observations_gestionnaire">
        <?php echo $fcg($fieldset->get("verificationIndividu")) ?>
            <div class="col">
            <button class="btn btn-success">Envoyer vos observations</button>
                <?php echo $fcg($fieldset->get("verificationEtudiant")->get('estComplet'))?>
            </div>
            <div class="commentaires_gestionnaire">
                <?php echo $fcg($fieldset->get("verificationEtudiant")->get('commentaire')) ?>
            </div>
        </div>
</div>
Loading