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

Amelioration de l'affichage des tableaux des fiches de postes et de recrutements

parent a3637a69

module/Application/src/Application/Controller/FichePosteController.php

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ class FichePosteController extends AbstractActionController { 


        $vm = new ViewModel();

        if ($expertise !== null) {

            $vm->setTemplate('unicaen-utilisateur/default/confirmation');

            $vm->setTemplate('application/default/confirmation');

            $vm->setVariables([

                'title' => "Suppression de l'expertise " . $expertise->getLibelle(),

                'text' => "La suppression est définitive êtes-vous sûr·e de vouloir continuer ?",

module/Application/src/Application/Controller/FicheProfilController.php

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ class FicheProfilController extends AbstractActionController { 


        $vm = new ViewModel();

        if ($ficheprofil !== null) {

            $vm->setTemplate('unicaen-utilisateur/default/confirmation');

            $vm->setTemplate('application/default/confirmation');

            $vm->setVariables([

                'title' => "Suppression du profil de recrutement",

                'text' => "La suppression est définitive êtes-vous sûr·e de vouloir continuer ?",

module/Application/src/Application/Service/FichePoste/FichePosteService.php

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ use Structure\Entity\Db\Structure; 
use Structure\Service\Structure\StructureServiceAwareTrait;

use UnicaenApp\Exception\RuntimeException;

use UnicaenApp\Service\EntityManagerAwareTrait;

use UnicaenEtat\Service\Etat\EtatServiceAwareTrait;

use UnicaenUtilisateur\Entity\Db\User;

use UnicaenValidation\Entity\Db\ValidationInstance;

use UnicaenValidation\Service\ValidationInstance\ValidationInstanceServiceAwareTrait;
@@ -33,6 +34,7 @@ use Zend\Mvc\Controller\AbstractActionController; 
class FichePosteService {

    use EntityManagerAwareTrait;

    use AgentServiceAwareTrait;

    use EtatServiceAwareTrait;

    use SpecificitePosteServiceAwareTrait;

    use StructureServiceAwareTrait;

    use ValidationInstanceServiceAwareTrait;
@@ -950,6 +952,8 @@ EOS; 
            }

        }



        $etat = $this->getEtatService()->getEtatByCode(FichePoste::ETAT_CODE_REDACTION);

        $nouvelleFiche->setEtat($etat);

        $nouvelleFiche = $this->update($nouvelleFiche);

module/Application/src/Application/Service/FichePoste/FichePosteServiceFactory.php

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Application\Service\SpecificitePoste\SpecificitePosteService; 
use Doctrine\ORM\EntityManager;

use Interop\Container\ContainerInterface;

use Structure\Service\Structure\StructureService;

use UnicaenEtat\Service\Etat\EtatService;

use UnicaenValidation\Service\ValidationInstance\ValidationInstanceService;

use UnicaenValidation\Service\ValidationType\ValidationTypeService;
@@ -17,6 +18,7 @@ class FichePosteServiceFactory { 
        /**

         * @var EntityManager $entityManager

         * @var AgentService $agentService

         * @var EtatService $etatService

         * @var SpecificitePosteService $specificitePosteService

         * @var StructureService $structureService

         * @var ValidationInstanceService $validationInstanceService
@@ -24,6 +26,7 @@ class FichePosteServiceFactory { 
         */

        $entityManager = $container->get('doctrine.entitymanager.orm_default');

        $agentService = $container->get(AgentService::class);

        $etatService = $container->get(EtatService::class);

        $specificitePosteService = $container->get(SpecificitePosteService::class);

        $structureService = $container->get(StructureService::class);

        $validationInstanceService = $container->get(ValidationInstanceService::class);
@@ -33,6 +36,7 @@ class FichePosteServiceFactory { 
        $service = new FichePosteService();

        $service->setEntityManager($entityManager);

        $service->setAgentService($agentService);

        $service->setEtatService($etatService);

        $service->setSpecificitePosteService($specificitePosteService);

        $service->setStructureService($structureService);

        $service->setValidationInstanceService($validationInstanceService);

module/Application/src/Application/View/Helper/FichesPostesAsArrayViewHelper.php

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ class FichesPostesAsArrayViewHelper extends AbstractHelper 
            'structure' => true,

            'poste' => false,

            'etat' => true,

            'validite' => true,

            'fiche-principale' => true,

            'en-cours' => true,

            'modification' => false,
@@ -42,6 +43,8 @@ class FichesPostesAsArrayViewHelper extends AbstractHelper 
        if (isset($options['displays']) AND isset($options['displays']['id'])) $displays['id'] = ($options['displays']['id'] === true);

        if (isset($options['displays']) AND isset($options['displays']['agent'])) $displays['agent'] = ($options['displays']['agent'] !== false);

        if (isset($options['displays']) AND isset($options['displays']['structure'])) $displays['structure'] = ($options['displays']['structure'] !== false);

        if (isset($options['displays']) AND isset($options['displays']['etat'])) $displays['etat'] = ($options['displays']['etat'] !== false);

        if (isset($options['displays']) AND isset($options['displays']['validite'])) $displays['validite'] = ($options['displays']['validite'] !== false);



        return $view->partial('fiches-postes-as-table', ['fiches' => $fiches, 'structure' => $structure, 'displays' => $displays, 'options' => $options]);

    }