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

Ajout de la structure dans l'entete de l'Epro

parent 97993bad

CHANGELOG.md

0 → 100644
+3 −0
Changes for CHANGELOG.md: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Version 1.1.1

-------------

+ Affichage des structures de l'agent dans l'entête des entretiens professionnels (lien vers la structure si l'utilisateur a les droits de visualiser la structure).

config/autoload/unicaen-app.global.php

+2 −2
Changes for config/autoload/unicaen-app.global.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ return [ 
        'app_infos' => [

            'nom'     => "EMC2",

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

            'version' => "0.4.9",

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

            'version' => "1.1.1",

            'date'    => "16/03/2021",

            'contact' => ['mail' => "dsi.applications@unicaen.fr", /*'tel' => "01 02 03 04 05"*/],

            'mentionsLegales'        => "http://www.unicaen.fr/acces-direct/mentions-legales/",

            'informatiqueEtLibertes' => "http://www.unicaen.fr/acces-direct/informatique-et-libertes/",

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

+19 −0
Changes for module/EntretienProfessionnel/view/entretien-professionnel/entretien-professionnel/partial/header.phtml: 19 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
use Application\Entity\Db\Agent;

use Application\Entity\Db\FicheMetier;

use Application\Entity\Db\FichePoste;

use Application\Provider\Privilege\StructurePrivileges;

use EntretienProfessionnel\Entity\Db\EntretienProfessionnel;



$sursis = $entretien->getSursisActif();
@@ -63,6 +64,24 @@ $sursis = $entretien->getSursisActif(); 
                            </a>

                        <?php endforeach; ?>

                    </dd>

                    <dt> Structure(s) </dt>

                    <dd>

                        <?php foreach ($agent->getAffectationsActifs() as $affectation) : ?>

                            <?php

                                $structureLibelle = "[" .$affectation->getStructure()->getLibelleCourt(). "] ". $affectation->getStructure()->getLibelleLong();

                                $structureUrl = $this->url("structure/afficher", ['structure' => $affectation->getStructure()->getId()], [], true);

                                $canAfficherStructure = $this->isAllowed($affectation->getStructure(), StructurePrivileges::STRUCTURE_AFFICHER);

                            ?>

                                <?php if ($canAfficherStructure) : ?>

                                    <a href="<?php echo $structureUrl; ?>" target="_blank" title="Affichage de la structure" data-toggle="tooltip" data-html="true">

                                        <?php echo $structureLibelle; ?>

                                    </a>

                                <?php else : ?>

                                    <?php echo $structureLibelle; ?>

                                <?php endif; ?>

                        <?php endforeach; ?>

                        <br/>

                    </dd>

                </dl>

            </div>

        </div>

module/Formation/src/Formation/Form/FormationElement/FormationElementForm.php

+1 −1
Changes for module/Formation/src/Formation/Form/FormationElement/FormationElementForm.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class FormationElementForm extends Form { 
            'options' => [

                'label' => "Année de la formation :",

                'empty_value' => 'Sélectionner une année ...',

                'value_options' => $this->getAnneesScolaires(( (int) (new DateTime())->format('Y')) - 5, ( (int) (new DateTime())->format('Y')) + 5),

                'value_options' => $this->getAnneesScolaires(( (int) (new DateTime())->format('Y')) - 20, ( (int) (new DateTime())->format('Y')) + 5),

            ],

            'attributes' => [

                'id' => 'annee',

public/unicaen/app/js/unicaen.js

+1 −1
Changes for public/unicaen/app/js/unicaen.js: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ function ajaxPopoverInit() 
        div.data('a').popover('hide');

    });



    $("body").on("submit", "div.popover div.popover-content form", function (e)

    $("body").on("submit", "div.popover div.popover-content form:not('.disable-ajax-submit')", function (e)

    {

        var form = $(e.target);

        var div = $(e.target).parents('div.popover');