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

divers amélioration de code

parent ed1765ba

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
    "unicaen/utilisateur": "^5.0",

    "unicaen/privilege": "^5.0",

    "unicaen/renderer": "^5.0",

    "unicaen/pdf": "^5.0.1",

    "unicaen/pdf": "^5",

    "unicaen/mail": "^5.0.3",

    "unicaen/parametre": "^5.0",

    "unicaen/bjy-authorize": "^4",

config/autoload/unicaen-indicateur.global.php

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?php



use UnicaenIndicateur\Controller\IndexController;

use UnicaenPrivilege\Guard\PrivilegeController;



return [

    'navigation'      => [

        'default' => [

            'home' => [

                'pages' => [

                    'gestion' => [

                        'pages' => [

                            'mes-indicateurs' => [

                                'label' => 'Mes indicateurs',

                                'route' => 'mes-indicateurs',

                                'resource' => PrivilegeController::getResourceId(IndexController::class, 'index'),

                                'order'    => 500,

                            ],

                        ],

                    ]

                ],

            ],

        ],

    ],

];
 
 No newline at end of file

documentation/release/3.2.0.md

+20 −1
Original line number Diff line number Diff line 
Version 3.2.0 (05/05/2023)

====



Évolution

---



- Changement du système de gestion des supérieures et autorités hiérarchique (nouveau menu dans le menu gestion)

- Amélioration du code lié aux chaînes hiérarchiques

- Changement de mise en forme des pages de structures pour améliorer les temps de réponse





Modification de la base de données

---
@@ -76,3 +87,11 @@ drop table complement; 




```



Evolution des librairies 

---



Nouvelle version de unicaen/pdf 5.0.2

```bash

composer upgrade unicaen/pdf

```

module/Application/src/Application/Entity/Db/MacroContent/AgentMacroTrait.php

+6 −2
Original line number Diff line number Diff line
@@ -155,7 +155,11 @@ trait AgentMacroTrait 
    {

        /** @var Agent $agent */

        $agent = $this;

        $texte = implode("<br>",array_map($agent->getQuotitesActives(), function (AgentQuotite $a) { return ($a->getQuotite())?$a->getQuotite()."%":"100%"; }));

        $quotites = $agent->getQuotitesActives();

        if ($quotites === null or empty($quotites)) return 'Aucune quotité de remontée du SIRH';



        $texte = "";

        $texte = implode("<br>",array_map(function (AgentQuotite $a) { return ($a->getQuotite())?$a->getQuotite()."%":"100%"; }, $quotites));

        return $texte;

    }

    /**
@@ -317,7 +321,7 @@ trait AgentMacroTrait 


    public function toStringQuotite() : string

    {

        $this->toStringQuotiteTravaillee();

        return $this->toStringQuotiteTravaillee();

    }



    public function toStringEchelon() : string

module/Application/src/Application/Service/AgentAutorite/AgentAutoriteService.php

+7 −0
Original line number Diff line number Diff line
@@ -80,6 +80,13 @@ class AgentAutoriteService 
    {

        $qb = $this->getEntityManager()->getRepository(AgentAutorite::class)->createQueryBuilder('agentautorite')

            ->join('agentautorite.agent', 'agent')->addSelect('agent')

//            ->leftjoin ('agent.grades','agrade')->addSelect('agrade')

//            ->leftjoin('agrade.bap', 'correspondance')->addSelect('correspondance')

//            ->leftjoin('correspondance.type', 'ctype')->addSelect('ctype')

//            ->leftJoin('agrade.grade', 'grade')->addSelect('grade')

//            ->leftJoin('agrade.corps', 'corps')->addSelect('corps')

//            ->leftJoin('agent.affectations', 'affectation')->addSelect('affectation')

//            ->leftJoin('affectation.structure', 'structure')->addSelect('structure')

            ->join('agentautorite.autorite', 'autorite')->addSelect('autorite')

        ;

        return $qb;