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

Correction de la saisie de service établissement extérieur pour permettre de... 

Correction de la saisie de service établissement extérieur pour permettre de saisir plusieurs lignes de service extérieur dans un même établissement avec des descriptions différentes
parent 688e6757

data/ddl/index/SERVICE__UN.php

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ return [ 
        'ELEMENT_PEDAGOGIQUE_ID',

        'ETABLISSEMENT_ID',

        'HISTO_DESTRUCTION',

        'DESCRIPTION'

    ],

];

data/ddl/unique-constraint/SERVICE__UN.php

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ return [ 
        'ELEMENT_PEDAGOGIQUE_ID',

        'ETABLISSEMENT_ID',

        'HISTO_DESTRUCTION',

        'DESCRIPTION'

    ],

];

module/Administration/config/module.config.php

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ return [ 
            Migration\v24FonctionReferentielParent::class,

            Migration\v24ParametresAnnualises::class,

            Migration\v24LongeurColonnesTblContrat::class,

            Migration\v24ContrainteUniciteService::class,

        ],

    ],

module/Administration/src/Migration/v24ContrainteUniciteService.php

0 → 100644
+32 −0
Original line number Diff line number Diff line 
<?php



namespace Administration\Migration;



use Unicaen\BddAdmin\Migration\MigrationAction;



class v24ContrainteUniciteService extends MigrationAction

{



    public function description(): string

    {

        return "Suppression de la contrainte d'unicité du Service pour pouvoir la modifier";

    }







    public function utile(): bool

    {

        return true;

    }







    public function before()

    {

        $bdd = $this->getBdd();

        $bdd->exec('ALTER TABLE SERVICE DROP CONSTRAINT SERVICE__UN');

        $bdd->exec('DROP INDEX SERVICE__UN');



    }



}
 
 No newline at end of file

module/Enseignement/src/Service/ServiceService.php

+3 −1
Original line number Diff line number Diff line
@@ -571,13 +571,15 @@ class ServiceService extends AbstractEntityService 
    public function getBy(

        Intervenant   $intervenant,

                      $elementPedagogique,

        Etablissement $etablissement

        Etablissement $etablissement,

        string        $description = null

    )

    {

        $result = $this->getRepo()->findBy([

                                               'intervenant'        => $intervenant,

                                               'elementPedagogique' => $elementPedagogique,

                                               'etablissement'      => $etablissement,

                                               'description' => $description,

                                           ]);



        if (count($result) > 1) {