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

Temoin

parent e469d9f8
Loading
Loading
Loading
Loading
+13 −1
Changes for documentation/release/3.1.8.md: 13 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Changements

* [FIX] EP : correction de la recherche des responsables d'entretien pour les agents sans obligation d'EP
* Nouveau paramètre 'Adresse d'assistance'
* Affichage des témoins des affectations soumis à privilège

Modification de la base de données
---
@@ -13,11 +14,22 @@ Modification de la base de données
```postgresql
INSERT INTO unicaen_parametre_parametre(CATEGORIE_ID, CODE, LIBELLE, DESCRIPTION, VALEURS_POSSIBLES, VALEUR, ORDRE)
WITH d(CODE, LIBELLE, DESCRIPTION, VALEURS_POSSIBLES, VALEUR, ORDRE) AS (
    SELECT 'EMAIL_ASSITANCE','Adresse électronique de l''assistance',null,'String',null, 100
    SELECT 'EMAIL_ASSISTANCE','Adresse électronique de l''assistance',null,'String',null, 100
)
SELECT cp.id, d.CODE, d.LIBELLE, d.DESCRIPTION, d.VALEURS_POSSIBLES, d.VALEUR, d.ORDRE
FROM d
JOIN unicaen_parametre_categorie cp ON cp.CODE = 'GLOBAL';

-- TODO donner la valeur aux périmètres

INSERT INTO unicaen_privilege_privilege(CATEGORIE_ID, CODE, LIBELLE, ORDRE)
WITH d(code, lib, ordre) AS (
    SELECT 'agentaffichage_temoin_affectation', 'Afficher les temoins liés aux affectations', 60 UNION
    SELECT 'agentaffichage_temoin_status', 'Afficher les temoins liés aux statuts', 70
)
SELECT cp.id, d.code, d.lib, d.ordre
FROM d
JOIN unicaen_privilege_categorie cp ON cp.CODE = 'agentaffichage';
```


+2 −0
Changes for module/Application/config/merged/agent.config.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ return [
                            AgentaffichagePrivileges::AGENTAFFICHAGE_COMPTE,
                            AgentaffichagePrivileges::AGENTAFFICHAGE_CARRIERECOMPLETE,
                            AgentaffichagePrivileges::AGENTAFFICHAGE_DATERESUME,
                            AgentaffichagePrivileges::AGENTAFFICHAGE_TEMOIN_AFFECTATION,
                            AgentaffichagePrivileges::AGENTAFFICHAGE_TEMOIN_STATUT,
                        ],
                        'resources' => ['Agent'],
                        'assertion' => AgentAffichageAssertion::class
+2 −0
Changes for module/Application/src/Application/Assertion/AgentAffichageAssertion.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ class AgentAffichageAssertion extends AbstractAssertion
            case AgentaffichagePrivileges::AGENTAFFICHAGE_SUPERIEUR :
            case AgentaffichagePrivileges::AGENTAFFICHAGE_CARRIERECOMPLETE :
            case AgentaffichagePrivileges::AGENTAFFICHAGE_DATERESUME :
            case AgentaffichagePrivileges::AGENTAFFICHAGE_TEMOIN_AFFECTATION :
            case AgentaffichagePrivileges::AGENTAFFICHAGE_TEMOIN_STATUT :
                switch ($role->getRoleId()) {
                    case AppRoleProvider::ADMIN_FONC:
                    case AppRoleProvider::ADMIN_TECH:
+2 −0
Changes for module/Application/src/Application/Provider/Privilege/AgentaffichagePrivileges.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -11,4 +11,6 @@ class AgentaffichagePrivileges extends Privileges
    const AGENTAFFICHAGE_DATERESUME = 'agentaffichage-agentaffichage_dateresume';
    const AGENTAFFICHAGE_CARRIERECOMPLETE = 'agentaffichage-agentaffichage_carrierecomplete';
    const AGENTAFFICHAGE_COMPTE = 'agentaffichage-agentaffichage_compte';
    const AGENTAFFICHAGE_TEMOIN_AFFECTATION = 'agentaffichage-agentaffichage_temoin_affectation';
    const AGENTAFFICHAGE_TEMOIN_STATUT = 'agentaffichage-agentaffichage_temoin_status';
}
 No newline at end of file
+1 −1
Changes for module/Application/src/Application/View/Helper/partial/agent.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ if (isset($options["retour"])) $query["retour"] = $options["retour"];
    <div class="col-md-3">
        <h3> Affectations actives</h3>
        <?php foreach ($agent->getAffectationsActifs() as $affectation) : ?>
            <?php echo $this->agentAffectation($affectation, ['structure' => true, 'periode' => false, 'temoin' => true]); ?>
            <?php echo $this->agentAffectation($affectation, ['structure' => true, 'periode' => false, 'temoin' => false]); ?>
        <?php endforeach; ?>
    </div>
    <div class="col-md-3">
Loading