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

Changement de la gestion des postes

parent 2f7ba7ac
Loading
Loading
Loading
Loading
+21 −2
Changes for documentation/release/3.1.6.md: 21 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -233,6 +233,26 @@ delete from unicaen_privilege_privilege where code='formation_questionnaire_modi
delete from unicaen_privilege_privilege where code='formation_questionnaire_visualiser';
alter table formation_instance_inscrit drop column questionnaire_id;

-- -------------------------------------------------------------------------------
-- CHANGEMENT DE LA GESTION DES POSTES -------------------------------------------
-- -------------------------------------------------------------------------------

drop table ficheposte_poste;
create table agent_poste
(
    id         serial
        constraint agent_poste_pk primary key,
    agent_id   varchar(40)             not null
        constraint agent_poste_agent_c_individu_fk references agent,
    code_poste varchar(128)            not null,
    intitule   varchar(1024)           not null,
    created_on timestamp default now() not null,
    updated_on timestamp,
    deleted_on timestamp,
    source_id  varchar(128),
    id_source  varchar(256)
);

-- -----------------------------------
-- ADAPTATION NOUVELLE SYNCHRO
-- ------------------------------------
@@ -295,11 +315,10 @@ 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
composer update unicaen/renderer
composer update unicaen/utilisateur
composer update unicaen/authentification
composer remove unicaen/octopus
+2 −17
Changes for module/Application/config/merged/fiche-poste.config.php: 2 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -10,10 +10,6 @@ use Application\Form\AjouterFicheMetier\AjouterFicheMetierForm;
use Application\Form\AjouterFicheMetier\AjouterFicheMetierFormFactory;
use Application\Form\AjouterFicheMetier\AjouterFicheMetierHydrator;
use Application\Form\AjouterFicheMetier\AjouterFicheMetierHydratorFactory;
use Application\Form\AssocierPoste\AssocierPosteForm;
use Application\Form\AssocierPoste\AssocierPosteFormFactory;
use Application\Form\AssocierPoste\AssocierPosteHydrator;
use Application\Form\AssocierPoste\AssocierPosteHydratorFactory;
use Application\Form\AssocierTitre\AssocierTitreForm;
use Application\Form\AssocierTitre\AssocierTitreFormFactory;
use Application\Form\AssocierTitre\AssocierTitreHydrator;
@@ -22,10 +18,6 @@ use Application\Form\Expertise\ExpertiseForm;
use Application\Form\Expertise\ExpertiseFormFactory;
use Application\Form\Expertise\ExpertiseHydrator;
use Application\Form\Expertise\ExpertiseHydratorFactory;
use Application\Form\Poste\PosteForm;
use Application\Form\Poste\PosteFormFactory;
use Application\Form\Poste\PosteHydrator;
use Application\Form\Poste\PosteHydratorFactory;
use Application\Form\Rifseep\RifseepForm;
use Application\Form\Rifseep\RifseepFormFactory;
use Application\Form\Rifseep\RifseepHydrator;
@@ -45,8 +37,6 @@ use Application\Service\Expertise\ExpertiseService;
use Application\Service\Expertise\ExpertiseServiceFactory;
use Application\Service\FichePoste\FichePosteService;
use Application\Service\FichePoste\FichePosteServiceFactory;
use Application\Service\Poste\PosteService;
use Application\Service\Poste\PosteServiceFactory;
use Application\Service\SpecificitePoste\SpecificitePosteService;
use Application\Service\SpecificitePoste\SpecificitePosteServiceFactory;
use Application\View\Helper\FicheMetierExterneViewHelper;
@@ -54,10 +44,10 @@ use Application\View\Helper\FichePosteGraphViewHelper;
use Application\View\Helper\FichesPostesAsArrayViewHelperFactory;
use Application\View\Helper\RaisonsViewHelper;
use Application\View\Helper\SpecificitePosteViewHelper;
use UnicaenPrivilege\Guard\PrivilegeController;
use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;
use Laminas\Router\Http\Literal;
use Laminas\Router\Http\Segment;
use UnicaenPrivilege\Guard\PrivilegeController;
use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;

return [
    'bjyauthorize' => [
@@ -607,7 +597,6 @@ return [
            CompetencesRetireesService::class => CompetencesRetireesServiceFactory::class,
            ExpertiseService::class => ExpertiseServiceFactory::class,
            FichePosteService::class => FichePosteServiceFactory::class,
            PosteService::class => PosteServiceFactory::class,
            SpecificitePosteService::class => SpecificitePosteServiceFactory::class,
        ],
    ],
@@ -619,10 +608,8 @@ return [
    'form_elements' => [
        'factories' => [
            AjouterFicheMetierForm::class => AjouterFicheMetierFormFactory::class,
            AssocierPosteForm::class => AssocierPosteFormFactory::class,
            AssocierTitreForm::class => AssocierTitreFormFactory::class,
            ExpertiseForm::class => ExpertiseFormFactory::class,
            PosteForm::class => PosteFormFactory::class,
            SpecificitePosteForm::class => SpecificitePosteFormFactory::class,
            RifseepForm::class => RifseepFormFactory::class,
        ],
@@ -633,10 +620,8 @@ return [
        ],
        'factories' => [
            AjouterFicheMetierHydrator::class => AjouterFicheMetierHydratorFactory::class,
            AssocierPosteHydrator::class => AssocierPosteHydratorFactory::class,
            AssocierTitreHydrator::class => AssocierTitreHydratorFactory::class,
            ExpertiseHydrator::class => ExpertiseHydratorFactory::class,
            PosteHydrator::class => PosteHydratorFactory::class,
            RifseepHydrator::class => RifseepHydratorFactory::class,
        ],
    ],
+0 −41
Changes for module/Application/src/Application/Controller/FichePosteController.php: 0 added lines, 41 removed lines.
Original line number Diff line number Diff line
@@ -7,13 +7,11 @@ use Application\Entity\Db\Expertise;
use Application\Entity\Db\FichePoste;
use Application\Entity\Db\FicheposteActiviteDescriptionRetiree;
use Application\Entity\Db\FicheTypeExterne;
use Application\Entity\Db\Poste;
use Application\Entity\Db\SpecificitePoste;
use Application\Form\AjouterFicheMetier\AjouterFicheMetierFormAwareTrait;
use Application\Form\AssocierTitre\AssocierTitreForm;
use Application\Form\AssocierTitre\AssocierTitreFormAwareTrait;
use Application\Form\Expertise\ExpertiseFormAwareTrait;
use Application\Form\Poste\PosteFormAwareTrait;
use Application\Form\Rifseep\RifseepFormAwareTrait;
use Application\Form\SpecificitePoste\SpecificitePosteForm;
use Application\Form\SpecificitePoste\SpecificitePosteFormAwareTrait;
@@ -29,7 +27,6 @@ use Application\Service\Expertise\ExpertiseServiceAwareTrait;
use Application\Service\FichePoste\FichePosteServiceAwareTrait;
use Application\Service\Notification\NotificationServiceAwareTrait;
use Application\Service\ParcoursDeFormation\ParcoursDeFormationServiceAwareTrait;
use Application\Service\Poste\PosteServiceAwareTrait;
use Application\Service\SpecificitePoste\SpecificitePosteServiceAwareTrait;
use DateTime;
use FicheMetier\Entity\Db\MissionActivite;
@@ -68,7 +65,6 @@ class FichePosteController extends AbstractActionController {
    use MissionPrincipaleServiceAwareTrait;
    use NotificationServiceAwareTrait;
    use ParcoursDeFormationServiceAwareTrait;
    use PosteServiceAwareTrait;
    use RenduServiceAwareTrait;
    use StructureServiceAwareTrait;
    use SpecificitePosteServiceAwareTrait;
@@ -78,7 +74,6 @@ class FichePosteController extends AbstractActionController {
    use AjouterFicheMetierFormAwareTrait;
    use AssocierTitreFormAwareTrait;
    use ExpertiseFormAwareTrait;
    use PosteFormAwareTrait;
    use RifseepFormAwareTrait;
    use SelectionEtatFormAwareTrait;
    use SpecificitePosteFormAwareTrait;
@@ -324,42 +319,6 @@ class FichePosteController extends AbstractActionController {
        }
    }

    /** GESTION DES INFORMATIONS DE POSTE *****************************************************************************/

    public function modifierInformationPosteAction() : ViewModel
    {
        $ficheposte = $this->getFichePosteService()->getRequestedFichePoste($this);

        $create = false;
        /** @var ?Poste $poste */
        $poste = $ficheposte->getPoste();
        if ($ficheposte->getPoste() === null)  {
            $create = true;
            $poste = new Poste();
            $poste->setFicheposte($ficheposte);
        }

        $form = $this->getPosteForm();
        $form->setAttribute('action', $this->url()->fromRoute('fiche-poste/modifier-information-poste', ['fiche-poste' => $ficheposte->getId()], [], true));
        $form->bind($poste);

        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            $form->setData($data);
            if ($form->isValid()) {
                if ($create) $this->getPosteService()->create($poste);
                else $this->getPosteService()->update($poste);
            }
        }

        $vm = new ViewModel([
            'title' => "Modifier les informations sur le poste",
            'form' => $form,
        ]);
        $vm->setTemplate('application/default/default-form');
        return $vm;
    }

    /** GESTION DES ETATS DES FICHES POSTES ***************************************************************************/

+0 −8
Changes for module/Application/src/Application/Controller/FichePosteControllerFactory.php: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ namespace Application\Controller;
use Application\Form\AjouterFicheMetier\AjouterFicheMetierForm;
use Application\Form\AssocierTitre\AssocierTitreForm;
use Application\Form\Expertise\ExpertiseForm;
use Application\Form\Poste\PosteForm;
use Application\Form\Rifseep\RifseepForm;
use Application\Form\SpecificitePoste\SpecificitePosteForm;
use Application\Service\Agent\AgentService;
@@ -16,7 +15,6 @@ use Application\Service\Expertise\ExpertiseService;
use Application\Service\FichePoste\FichePosteService;
use Application\Service\Notification\NotificationService;
use Application\Service\ParcoursDeFormation\ParcoursDeFormationService;
use Application\Service\Poste\PosteService;
use Application\Service\SpecificitePoste\SpecificitePosteService;
use FicheMetier\Service\FicheMetier\FicheMetierService;
use Interop\Container\ContainerInterface;
@@ -50,7 +48,6 @@ class FichePosteControllerFactory {
         * @var ExpertiseService $expertiseService
         * @var NotificationService $notificationService
         * @var ParcoursDeFormationService $parcoursService
         * @var PosteService $posteService
         * @var SpecificitePosteService $specificitePosteService
         * @var ValidationInstanceService $validationInstanceService
         */
@@ -65,7 +62,6 @@ class FichePosteControllerFactory {
        $etatService = $container->get(EtatService::class);
        $expertiseService = $container->get(ExpertiseService::class);
        $notificationService = $container->get(NotificationService::class);
        $posteService = $container->get(PosteService::class);
        $specificitePosteService = $container->get(SpecificitePosteService::class);
        $parcoursService = $container->get(ParcoursDeFormationService::class);
        $validationInstanceService = $container->get(ValidationInstanceService::class);
@@ -74,7 +70,6 @@ class FichePosteControllerFactory {
         * @var AjouterFicheMetierForm $ajouterFicheMetierForm
         * @var AssocierTitreForm $associerTitreForm
         * @var ExpertiseForm $expertiseForm
         * @var PosteForm $posteForm
         * @var RifseepForm $rifseepForm
         * @var SelectionEtatForm $selectionEtatForm
         * @var SpecificitePosteForm $specificiftePosteForm
@@ -82,7 +77,6 @@ class FichePosteControllerFactory {
        $ajouterFicheMetierForm = $container->get('FormElementManager')->get(AjouterFicheMetierForm::class);
        $associerTitreForm = $container->get('FormElementManager')->get(AssocierTitreForm::class);
        $expertiseForm = $container->get('FormElementManager')->get(ExpertiseForm::class);
        $posteForm = $container->get('FormElementManager')->get(PosteForm::class);
        $rifseepForm = $container->get('FormElementManager')->get(RifseepForm::class);
        $selectionEtatForm = $container->get('FormElementManager')->get(SelectionEtatForm::class);
        $specificiftePosteForm = $container->get('FormElementManager')->get(SpecificitePosteForm::class);
@@ -103,7 +97,6 @@ class FichePosteControllerFactory {
        $controller->setEtatService($etatService);
        $controller->setExpertiseService($expertiseService);
        $controller->setNotificationService($notificationService);
        $controller->setPosteService($posteService);
        $controller->setSpecificitePosteService($specificitePosteService);
        $controller->setParcoursDeFormationService($parcoursService);
        $controller->setValidationInstanceService($validationInstanceService);
@@ -111,7 +104,6 @@ class FichePosteControllerFactory {
        $controller->setAjouterFicheTypeForm($ajouterFicheMetierForm);
        $controller->setAssocierTitreForm($associerTitreForm);
        $controller->setExpertiseForm($expertiseForm);
        $controller->setPosteForm($posteForm);
        $controller->setRifseepForm($rifseepForm);
        $controller->setSelectionEtatForm($selectionEtatForm);
        $controller->setSpecificitePosteForm($specificiftePosteForm);
+0 −13
Changes for module/Application/src/Application/Entity/Db/FichePoste.php: 0 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -53,9 +53,6 @@ class FichePoste implements ResourceInterface, HistoriqueAwareInterface, HasAgen
    /** @var array */
    private array $dictionnaires = [];

    private ?Poste $poste = null;


    public function __invoke()
    {
        $this->fichesMetiers = new ArrayCollection();
@@ -90,16 +87,6 @@ class FichePoste implements ResourceInterface, HistoriqueAwareInterface, HasAgen
        $this->agent = $agent;
    }

    public function getPoste() : ?Poste
    {
        return $this->poste;
    }

    public function setPoste(?Poste $poste) : void
    {
        $this->poste = $poste;
    }

    public function getRifseep(): ?int
    {
        return $this->rifseep;
Loading