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

Mise en place de la partie présence comme onglet

parent 5754cbdd

module/Application/view/application/structure/partial/campagne.phtml

+2 −2
Changes for module/Application/view/application/structure/partial/campagne.phtml: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ $enCours = $campagne->estEnCours(); 
    <dt> En cours </dt>

    <dd>

        <?php if ($enCours) : ?>

            <span class='ok'><span class="icon ok"></span>Oui</span>

            <span style="color:darkgreen;"><span class="icon ok"></span>Oui</span>

        <?php else : ?>

            <span class='ko'><span class="icon ko"></span>Non</span>

            <span style="color:darkred;"><span class="icon ko"></span>Non</span>

        <?php endif; ?>

    </dd>

</dl>

module/EntretienProfessionnel/view/entretien-professionnel/entretien-professionnel/partial/formations.phtml

+1 −1
Changes for module/EntretienProfessionnel/view/entretien-professionnel/entretien-professionnel/partial/formations.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ $date_depassee = $now > $date; 


<!-- Formulaire ------------------------------------------------------------------------------------------------------->



<h3> Formations survies durant la période de la campagne (<?php echo $entretien->getCampagne()->getAnnee(); ?>)</h3>

<h3> Formations suivies durant la période de la campagne (<?php echo $entretien->getCampagne()->getAnnee(); ?>)</h3>



<?php echo $this->partial("partial/formations-suivies-campagne", ["entretien" => $entretien, 'formations' => $agent->getFormationListe()]); ?>

module/Formation/src/Formation/Controller/FormationController.php

+0 −3
Changes for module/Formation/src/Formation/Controller/FormationController.php: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -14,14 +14,12 @@ use Formation\Form\Formation\FormationFormAwareTrait; 
use Formation\Service\Formation\FormationServiceAwareTrait;

use Formation\Service\FormationGroupe\FormationGroupeServiceAwareTrait;

use Formation\Service\FormationInstance\FormationInstanceServiceAwareTrait;

use UnicaenEtat\Service\Etat\EtatServiceAwareTrait;

use Zend\Http\Request;

use Zend\Mvc\Controller\AbstractActionController;

use Zend\View\Model\ViewModel;



class FormationController extends AbstractActionController

{

    use EtatServiceAwareTrait;

    use FormationInstanceServiceAwareTrait;

    use FormationServiceAwareTrait;

    use FormationGroupeServiceAwareTrait;
@@ -41,7 +39,6 @@ class FormationController extends AbstractActionController 
        return new ViewModel([

            'formations' => $formations,

            'groupes' => $groupes,

            'etatService' => $this->getEtatService(),

        ]);

    }

module/Formation/src/Formation/Controller/FormationControllerFactory.php

+0 −4
Changes for module/Formation/src/Formation/Controller/FormationControllerFactory.php: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ use Formation\Service\Formation\FormationService; 
use Formation\Service\FormationGroupe\FormationGroupeService;

use Formation\Service\FormationInstance\FormationInstanceService;

use Interop\Container\ContainerInterface;

use UnicaenEtat\Service\Etat\EtatService;



class FormationControllerFactory

{
@@ -19,12 +18,10 @@ class FormationControllerFactory 
    public function __invoke(ContainerInterface $container)

    {

        /**

         * @var EtatService $etatService

         * @var FormationService $formationService

         * @var FormationGroupeService $formationGroupeService

         * @var FormationInstanceService $formationInstanceService

         */

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

        $formationService = $container->get(FormationService::class);

        $formationGroupeService = $container->get(FormationGroupeService::class);

        $formationInstanceService = $container->get(FormationInstanceService::class);
@@ -47,7 +44,6 @@ class FormationControllerFactory 


        /** @var FormationController $controller */

        $controller = new FormationController();

        $controller->setEtatService($etatService);

        $controller->setFormationService($formationService);

        $controller->setFormationGroupeService($formationGroupeService);

        $controller->setFormationInstanceService($formationInstanceService);

module/Formation/src/Formation/Controller/FormationInstanceController.php

+1 −1
Changes for module/Formation/src/Formation/Controller/FormationInstanceController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ class FormationInstanceController extends AbstractActionController 
        $vm = new ViewModel();

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

        $vm->setVariables([

            'title' => "Modification des informations de l'instance",

            'title' => "Modification des informations de la session",

            'form' => $form,

        ]);

        return $vm;