Commit a0221bcb authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/master' into ll-mission-plafond

# Conflicts:
#	module/Application/src/Entity/Db/Intervenant.php
#	module/Application/src/Entity/Db/Structure.php
#	module/Intervenant/src/Entity/Db/Statut.php
parents 43572bf0 a2caf94e
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -9,12 +9,16 @@

* Nouvelle notion de mission, permettant de gérer les contrats étudiants
* Taux HETD personnalisables
* Possibilité de contractualiser des heures de service référentiel et de mission

## Améliorations
* 

* Modification de libellé dans l'affichage de l'offre de formation (#49763)

## Corrections de bugs

* Il est possible de rentrer une date de retour sur un contrat après avoir téléversé le contrat sans avoir besoin de recharger la page
* 

# OSE 20.3 (à venir)

+12 −12
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": "816afa9ec00d3ac8d2edf81cb626e6a6",
    "content-hash": "8f1764a65b8860981c21c982732a8952",
    "packages": [
        {
            "name": "beberlei/assert",
@@ -5801,16 +5801,16 @@
        },
        {
            "name": "symfony/console",
            "version": "v5.4.22",
            "version": "v5.4.23",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
                "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8"
                "reference": "90f21e27d0d88ce38720556dd164d4a1e4c3934c"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/symfony/console/zipball/3cd51fd2e6c461ca678f84d419461281bd87a0a8",
                "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8",
                "url": "https://api.github.com/repos/symfony/console/zipball/90f21e27d0d88ce38720556dd164d4a1e4c3934c",
                "reference": "90f21e27d0d88ce38720556dd164d4a1e4c3934c",
                "shasum": ""
            },
            "require": {
@@ -5880,7 +5880,7 @@
                "terminal"
            ],
            "support": {
                "source": "https://github.com/symfony/console/tree/v5.4.22"
                "source": "https://github.com/symfony/console/tree/v5.4.23"
            },
            "funding": [
                {
@@ -5896,7 +5896,7 @@
                    "type": "tidelift"
                }
            ],
            "time": "2023-03-25T09:27:28+00:00"
            "time": "2023-04-24T18:47:29+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@@ -6878,11 +6878,11 @@
        },
        {
            "name": "unicaen/app",
            "version": "6.0.5",
            "version": "6.0.6",
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/app.git",
                "reference": "a85de98e91ea41bf97eb0fdb9359f4942e9fe96d"
                "reference": "663090c6b51df655113e980af72fcce87a97ce84"
            },
            "require": {
                "beberlei/assert": "^3.3",
@@ -6938,7 +6938,7 @@
                ]
            },
            "description": "Module de base des applications unicaen",
            "time": "2023-03-21T14:44:06+00:00"
            "time": "2023-04-27T08:34:42+00:00"
        },
        {
            "name": "unicaen/authentification",
@@ -7298,7 +7298,7 @@
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/vue.git",
                "reference": "367aa23bbafb44b9da51605e8d2ce38ac49deace"
                "reference": "a31b0078ee8990abf936e5de0d75ebcc41b7a7a5"
            },
            "type": "library",
            "autoload": {
@@ -7310,7 +7310,7 @@
                ]
            },
            "description": "Module pour utiliser Vue.js",
            "time": "2023-04-26T07:54:05+00:00"
            "time": "2023-04-27T09:52:15+00:00"
        },
        {
            "name": "unicaen/zfc-user",
+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ return [
    'AFFECTATION_RECHERCHE_ID_SEQ',
    'AGREMENT_ID_SEQ',
    'CAMPAGNE_SAISIE_ID_SEQ',
    'CANDIDATURE_ID_SEQ',
    'CATEGORIE_PRIVILEGE_ID_SEQ',
    'CC_ACTIVITE_ID_SEQ',
    'CENTRE_COUT_EP_ID_SEQ',
@@ -64,6 +65,7 @@ return [
    'NOEUD_ID_SEQ',
    'NOTE_ID_SEQ',
    'NOTIFICATION_INDICATEUR_ID_SEQ',
    'OFFRE_EMPLOI_ID_SEQ',
    'PARAMETRE_ID_SEQ',
    'PAYS_ID_SEQ',
    'PERIMETRE_ID_SEQ',
+147 −0
Original line number Diff line number Diff line
<?php

//@formatter:off

return [
    'name'        => 'CANDIDATURE',
    'temporary'   => FALSE,
    'logging'     => TRUE,
    'commentaire' => NULL,
    'sequence'    => 'CANDIDATURE_ID_SEQ',
    'columns'     => [
        'ID'                   => [
            'name'        => 'ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => '0',
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 1,
            'commentaire' => NULL,
        ],
        'INTERVENANT_ID' => [
            'name'        => 'INTERVENANT_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 2,
            'commentaire' => NULL,
        ],
        'OFFRE_EMPLOI_ID'     => [
            'name'        => 'OFFRE_EMPLOI_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 1,
            'commentaire' => NULL,
        ],
        'VALIDATION_ID'     => [
            'name'        => 'VALIDATION_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 3,
            'commentaire' => NULL,
        ],
        'MOTIF'     => [
            'name'        => 'MOTIF',
            'type'        => 'string',
            'bdd-type'    => 'VARCHAR2',
            'length'      => 4000,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 6,
            'commentaire' => NULL,
        ],
        'HISTO_CREATEUR_ID'     => [
            'name'        => 'HISTO_CREATEUR_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => '0',
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 8,
            'commentaire' => NULL,
        ],
        'HISTO_CREATION'        => [
            'name'        => 'HISTO_CREATION',
            'type'        => 'date',
            'bdd-type'    => 'DATE',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => 'SYSDATE',
            'position'    => 7,
            'commentaire' => NULL,
        ],
        'HISTO_DESTRUCTEUR_ID'  => [
            'name'        => 'HISTO_DESTRUCTEUR_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => '0',
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 12,
            'commentaire' => NULL,
        ],
        'HISTO_DESTRUCTION'     => [
            'name'        => 'HISTO_DESTRUCTION',
            'type'        => 'date',
            'bdd-type'    => 'DATE',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 11,
            'commentaire' => NULL,
        ],
        'HISTO_MODIFICATEUR_ID' => [
            'name'        => 'HISTO_MODIFICATEUR_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => '0',
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 10,
            'commentaire' => NULL,
        ],
        'HISTO_MODIFICATION'    => [
            'name'        => 'HISTO_MODIFICATION',
            'type'        => 'date',
            'bdd-type'    => 'DATE',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => 'SYSDATE',
            'position'    => 9,
            'commentaire' => NULL,
        ],
    ],
];

//@formatter:on
+219 −0
Original line number Diff line number Diff line
<?php

//@formatter:off

return [
    'name'        => 'OFFRE_EMPLOI',
    'temporary'   => FALSE,
    'logging'     => TRUE,
    'commentaire' => NULL,
    'sequence'    => 'OFFRE_EMPLOI_ID_SEQ',
    'columns'     => [
        'AUTO_VALIDATION'       => [
            'name'        => 'AUTO_VALIDATION',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => '0',
            'position'    => 14,
            'commentaire' => NULL,
        ],
        'DATE_DEBUT'            => [
            'name'        => 'DATE_DEBUT',
            'type'        => 'date',
            'bdd-type'    => 'DATE',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 4,
            'commentaire' => NULL,
        ],
        'DATE_FIN'              => [
            'name'        => 'DATE_FIN',
            'type'        => 'date',
            'bdd-type'    => 'DATE',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 5,
            'commentaire' => NULL,
        ],
        'TITRE'           => [
            'name'        => 'TITRE',
            'type'        => 'string',
            'bdd-type'    => 'VARCHAR2',
            'length'      => 200,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 15,
            'commentaire' => NULL,
        ],
        'DESCRIPTION'           => [
            'name'        => 'DESCRIPTION',
            'type'        => 'string',
            'bdd-type'    => 'VARCHAR2',
            'length'      => 4000,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 6,
            'commentaire' => NULL,
        ],
        'NOMBRE_HEURES'           => [
            'name'        => 'NOMBRE_HEURES',
            'type'        => 'integer',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 16,
            'commentaire' => NULL,
        ],
        'NOMBRE_POSTES'           => [
            'name'        => 'NOMBRE_POSTES',
            'type'        => 'integer',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 17,
            'commentaire' => NULL,
        ],
        'HISTO_CREATEUR_ID'     => [
            'name'        => 'HISTO_CREATEUR_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => '0',
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 8,
            'commentaire' => NULL,
        ],
        'HISTO_CREATION'        => [
            'name'        => 'HISTO_CREATION',
            'type'        => 'date',
            'bdd-type'    => 'DATE',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => 'SYSDATE',
            'position'    => 7,
            'commentaire' => NULL,
        ],
        'HISTO_DESTRUCTEUR_ID'  => [
            'name'        => 'HISTO_DESTRUCTEUR_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => '0',
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 12,
            'commentaire' => NULL,
        ],
        'HISTO_DESTRUCTION'     => [
            'name'        => 'HISTO_DESTRUCTION',
            'type'        => 'date',
            'bdd-type'    => 'DATE',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 11,
            'commentaire' => NULL,
        ],
        'HISTO_MODIFICATEUR_ID' => [
            'name'        => 'HISTO_MODIFICATEUR_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => '0',
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 10,
            'commentaire' => NULL,
        ],
        'HISTO_MODIFICATION'    => [
            'name'        => 'HISTO_MODIFICATION',
            'type'        => 'date',
            'bdd-type'    => 'DATE',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => 'SYSDATE',
            'position'    => 9,
            'commentaire' => NULL,
        ],
        'ID'                    => [
            'name'        => 'ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 1,
            'commentaire' => NULL,
        ],
        'STRUCTURE_ID'          => [
            'name'        => 'STRUCTURE_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 13,
            'commentaire' => NULL,
        ],
        'TYPE_MISSION_ID'       => [
            'name'        => 'TYPE_MISSION_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => NULL,
            'precision'   => NULL,
            'nullable'    => FALSE,
            'default'     => NULL,
            'position'    => 3,
            'commentaire' => NULL,
        ],
        'VALIDATION_ID'         => [
            'name'        => 'VALIDATION_ID',
            'type'        => 'int',
            'bdd-type'    => 'NUMBER',
            'length'      => 0,
            'scale'       => '0',
            'precision'   => NULL,
            'nullable'    => TRUE,
            'default'     => NULL,
            'position'    => 14,
            'commentaire' => NULL,
        ],
    ],
];

//@formatter:on
Loading