Commit 46ebc5c9 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'feature_admission_wf' into test__admission_v2

parents 7b899135 bf358df7

doc/release-notes/v11/11.0.0/01_admission.sql

+10 −1
Changes for doc/release-notes/v11/11.0.0/01_admission.sql: 10 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,7 +3,16 @@ 
--



alter table admission_inscription

    alter column discipline_doctorat type varchar(100) using discipline_doctorat::varchar(100);

    alter column discipline_doctorat type varchar(128) using discipline_doctorat::varchar(128);



alter table admission_etudiant

    alter column intitule_du_diplome_national type varchar(256) using intitule_du_diplome_national::varchar(256);

alter table admission_etudiant

    alter column intitule_du_diplome_autre type varchar(256) using intitule_du_diplome_autre::varchar(256);

alter table admission_etudiant

    alter column etablissement_dobtention_diplome_national type varchar(256) using etablissement_dobtention_diplome_national::varchar(256);

alter table admission_etudiant

    alter column intitule_du_diplome_national type varchar(256) using intitule_du_diplome_national::varchar(256);



alter table admission_type_validation

    alter column code type varchar(128) using code::varchar(128);

module/Admission/src/Admission/Config/OperationConfig.php

+2 −2
Changes for module/Admission/src/Admission/Config/OperationConfig.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ class OperationConfig extends \Operation\Config\OperationConfig 
                    self::AVIS_DIR_THESE => true,

                ],

                'enabled' => function(Admission $admission) {

                    return $admission->getInscription()?->first()?->getCoDirection() == true;

                    return ($admission->getInscription()?->first() ?: null)?->getCoDirection() == true;

                },

                'enabled_as_dql' => null,

            ],
@@ -172,7 +172,7 @@ class OperationConfig extends \Operation\Config\OperationConfig 
                    self::ATTESTATION_CODIR_THESE => true

                ],

                'enabled' => function(Admission $admission) {

                    return $admission->getInscription()?->first()?->getCoDirection() == true;

                    return ($admission->getInscription()?->first() ?: null)?->getCoDirection() == true;

                },

                //pas de notif, peut-être à enlever si changement d'ordre des validations

                'readonly' => true,