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

Continuation de la refonte de l'affichage des applications

parent 1c301d7c

module/Application/config/merged/application.config.php

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ use Application\Service\Application\ApplicationGroupeService; 
use Application\Service\Application\ApplicationService;

use Application\Service\Application\ApplicationServiceFactory;

use Application\Service\Application\ApplicationGroupeServiceFactory;

use Application\View\Helper\ApplicationBlocViewHelper;

use Application\View\Helper\ApplicationGroupeViewHelper;

use UnicaenPrivilege\Guard\PrivilegeController;

use Zend\Router\Http\Literal;
@@ -276,6 +277,7 @@ return [ 
    'view_helpers' => [

        'invokables' => [

            'applicationGroupe' => ApplicationGroupeViewHelper::class,

            'applicationBloc' => ApplicationBlocViewHelper::class,

        ],

    ],

module/Application/config/merged/fiche-metier.config.php

+0 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ use Application\Service\FicheMetier\FicheMetierService; 
use Application\Service\FicheMetier\FicheMetierServiceFactory;

use Application\Service\FicheMetierEtat\FicheMetierEtatService;

use Application\Service\FicheMetierEtat\FicheMetierEtatServiceFactory;

use Application\View\Helper\ApplicationBlocViewHelper;

use Application\View\Helper\FicheMetierEtatViewHelper;

use Application\View\Helper\FicheMetierExterneViewHelper;

use Application\View\Helper\FicheMetierViewHelper;
@@ -435,7 +434,6 @@ return [ 
            'ficheMetierExterne' => FicheMetierExterneViewHelper::class,

            'ficheMetierEtat' => FicheMetierEtatViewHelper::class,

            'ficheMetier'  => FicheMetierViewHelper::class,

            'applicationBloc' => ApplicationBlocViewHelper::class,

        ],

    ],

module/Application/src/Application/Controller/FicheMetierController.php

+18 −10
Original line number Diff line number Diff line
@@ -90,21 +90,39 @@ class FicheMetierController extends AbstractActionController{ 
    {

        $fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'id', true);

        $parcours = $this->getParcoursDeFormationService()->generateParcoursArrayFromFicheMetier($fiche);

        $applications = $this->getFicheMetierService()->getApplicationsDictionnaires($fiche);



        return new ViewModel([

            'title' => 'Visualisation d\'une fiche métier',

            'fiche' => $fiche,

            'parcours' => $parcours,

            'applications' => $applications,

        ]);

    }



    public function editerAction()

    {

        $fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'id', false);

        if ($fiche === null) $fiche = $this->getFicheMetierService()->getLastFicheMetier();

        $parcours = $this->getParcoursDeFormationService()->generateParcoursArrayFromFicheMetier($fiche);

        $applications = $this->getFicheMetierService()->getApplicationsDictionnaires($fiche);



        return new ViewModel([

            'fiche' => $fiche,

            'parcours' => $parcours,

            'applications' => $applications,

        ]);

    }



    public function exporterAction()

    {

        $fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'id', true);

        $applications = $this->getFicheMetierService()->getApplicationsDictionnaires($fiche);



        $exporter = new FicheMetierPdfExporter($this->renderer, 'A4');

        $exporter->setVars([

            'fiche' => $fiche,

            'applications' => $applications,

        ]);



        $metier = $fiche->getMetier();
@@ -129,16 +147,6 @@ class FicheMetierController extends AbstractActionController{ 
        exit;

    }



    public function editerAction()

    {

        $fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'id', false);

        if ($fiche === null) $fiche = $this->getFicheMetierService()->getLastFicheMetier();



        return new ViewModel([

            'fiche' => $fiche,

        ]);

    }



    public function historiserAction()

    {

        $fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'id', true);

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

+1 −1
Original line number Diff line number Diff line
@@ -595,7 +595,7 @@ class FichePosteController extends AbstractActionController { 
            $data = $request->getPost();



            foreach ($applications as $item) {

                $application = $item['object'];

                $application = $item['entite'];

                $checked = (isset($data[$application->getId()]) AND $data[$application->getId()] === "on");



                if ($checked === false AND $item['conserve'] === true) {

module/Application/src/Application/Service/Export/FichePoste/fiche-poste.phtml

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ usort($fichesMetiers, function (FicheTypeExterne $a, FicheTypeExterne $b) { retu 


        <ul>

        <?php foreach ($cApplications as $application) : ?>

            <li> <?php echo $application["object"]->getLibelle(); ?> </li>

            <li> <?php echo $application["entite"]->getLibelle(); ?> </li>

        <?php endforeach; ?>

        </ul>

    <?php endif; ?>