Commit 7b899135 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'feature_admission_wf' into test__admission_v2

parents 33a5f246 44f586c8

composer.json

+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
        "unicaen/sql": "^2.0",

        "unicaen/sygal-api": "dev-master",

        "unicaen/utilisateur": "^6.3",

        "unicaen/avis": "dev-main",

        "unicaen/avis": "^1.1",

        "unicaen/exemple": "dev-master"

    },

    "minimum-stability": "dev",

composer.lock

+4 −5
Changes for composer.lock: 4 added lines, 5 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": "1ca0678d489e14bbb2672c4796775da5",

    "content-hash": "e3cf2b122a44ad214640d5263bdebbfb",

    "packages": [

        {

            "name": "apereo/phpcas",
@@ -11939,11 +11939,11 @@ 
        },

        {

            "name": "unicaen/avis",

            "version": "dev-main",

            "version": "1.1.0",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/avis.git",

                "reference": "5f0f1b1e3283ec84841b7e3ee62272625fa41171"

                "reference": "5c2c70baa1386e7f6dd8c7cc1665fd15a23e7fe3"

            },

            "require": {

                "doctrine/doctrine-laminas-hydrator": "^2.0 || ^3.0",
@@ -11984,7 +11984,7 @@ 
                ]

            },

            "description": "Module Unicaen de gestion des avis",

            "time": "2025-12-08T09:43:15+00:00"

            "time": "2026-03-11T13:19:43+00:00"

        },

        {

            "name": "unicaen/bjy-authorize",
@@ -15573,7 +15573,6 @@ 
        "unicaen/pdf": 20,

        "unicaen/renderer": 20,

        "unicaen/sygal-api": 20,

        "unicaen/avis": 20,

        "unicaen/exemple": 20

    },

    "prefer-stable": true,

module/Admission/view/admission/avis/admission-avis/aviser.phtml

+7 −2
Changes for module/Admission/view/admission/avis/admission-avis/aviser.phtml: 7 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -27,7 +27,12 @@ $form->prepare(); 


<script>

    $(function() {

        // pas sûr que l'avis négatif soit pertinent/souhaitable donc pour l'instant on l'interdit

        $("input[value=AVIS_ADMISSION_VALEUR_NEGATIF]").attr('disabled', true).parent('label').css('opacity', 0.5);

        // avis (sauf présidence) : pas sûr que l'avis négatif soit pertinent/souhaitable donc pour l'instant on l'interdit

        $(

            "form.form-unicaen-avis-AVIS_ADMISSION_DIR_THESE   input[value=AVIS_ADMISSION_VALEUR_NEGATIF], " +

            "form.form-unicaen-avis-AVIS_ADMISSION_CODIR_THESE input[value=AVIS_ADMISSION_VALEUR_NEGATIF], " +

            "form.form-unicaen-avis-AVIS_ADMISSION_DIR_UR      input[value=AVIS_ADMISSION_VALEUR_NEGATIF], " +

            "form.form-unicaen-avis-AVIS_ADMISSION_DIR_ED      input[value=AVIS_ADMISSION_VALEUR_NEGATIF]"

        ).attr('disabled', true).parent('label').css('opacity', 0.5);

    });

</script>
 
 No newline at end of file

module/Admission/view/admission/avis/admission-avis/modifier.phtml

+7 −2
Changes for module/Admission/view/admission/avis/admission-avis/modifier.phtml: 7 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -26,7 +26,12 @@ $form->prepare(); 


<script>

    $(function() {

        // pas sûr que l'avis négatif soit pertinent/souhaitable donc pour l'instant on l'interdit

        $("input[value=AVIS_ADMISSION_VALEUR_NEGATIF]").attr('disabled', true).parent('label').css('opacity', 0.5);

        // avis (sauf présidence) : pas sûr que l'avis négatif soit pertinent/souhaitable donc pour l'instant on l'interdit

        $(

            "form.form-unicaen-avis-AVIS_ADMISSION_DIR_THESE   input[value=AVIS_ADMISSION_VALEUR_NEGATIF], " +

            "form.form-unicaen-avis-AVIS_ADMISSION_CODIR_THESE input[value=AVIS_ADMISSION_VALEUR_NEGATIF], " +

            "form.form-unicaen-avis-AVIS_ADMISSION_DIR_UR      input[value=AVIS_ADMISSION_VALEUR_NEGATIF], " +

            "form.form-unicaen-avis-AVIS_ADMISSION_DIR_ED      input[value=AVIS_ADMISSION_VALEUR_NEGATIF]"

        ).attr('disabled', true).parent('label').css('opacity', 0.5);

    });

</script>
 
 No newline at end of file