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

Ajustement structure

parent 7b8c61b4
Loading
Loading
Loading
Loading
+160 −0

File added.

Preview size limit exceeded, changes collapsed.

+11 −1
Changes for documentation/release/3.1.8.md: 11 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,11 +5,21 @@ Changements
---

* [FIX] EP : correction de la recherche des responsables d'entretien pour les agents sans obligation d'EP
* Nouveau paramètre 'Adresse d'assistance'

Modification de la base de données
---

RAS 
```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 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';
```


Mise à jour de bibliothèque
---
+1 −0
Changes for module/Application/src/Application/Provider/Parametre/GlobalParametres.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,4 +5,5 @@ namespace Application\Provider\Parametre;
class GlobalParametres {
    const TYPE = "GLOBAL";
    const INSTALL_PATH = "INSTALL_PATH";
    const EMAIL_ASSISTANCE = "EMAIL_ASSISTANCE";
}
 No newline at end of file
+6 −0
Changes for module/Structure/src/Structure/Controller/StructureController.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ use Application\Form\AgentMissionSpecifique\AgentMissionSpecifiqueFormAwareTrait
use Application\Form\HasDescription\HasDescriptionFormAwareTrait;
use Application\Form\SelectionAgent\SelectionAgentFormAwareTrait;
use Application\Provider\Etat\FichePosteEtats;
use Application\Provider\Parametre\GlobalParametres;
use Application\Service\Agent\AgentServiceAwareTrait;
use Application\Service\AgentMissionSpecifique\AgentMissionSpecifiqueServiceAwareTrait;
use Application\Service\FichePoste\FichePosteServiceAwareTrait;
@@ -28,6 +29,7 @@ use Structure\Service\Structure\StructureServiceAwareTrait;
use Structure\Service\StructureAgentForce\StructureAgentForceServiceAwareTrait;
use UnicaenApp\View\Model\CsvModel;
use UnicaenEtat\Service\Etat\EtatServiceAwareTrait;
use UnicaenParametre\Service\Parametre\ParametreServiceAwareTrait;
use UnicaenPdf\Exporter\PdfExporter;
use UnicaenUtilisateur\Service\User\UserServiceAwareTrait;

@@ -37,6 +39,7 @@ class StructureController extends AbstractActionController {
    use EtatServiceAwareTrait;
    use FichePosteServiceAwareTrait;
    use FicheProfilServiceAwareTrait;
    use ParametreServiceAwareTrait;
    use StructureServiceAwareTrait;
    use StructureAgentForceServiceAwareTrait;
    use SpecificitePosteServiceAwareTrait;
@@ -122,6 +125,7 @@ class StructureController extends AbstractActionController {

        $fichespostes_pdf = $this->getAgentService()->getFichesPostesPdfByAgents($allAgents);


        return new ViewModel([
            'selecteur' => $selecteur,

@@ -148,6 +152,8 @@ class StructureController extends AbstractActionController {
            'entretiensArray' => $entretiensArray,
            'delegues' => $delegues,

            'emailAssistance' => $this->getParametreService()->getValeurForParametre(GlobalParametres::TYPE, GlobalParametres::EMAIL_ASSISTANCE),

            // - Fiches de recrutement - //
//            'fichesRecrutements' => $fichesRecrutements,
//            'profils' => $profils,
+4 −0
Changes for module/Structure/src/Structure/Controller/StructureControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ use Referentiel\Service\Synchronisation\SynchronisationService;
use Structure\Service\Structure\StructureService;
use Structure\Service\StructureAgentForce\StructureAgentForceService;
use UnicaenEtat\Service\Etat\EtatService;
use UnicaenParametre\Service\Parametre\ParametreService;
use UnicaenUtilisateur\Service\User\UserService;

class StructureControllerFactory {
@@ -42,6 +43,7 @@ class StructureControllerFactory {
         * @var DelegueService $delegueService
         * @var FichePosteService $fichePosteService
         * @var FicheProfilService $ficheProfilService
         * @var ParametreService $parametreService
         * @var SpecificitePosteService $specificiteService
         * @var StructureService $structureService
         * @var StructureAgentForceService $structureAgentForceService
@@ -55,6 +57,7 @@ class StructureControllerFactory {
        $etatService = $container->get(EtatService::class);
        $delegueService = $container->get(DelegueService::class);
        $fichePosteService = $container->get(FichePosteService::class);
        $parametreService = $container->get(ParametreService::class);
        $ficheProfilService = $container->get(FicheProfilService::class);
        $specificiteService = $container->get(SpecificitePosteService::class);
        $structureService = $container->get(StructureService::class);
@@ -82,6 +85,7 @@ class StructureControllerFactory {
        $controller->setDelegueService($delegueService);
        $controller->setFichePosteService($fichePosteService);
        $controller->setFicheProfilService($ficheProfilService);
        $controller->setParametreService($parametreService);
        $controller->setSpecificitePosteService($specificiteService);
        $controller->setStructureService($structureService);
        $controller->setStructureAgentForceService($structureAgentForceService);
Loading