Commit e877a819 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge branch 'master' into alc-offres-emplois

parents 617172cc 84d50bc8
Loading
Loading
Loading
Loading
+10 −0
Changes for CHANGELOG.md: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -16,10 +16,20 @@
## Nouveautés

* Ajout de la date de clôture dans la page historique de l'intervenant 
* Possibilité de saisir une modification de service dû avec 0 heure (#49764)

## Améliorations

* Passage à 200 caractères max. pour les libellés longs des structures

## Corrections de bugs

* Correction d'une régression de la V20 sur le module Export Siham
* Suppression d'un message d'erreur sur l'envoi de mail via les indicateurs (#49873)





# OSE 20 (28/02/2023)

+1 −1
Changes for data/ddl/table/STRUCTURE.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ return [
            'name'        => 'LIBELLE_LONG',
            'type'        => 'string',
            'bdd-type'    => 'VARCHAR2',
            'length'      => 100,
            'length'      => 200,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
+1 −1
Changes for module/Application/src/Entity/Db/Mapping/Application.Entity.Db.Structure.dcm.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@

    <field name="code" type="string" column="CODE" length="100" nullable="true"/>
    <field name="libelleCourt" type="string" column="LIBELLE_COURT" length="25" nullable="false"/>
    <field name="libelleLong" type="string" column="LIBELLE_LONG" length="60" nullable="false"/>
    <field name="libelleLong" type="string" column="LIBELLE_LONG" length="200" nullable="false"/>
    <field name="enseignement" type="boolean" column="ENSEIGNEMENT" nullable="false"/>
    <field name="affAdresseContrat" type="boolean" column="AFF_ADRESSE_CONTRAT" nullable="false"/>

+2 −1
Changes for module/Indicateur/src/Controller/IndicateurController.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -283,10 +283,11 @@ class IndicateurController extends AbstractController
            if (!in_array($intervenantId, $intervenantsIds)) {
                continue;
            }
            $emailPro = $indicRes['intervenant-email-pro'];
            $email    = $indicRes['intervenant-email-perso'] ?: $indicRes['intervenant-email-pro'];
            if ($email) {
                $emails[$email] = $indicRes['intervenant-nom'] . ' ' . $indicRes['intervenant-prenom'];
                if ($email != $emailPro) {
                if ($email != $emailPro && !empty($emailPro)) {
                    $emailsPro[$emailPro] = $indicRes['intervenant-nom'] . ' ' . $indicRes['intervenant-prenom'];
                }
            } else {