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

Version 4.2.2

parent 3d6d46fc

config/autoload/unicaen-app.global.php

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ return [ 
        'app_infos' => [

            'nom'     => "EMC2",

            'desc'    => "Emploi Mobilité Carrière Compétences",

            'version' => "4.2.1",

            'date'    => "04/12/2023",

            'version' => "4.2.2",

            'date'    => "13/12/2023",



//            'liens' => [

//                'COMUE' => [

documentation/release/4.2.2.md

+2 −1
Original line number Diff line number Diff line 
Version 4.2.2 (XX/12/2023)

Version 4.2.2 (13/12/2023)

====



Évolution
@@ -8,6 +8,7 @@ Version 4.2.2 (XX/12/2023) 
- [EMC2] Nouveau jalon dans l'affichage de l'avancement des campagnes et utilisation de l'affichage sur le recap de la campagne

- [Autoform] Filtrage des balises qui ne sont pas utilisés directement pour la mise en form

- [MesFormations] Ajout de colonnes dans l'import depuis un csv

- [MesFormations] Ajout de l'affichage de l'action de formation sur les plans de formation



Modification en BD

---

module/Formation/config/merged/formation.config.php

+65 −47
Original line number Diff line number Diff line
@@ -27,10 +27,9 @@ use Formation\Service\FormationElement\FormationElementServiceFactory; 
use Formation\Service\HasFormationCollection\HasFormationCollectionService;

use Formation\Service\HasFormationCollection\HasFormationCollectionServiceFactory;

use Formation\View\Helper\FormationInformationsViewHelper;

use UnicaenPrivilege\Guard\PrivilegeController;

use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;

use Laminas\Router\Http\Literal;

use Laminas\Router\Http\Segment;

use UnicaenPrivilege\Guard\PrivilegeController;



return [

    'bjyauthorize' => [
@@ -69,6 +68,15 @@ return [ 
                        FormationPrivileges::FORMATION_AJOUTER,

                    ],

                ],

                [

                    'controller' => FormationController::class,

                    'action' => [

                        'afficher',

                    ],

                    'privileges' => [

                        FormationPrivileges::FORMATION_AFFICHER,

                    ],

                ],

                [

                    'controller' => FormationController::class,

                    'action' => [
@@ -156,6 +164,16 @@ return [ 
                ],

                'may_terminate' => true,

                'child_routes' => [

                    'afficher' => [

                        'type' => Segment::class,

                        'options' => [

                            'route' => '/afficher/:formation',

                            'defaults' => [

                                /** @see FormationController::afficherAction() */

                                'action' => 'afficher',

                            ],

                        ],

                    ],

                    'ajouter' => [

                        'type' => Literal::class,

                        'options' => [

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

+10 −0
Original line number Diff line number Diff line
@@ -70,6 +70,16 @@ class FormationController extends AbstractActionController 
        ]);

    }



    public function afficherAction(): ViewModel

    {

        $formation = $this->getFormationService()->getRequestedFormation($this);



        return new ViewModel([

            'title' => "Action de formation [".$formation->getLibelle()."]",

            'formation' => $formation,

        ]);

    }



    public function ajouterAction(): ViewModel

    {

        $formation = new Formation();

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

+21 −5
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@ use Formation\Entity\Db\Formation; 
use Formation\Provider\Privilege\FormationgroupePrivileges;

use Formation\Provider\Privilege\FormationPrivileges;



$noAction = isset($options['no-action']) && $options['no-action'] === true;

$canAfficherActionFormation = !$noAction && $this->isAllowed(FormationPrivileges::getResourceId(FormationPrivileges::FORMATION_AFFICHER));

$canAfficherGroupeFormation = !$noAction && $this->isAllowed(FormationgroupePrivileges::getResourceId(FormationgroupePrivileges::FORMATIONGROUPE_AFFICHER));



$canAfficherActionFormation = $this->isAllowed(FormationPrivileges::getResourceId(FormationPrivileges::FORMATION_AFFICHER));

$canAfficherGroupeFormation = $this->isAllowed(FormationgroupePrivileges::getResourceId(FormationgroupePrivileges::FORMATIONGROUPE_AFFICHER));



$canModifierPlans = $this->isAllowed(FormationPrivileges::getResourceId(FormationPrivileges::FORMATION_MODIFIER));

$canModifierPlans = !$noAction && $this->isAllowed(FormationPrivileges::getResourceId(FormationPrivileges::FORMATION_MODIFIER));

?>



<?php if ($mode === 'liste') : ?>
@@ -31,7 +31,7 @@ $canModifierPlans = $this->isAllowed(FormationPrivileges::getResourceId(Formatio 
            <?php endif; ?>

        </dd>

        <?php if ($formation->getGroupe() !== null) : ?>

            <dt class="col-md-3"> Groupe </dt>

            <dt class="col-md-3"> Thème </dt>

            <dd class="col-md-9">

                <?php if ($canAfficherGroupeFormation) : ?>

                    <a href="<?php echo $this->url("formation-groupe/afficher", ['formation-groupe' => $formation->getGroupe()->getId()], [], true); ?>" title="Accéder au groupe de formation">
@@ -41,6 +41,22 @@ $canModifierPlans = $this->isAllowed(FormationPrivileges::getResourceId(Formatio 
                    <?php echo $formation->getGroupe()->getLibelle(); ?>

                <?php endif; ?>

            </dd>

            <?php if ($formation->getGroupe()->getAxe()) : ?>

                <dt class="col-md-3"> Axe de formation </dt>

                <dd class="col-md-9">

                    <?php echo $formation->getGroupe()->getAxe()->getLibelle(); ?>

                </dd>

            <?php endif; ?>

        <?php endif; ?>

        <?php if (!empty($formation->getDomaines())) : ?>

            <dt class="col-md-3"> Domaines associés </dt>

            <dd class="col-md-9">

                <ul>

                    <?php foreach($formation->getDomaines() as $domaine) : ?>

                        <li> <?php echo $domaine->getLibelle(); ?> </li>

                    <?php endforeach; ?>

                </ul>

            </dd>

        <?php endif; ?>

        <?php if ($formation->getLien() !== null AND trim ($formation->getLien()) !== "") : ?>

            <dt class="col-md-3"> Lien </dt>