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

Amélioration vu des formations lagaf

parent a3eb6469

module/Formation/src/Formation/Controller/FormationInstanceInscritController.php

+3 −0
Changes for module/Formation/src/Formation/Controller/FormationInstanceInscritController.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ use Formation\Form\Inscription\InscriptionFormAwareTrait; 
use Formation\Provider\Etat\DemandeExterneEtats;

use Formation\Provider\Etat\InscriptionEtats;

use Formation\Provider\Etat\SessionEtats;

use Formation\Provider\Parametre\FormationParametres;

use Formation\Service\DemandeExterne\DemandeExterneServiceAwareTrait;

use Formation\Service\FormationInstance\FormationInstanceServiceAwareTrait;

use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritServiceAwareTrait;
@@ -216,6 +217,7 @@ class FormationInstanceInscritController extends AbstractActionController 
        $demandesValidees    = array_filter($demandes, function (DemandeExterne $d) { return $d->getEtat()->getCode() !== DemandeExterneEtats::ETAT_CREATION_EN_COURS; });



        $rendu = $this->getRenduService()->generateRenduByTemplateCode('PARCOURS_ENTREE_TEXTE', []);

        $mail = $this->getParametreService()->getParametreByCode(FormationParametres::TYPE, FormationParametres::MAIL_DRH_FORMATION);

        return new ViewModel([

            'instances' => $instances,

            'inscriptions' => $inscriptions,
@@ -223,6 +225,7 @@ class FormationInstanceInscritController extends AbstractActionController 
            'agent' => $agent,

            'texteParcours' => $rendu->getCorps(),

            'demandes' => $demandesValidees,

            'mailcontact' => ($mail)?$mail->getValeur():null,

        ]);

    }

module/Formation/src/Formation/View/Helper/partial/formation-instance-informations.phtml

+7 −1
Changes for module/Formation/src/Formation/View/Helper/partial/formation-instance-informations.phtml: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * @var array $options

 */



use Application\Entity\Db\Interfaces\HasSourceInterface;

use Formation\Entity\Db\FormationInstance;



?>
@@ -54,8 +55,13 @@ use Formation\Entity\Db\FormationInstance; 
    <br/>

    Session <?php echo $instance->getId(); ?> du <?php echo $instance->getDebut(); ?> au <?php echo $instance->getFin(); ?>

    <br/>

    <?php if ($instance->getSource()->getCode() !== HasSourceInterface::SOURCE_LAGAF) : ?>

        <?php echo $instance->getType(); ?> - <?php echo $instance->getDuree(); ?> -

    Liste principale <?php echo count($instance->getListePrincipale());  ?>/<?php echo $instance->getNbPlacePrincipale(); ?>

    <?php endif; ?>

    Liste principale

    <?php if ($instance->getSource()->getCode() !== HasSourceInterface::SOURCE_LAGAF) : ?>

        <?php echo count($instance->getListePrincipale());  ?>/<?php echo $instance->getNbPlacePrincipale(); ?>

    <?php endif; ?>

<!--    --->

<!--    Liste complémentaire --><?php //echo count($instance->getListeComplementaire());  ?><!--/--><?php //echo $instance->getNbPlaceComplementaire(); ?>

<?php endif; ?>

module/Formation/view/formation/formation-instance-inscrit/liste-formations-instances.phtml

+2 −1
Changes for module/Formation/view/formation/formation-instance-inscrit/liste-formations-instances.phtml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * @var FormationInstanceInscrit[] $inscriptions

 * @var Agent $agent

 * @var string $texteParcours

 * @var string|null $mailcontact

 */



use Application\Entity\Db\Agent;
@@ -53,7 +54,7 @@ $this->headTitle("Liste des actions de formations proposées"); 


    <!-- Type---------------------------------------------------------------------------------------------->

    <div id="formations" class="tab-pane " role="tabpanel">

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

        <?php echo $this->partial('partial/formations', ['formations' => $formations, 'agent' => $agent, 'mailcontact' => $mailcontact]); ?>

    </div>



    <!-- Type---------------------------------------------------------------------------------------------->

module/Formation/view/formation/formation-instance-inscrit/partial/formations.phtml

+16 −2
Changes for module/Formation/view/formation/formation-instance-inscrit/partial/formations.phtml: 16 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ 
/**

 * @var FormationInstanceInscrit[] $formations

 * @var Agent $agent

 * @var string|null $mailcontact

 */



use Application\Entity\Db\Agent;

use Application\Entity\Db\Interfaces\HasSourceInterface;

use Formation\Entity\Db\FormationInstanceInscrit;

use Formation\Provider\Privilege\FormationinstancedocumentPrivileges;
@@ -38,12 +40,23 @@ $canHistorique = $this->isAllowed(FormationinstancedocumentPrivileges::getResour 
<?php else : ?>

    <?php foreach ($realisees as $inscription) : ?>

        <div class="row formation-inscription">

            <div class="col-md-8 description">

            <div class="col-md-7 description">

                <?php echo $this->formationInstanceInformations($inscription->getInstance(), 'bloc'); ?>

                <br/>

                <br/>

            </div>

            <div class="col-md-4">

            <div class="col-md-5">

                <?php if ($inscription->getSource()->getCode() === HasSourceInterface::SOURCE_LAGAF) : ?>

                    <div class="alert alert-warning">

                        <span class="icon icon-information"></span>

                        Formation gérée par LAGAF, pour obtenir votre attestion veuillez contacter

                        <?php if ($mailcontact === null) : ?>

                            la DRH

                        <?php else : ?>

                            <a href="mailto:<?php echo $mailcontact; ?>"><?php echo $mailcontact; ?></a>

                        <?php endif; ?>

                    </div>

                <?php else : ?>

                    <?php if ($inscription->getValidationEnquete() === null) : ?>

                    <a

                        <?php /** @see \Formation\Controller\EnqueteQuestionController::repondreQuestionsAction() */?>
@@ -72,6 +85,7 @@ $canHistorique = $this->isAllowed(FormationinstancedocumentPrivileges::getResour 
                    <span class="icon icon-pdf"> Je télécharge mon attestation</span>

                </a>

                <?php endif; ?>

                <?php endif; ?>

            </div>

        </div>

    <?php endforeach; ?>