Commit 084f4adb authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Save

parent 8a13ced6
Loading
Loading
Loading
Loading
+1 −2
Changes for documentation/600_DB_EMC2_FORMATION.sql: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -609,8 +609,7 @@ WITH d(code, lib, ordre) AS (
    SELECT 'formationinstance_gerer_inscription', 'Gérer les inscriptions à une instance de formation', 100 UNION
    SELECT 'formationinstance_gerer_seance', 'Gérer les séances d''une instance de formation', 110 UNION
    SELECT 'formationinstance_gerer_formateur', 'Gérer les formations d''une instance de formation', 120 UNION
    SELECT 'formationinstance_annuler', 'Annuler une session', 130 UNION
    SELECT 'formationinstance_questionnaire', 'Renseigner le questionnaire', 140
    SELECT 'formationinstance_annuler', 'Annuler une session', 130
)
SELECT cp.id, d.code, d.lib, d.ordre
FROM d
+26 −1
Changes for documentation/release/3.1.6.md: 26 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -222,7 +222,15 @@ drop table activite_competence;
drop table activite_formation;
drop table fichemetier_activite;
drop table ficheposte_activite_specifique;
drop table activite
drop table activite;

-- ------------------------------------------------------------------------------
-- NETTOYAGE DE CODE MORT -------------------------------------------------------
-- ------------------------------------------------------------------------------

delete from unicaen_privilege_privilege where code='formationinstance_questionnaire';
delete from unicaen_privilege_privilege where code='formation_questionnaire_modifier';
delete from unicaen_privilege_privilege where code='formation_questionnaire_visualiser';

-- -----------------------------------
-- ADAPTATION NOUVELLE SYNCHRO
@@ -271,6 +279,23 @@ alter table structure_gestionnaire alter column source_id type varchar(128);

alter table formation drop column theme_id;
drop table formation_theme cascade;

alter table carriere_correspondance_type  alter column source_id type varchar(128)
alter table carriere_correspondance  alter column source_id type varchar(128);
alter table carriere_corps  alter column source_id type varchar(128);
alter table carriere_grade  alter column source_id type varchar(128);
alter table structure_type  alter column source_id type varchar(128);
alter table structure  alter column source_id type varchar(128);
alter table structure_responsable  alter column source_id type varchar(128);
alter table structure_gestionnaire  alter column source_id type varchar(128);
alter table agent  alter column source_id type varchar(128);
alter table agent_carriere_affectation  alter column source_id type varchar(128);
alter table agent_carriere_echelon  alter column source_id type varchar(128);
alter table agent_carriere_grade  alter column source_id type varchar(128);
alter table agent_carriere_quotite  alter column source_id type varchar(128);
alter table agent_carriere_statut  alter column source_id type varchar(128);


```

```bash
+0 −19
Changes for module/Formation/config/merged/formation-instance.config.php: 0 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -61,15 +61,6 @@ return [
                        FormationinstancePrivileges::FORMATIONINSTANCE_MODIFIER,
                    ],
                ],
                [
                    'controller' => FormationInstanceController::class,
                    'action' => [
                        'renseigner-questionnaire',
                    ],
                    'privileges' => [
                        FormationinstancePrivileges::FORMATIONINSTANCE_QUESTIONNAIRE,
                    ],
                ],
                [
                    'controller' => FormationInstanceController::class,
                    'action' => [
@@ -248,16 +239,6 @@ return [
                            ],
                        ],
                    ],
                    'renseigner-questionnaire' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/renseigner-questionnaire/:inscrit',
                            'defaults' => [
                                'controller' => FormationInstanceController::class,
                                'action'     => 'renseigner-questionnaire',
                            ],
                        ],
                    ],
                    'ouvrir-inscription' => [
                        'type'  => Segment::class,
                        'options' => [
+0 −12
Changes for module/Formation/config/merged/formation.config.php: 0 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -40,18 +40,6 @@ return [
            ],
        ],
        'rule_providers' => [
            PrivilegeRuleProvider::class => [
                'allow' => [
                    [
                        'privileges' => [
                            FormationPrivileges::FORMATION_QUESTIONNAIRE_VISUALISER,
                            FormationPrivileges::FORMATION_QUESTIONNAIRE_MODIFIER,
                        ],
                        'resources' => ['Inscrit'],
                        'assertion' => FormationInstanceInscritAssertion::class
                    ],
                ],
            ],
        ],
        'guards' => [
            PrivilegeController::class => [
+0 −29
Changes for module/Formation/src/Formation/Assertion/FormationInstanceInscritAssertion.php: 0 added lines, 29 removed lines.
Original line number Diff line number Diff line
@@ -53,35 +53,6 @@ class FormationInstanceInscritAssertion extends AbstractAssertion
            }
        }

        switch ($privilege) {
            case FormationPrivileges::FORMATION_QUESTIONNAIRE_VISUALISER:
                switch ($role->getRoleId()) {
                    case AppRoleProvider::ADMIN_FONC:
                    case AppRoleProvider::ADMIN_TECH:
                    case AppRoleProvider::OBSERVATEUR:
                    case AppRoleProvider::DRH:
                        return true;
                    case RoleProvider::RESPONSABLE:
                        return $isResponsable;
                    case RoleProvider::GESTIONNAIRE:
                        return $isGestionnaire;
                    case AppRoleProvider::AGENT:
                        return ($entity->getAgent()->getUtilisateur() !== null and $user === $entity->getAgent()->getUtilisateur());
                    default :
                        return false;
                }
            case FormationPrivileges::FORMATION_QUESTIONNAIRE_MODIFIER:
                switch ($role->getRoleId()) {
                    case AppRoleProvider::ADMIN_FONC:
                    case AppRoleProvider::ADMIN_TECH:
                        return true;
                    case AppRoleProvider::AGENT:
                        return ($entity->getAgent()->getUtilisateur() !== null and $user === $entity->getAgent()->getUtilisateur());
                    default :
                        return false;
                }
        }

        return true;
    }
}
Loading