Commit 9c09f08f authored by joriot221's avatar joriot221
Browse files

Merge branch 'master' into FJ_Contrat_Sans_Avenant

parents e617c98e cba306b5

code/GenerationTraitsInterfaces.php

+0 −4
Changes for code/GenerationTraitsInterfaces.php: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -8,10 +8,6 @@ 
 * @var $viewFile   string

 */



phpinfo();



return;



$introspection = \UnicaenCode\Util::introspection();

code/template/FormAwareTrait.php

+3 −3
Changes for code/template/FormAwareTrait.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ trait <classname> 


    public function get<method>(): ?<targetClassname>

    {

        if (empty($this-><variable>)){

            $this-><variable> = \Application::$container->get('FormElementManager')->get(<targetClassname>::class);

        if (!empty($this-><variable>)) {

            return $this-><variable>;

        }

        

        return $this-><variable>;

        return \Application::$container->get('FormElementManager')->get(<targetClassname>::class);

    }

<endif useGetter>

}
 
 No newline at end of file

data/ddl_config.php

+4 −0
Changes for data/ddl_config.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ return [ 
            'STATUT_PRIVILEGE',

            'TYPE_AGREMENT_STATUT',

            'PLAFOND_APPLICATION',

            'VERSION',

        ],

    ],

    'materialized-view' => [
@@ -30,6 +31,8 @@ return [ 
            'V_CHARGENS_CALC_EFFECTIF',

            'V_CHARGENS_GRANDS_LIENS',

            'V_CHARGENS_PRECALCUL_HEURES',

            'V_INDIC_DEPASS_HC_HORS_REMU_FC',

            'V_INDIC_DEPASS_REF',

            'V_INDICATEUR_520',

            'V_INDICATEUR_530',

            'V_INDICATEUR_540',
@@ -48,6 +51,7 @@ return [ 
            'V_INDICATEUR_1240',

            'V_TBL_SERVICE_REFERENTIEL',

            'V_TBL_SERVICE_SAISIE',

            'V_TBL_VOLUME_HORAIRE',

            'V_PRIVILEGES_ROLES',

            'V_CTL_SERVICES_ODF_HISTO',

        ], 'excludes' => [

module/Application/src/Controller/CorpsController.php

+1 −1
Changes for module/Application/src/Controller/CorpsController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class CorpsController extends AbstractController 
    {



        $corps = $this->getEvent()->getParam('corps');

        $form  = $this->getFormCorpsSaisie();

        $form  = $this->getFormCorpsCorpsSaisie();



        if (empty($corps)) {

            $title = "Création d'un nouveau corps";

module/Application/src/Controller/DepartementController.php

+1 −1
Changes for module/Application/src/Controller/DepartementController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class DepartementController extends AbstractController 
    public function saisieAction()

    {

        $departement = $this->getEvent()->getParam('departement');

        $form        = $this->getFormDepartementSaisie();

        $form        = $this->getFormDepartementDepartementSaisie();



        if (empty($departement)) {

            $title       = "Création d'un nouveau département";