Commit 6917b9e7 authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge branch 'refs/heads/b24' 

# Conflicts:
#	composer.json
#	composer.lock
#	data/ddl_columns_pos.php
#	front/Formule/Test/Test.vue
#	module/Application/src/Entity/WorkflowEtape.php
#	module/Contrat/src/Controller/ContratController.php
#	module/Intervenant/src/Entity/Db/Intervenant.php
#	module/OffreFormation/src/Service/ElementPedagogiqueService.php
#	public/dist/.vite/manifest.json
#	public/dist/assets/main-jFf4OOQq.css
parents eb5d0ce6 ff762d45

composer.json

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
        "twbs/bootstrap"                     : "5.0.*",

        "components/jquery"                  : "3.7.*",

        "components/font-awesome"            : "6.5.*",

        "tinymce/tinymce"                    : "7.6.*",

        "tinymce/tinymce"                  : "7.9.3",

        "snapappointments/bootstrap-select"  : "1.14.0-beta3",

        "datatables.net/datatables.net-bs5"  : "2.1.*",

        "vakata/jstree"                      : "3.3.*",
@@ -52,7 +52,7 @@ 
        "unicaen/app"                        : "8.0.0",

        "unicaen/authentification"           : "8.0.0",

        "unicaen/mail"                       : "7.3.2",

        "unicaen/signature"                  : "1.0.7",

        "unicaen/signature"                  : "2.0.0",



        "unicaen/code"                       : "6.6.2",

        "unicaen/import"                     : "6.1.0",
@@ -63,7 +63,7 @@ 
        "unicaen/bddadmin"                   : "1.7.0",



        "connecteur-ose/actul"               : "dev-master",

        "connecteur-ose/pegase"              : "dev-master"

        "connecteur-ose/pegase"              : "dev-pegase-webservice"

    },

    "replace"          : {

        "laminas/laminas-cache"                           : "*",

config.local.php.default

+3 −1
Original line number Diff line number Diff line
@@ -235,9 +235,11 @@ return [ 
         * reçoive le mail à sa place).

         * Fournir sous forme de tableau

         * Pour ne pas activer la redirection des mails, laissez vide le tableau ('redirection' => [],).

         * Pour activer la redirection vers l’adresse e-mail de l’utilisateur courant, renseigner la clé is_redirected à true et laisser le champ redirection vide.

         */

        'redirection'    => ['mail@mon-domaine.fr'],



        'is_redirected' => true,

        'redirection'    => ['mail@mon-domaine.fr'],

        /* Envoi de mail activé ou non (false = mails envoyés, true = système d'envoi de mails inactif) */

        'envoiDesactive' => false,

    ],

data/ddl/table/INTERVENANT.php

+12 −0
Original line number Diff line number Diff line
@@ -297,6 +297,18 @@ return [ 
            'position'    => 17,

            'commentaire' => NULL,

        ],

        'DESACTIVER_SIGNATURE'        => [

            'name'        => 'DESACTIVER_SIGNATURE',

            'type'        => 'int',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => FALSE,

            'default'     => '0',

            'position'    => 66,

            'commentaire' => NULL,

        ],

        'DISCIPLINE_ID'               => [

            'name'        => 'DISCIPLINE_ID',

            'type'        => 'int',

data/ddl/table/UNICAEN_SIGNATURE_PROCESS.php

+12 −0
Original line number Diff line number Diff line
@@ -33,6 +33,18 @@ return [ 
            'position'    => 5,

            'commentaire' => NULL,

        ],

        'DESCRIPTION'      => [

            'name'        => 'DESCRIPTION',

            'type'        => 'string',

            'bdd-type'    => 'VARCHAR2',

            'length'      => 4000,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => TRUE,

            'default'     => NULL,

            'position'    => 9,

            'commentaire' => NULL,

        ],

        'DOCUMENT_NAME'    => [

            'name'        => 'DOCUMENT_NAME',

            'type'        => 'string',

data/ddl/view/V_FORMULE_VOLUME_HORAIRE.sql

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ FROM 
  LEFT JOIN STRUCTURE                    str ON str.id = ep.structure_id

  LEFT JOIN etape                          e ON e.id = ep.etape_id

  LEFT JOIN type_formation                tf ON tf.id = e.type_formation_id

  LEFT JOIN type_intervention_statut     tis ON tis.type_intervention_id = ti.id AND tis.statut_id = i.statut_id

  LEFT JOIN type_intervention_statut     tis ON tis.type_intervention_id = ti.id AND tis.statut_id = i.statut_id AND tis.histo_destruction IS NULL

  LEFT JOIN formule_resultat_intervenant fri ON fri.intervenant_id = s.intervenant_id

                                            AND fri.type_volume_horaire_id = vh.type_volume_horaire_id

                                            AND fri.etat_volume_horaire_id = evh.id