Commit 6b20987e authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

WIP nouveau wf complet à peu près ok

parent 3e691b1f
Loading
Loading
Loading
Loading
+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@
        "unicaen/livelog": "^4.0",
        "unicaen/mail": "^6.1",
        "unicaen/maintenance-mode": "^1.0",
        "unicaen/multipage-form": "^1.0",
        "unicaen/multipage-form": "^1.2",
        "unicaen/parametre": "^6.0",
        "unicaen/pdf": "dev-release_7.0.0",
        "unicaen/renderer": "dev-release_7.2.0",
+4 −4
Changes for composer.lock: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
    "content-hash": "f8e768d83941258935bd9de71a3b204b",
    "content-hash": "ef22c7805c0b740cc134760fe63579ed",
    "packages": [
        {
            "name": "apereo/phpcas",
@@ -12415,11 +12415,11 @@
        },
        {
            "name": "unicaen/multipage-form",
            "version": "1.0.0",
            "version": "1.2.0",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/multipage-form.git",
                "reference": "4a257edf5bab96efc38d34b681df85d6f6eac6fe"
                "reference": "fd275bc1dc72a88e44b502bb61dbaa5cd0df50dc"
            },
            "require": {
                "laminas/laminas-config": "^3.9",
@@ -12445,7 +12445,7 @@
                ]
            },
            "description": "Gestion de formulaire multi-page",
            "time": "2025-10-09T08:24:05+00:00"
            "time": "2025-10-14T08:03:02+00:00"
        },
        {
            "name": "unicaen/parametre",
+2 −1
Changes for config/application.config.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ return [
        'UnicaenParametre',
        'UnicaenSearch',
        'UnicaenMultipageForm',
        'Exemple',
        'UnicaenExemple',
        'Feature',
        'Horodatage',
        'Structure',
@@ -87,6 +87,7 @@ return [
        'InscriptionAdministrative',
        'Admission',
        'Application',
        'Operation',
        'Substitution',
        'SygalApi',
        'SygalApiImpl',
+49 −0
Changes for doc/release-notes/v11/11.0.0/01_admission.sql: 49 added lines, 0 removed lines.
Original line number Diff line number Diff line
--
-- 11.0.0
--

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

-------------------------------------------------- Avis Administratif -------------------------------------------------
-- Nouveau type d'avis
insert into unicaen_avis_type (code, libelle, description, ordre)
values ('AVIS_ADMISSION_ADMINISTRATIF', 'Avis administratif', 'Point de vue des gestionnaires administratifs', 30);
-- Valeurs d'avis possibles : "complet", "incomplet"
insert into unicaen_avis_type_valeur (avis_type_id, avis_valeur_id)
select t.id, v.id
from unicaen_avis_type t,
     unicaen_avis_valeur v
where t.code = 'AVIS_ADMISSION_ADMINISTRATIF'
  and v.code in ('AVIS_ADMISSION_VALEUR_INCOMPLET',
                 'AVIS_ADMISSION_VALEUR_COMPLET');
-- Message d'info si avis === "incomplet"
insert into unicaen_avis_type_valeur_complem (avis_type_valeur_id, code, obligatoire_un_au_moins, type, libelle)
with tmp (code, oblig, type, libelle) as (
    select 'PB_INFOS',
    false,
    'information',
    'Si le dossier est jugé incomplet, l''étudiant devra reprendre le circuit de validations/signatures depuis le début...')
select tv.id, concat(t.code, '__', v.code, '__', tmp.code), tmp.oblig, tmp.type, tmp.libelle
from tmp,
     unicaen_avis_type_valeur tv
         join unicaen_avis_type t on t.id = tv.avis_type_id and t.code = 'AVIS_ADMISSION_ADMINISTRATIF'
         join unicaen_avis_valeur v on v.id = tv.avis_valeur_id and v.code in (
         'AVIS_ADMISSION_VALEUR_INCOMPLET'
         );
-- Champ complémentaire obligatoire si avis === "incomplet" : motif
insert into unicaen_avis_type_valeur_complem (avis_type_valeur_id, code, obligatoire_un_au_moins, type, libelle)
with tmp (code, oblig, type, libelle) as (select 'PB_MOTIF', true, 'textarea', 'Motif')
select tv.id, concat(t.code, '__', v.code, '__', tmp.code), tmp.oblig, tmp.type, tmp.libelle
from tmp,
     unicaen_avis_type_valeur tv
         join unicaen_avis_type t on t.id = tv.avis_type_id and t.code = 'AVIS_ADMISSION_ADMINISTRATIF'
         join unicaen_avis_valeur v on v.id = tv.avis_valeur_id and v.code in ('AVIS_ADMISSION_VALEUR_INCOMPLET');
-- Champ complémentaire facultatif si avis === "complet" : commentaire
insert into unicaen_avis_type_valeur_complem (avis_type_valeur_id, code, obligatoire_un_au_moins, type, libelle)
with tmp (code, oblig, type, libelle) as (select 'PB_COMMENTAIRES', false, 'textarea', 'Commentaires')
select tv.id, concat(t.code, '__', v.code, '__', tmp.code), tmp.oblig, tmp.type, tmp.libelle
from tmp,
     unicaen_avis_type_valeur tv
         join unicaen_avis_type t on t.id = tv.avis_type_id and t.code = 'AVIS_ADMISSION_ADMINISTRATIF'
         join unicaen_avis_valeur v on v.id = tv.avis_valeur_id and v.code in ('AVIS_ADMISSION_VALEUR_COMPLET');
+5 −0
Changes for module/Admission/config/module.config.php: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ use Admission\Form\Fieldset\Financement\FinancementFieldset;
use Admission\Form\Fieldset\Financement\FinancementFieldsetFactory;
use Admission\Form\Fieldset\Inscription\InscriptionFieldset;
use Admission\Form\Fieldset\Inscription\InscriptionFieldsetFactory;
use Admission\Form\Fieldset\Validation\SignatureFieldset;
use Admission\Form\Fieldset\Validation\SignatureFieldsetFactory;
use Admission\Form\Fieldset\Verification\VerificationFieldset;
use Admission\Form\Fieldset\Verification\VerificationFieldsetFactory;
use Admission\Hydrator\Admission\AdmissionHydrator;
@@ -146,6 +148,7 @@ return array(
                        'financement',
                        'conventionFormationDoctorale',
                        'document',
                        'signature',
                        'enregistrer',
                        'generer-statut-dossier'
                    ],
@@ -253,6 +256,7 @@ return array(
                                 * @see AdmissionController::financementAction()
                                 * @see AdmissionController::conventionFormationDoctoraleAction()
                                 * @see AdmissionController::documentAction()
                                 * @see AdmissionController::signatureAction()
                                 * @see AdmissionController::enregistrerAction()
                                 * @see AdmissionController::supprimerAction()
                                 */
@@ -420,6 +424,7 @@ return array(
            ConventionFormationDoctoraleFieldset::class => ConventionFormationDoctoraleFieldsetFactory::class,
            VerificationFieldset::class => VerificationFieldsetFactory::class,
            DocumentFieldset::class => DocumentFieldsetFactory::class,
            SignatureFieldset::class => SignatureFieldsetFactory::class,
        ],
    ],

Loading