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

Merge branch 'b24' 

# Conflicts:
#	config/autoload/unicaen-vue.global.php
#	module/Workflow/src/Service/WorkflowService.php
parents 7add0235 8f4c1cde

data/ddl/table/STRUCTURE.php

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ return [ 
            'name'        => 'LIBELLE_COURT',

            'type'        => 'string',

            'bdd-type'    => 'VARCHAR2',

            'length'      => 25,

            'length'      => 50,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => FALSE,

data/ddl/table/UNICAEN_MAIL_MAIL.php

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

            'commentaire' => NULL,

        ],

        'REPLY_TO'                  => [

            'name'        => 'REPLY_TO',

            'type'        => 'string',

            'bdd-type'    => 'VARCHAR2',

            'length'      => 500,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => TRUE,

            'default'     => NULL,

            'position'    => 12,

            'commentaire' => NULL,

        ],

    ],

];

data/ddl/view/V_INDICATEUR_231.sql

0 → 100644
+21 −0
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_231 AS

SELECT DISTINCT

  MAX(i.NOM_USUEL),

  MAX(i.PRENOM),

  w.intervenant_id,

  i.structure_id,

  MAX(pj.histo_modification) AS "Date de modification"

FROM

  tbl_workflow w

  JOIN tbl_workflow wc ON wc.intervenant_id = w.intervenant_id

  JOIN intervenant i ON i.id = w.intervenant_id AND i.histo_destruction IS NULL

  JOIN tbl_piece_jointe tpj ON i.id = tpj.intervenant_id AND tpj.demandee = 0

  LEFT JOIN piece_jointe pj ON i.id = pj.intervenant_id

WHERE

  w.etape_code = 'PJ_VALIDATION'

  AND wc.etape_code = 'PJ_SAISIE'

  AND w.type_intervenant_code = 'E'

  AND w.atteignable = 1

  AND tpj.fournie = 1

  AND tpj.validee = 0

GROUP BY (w.intervenant_id, i.structure_id)
 
 No newline at end of file

data/ddl/view/V_INDICATEUR_241.sql

0 → 100644
+21 −0
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_241 AS

SELECT DISTINCT

  MAX(i.NOM_USUEL),

  MAX(i.PRENOM),

  w.intervenant_id,

  i.structure_id,

  MAX(pj.histo_modification) AS "Date de modification"

FROM

  tbl_workflow w

  JOIN tbl_workflow wc ON wc.intervenant_id = w.intervenant_id

  JOIN intervenant i ON i.id = w.intervenant_id AND i.histo_destruction IS NULL

  JOIN tbl_piece_jointe tpj ON i.id = tpj.intervenant_id AND tpj.demandee = 0

  LEFT JOIN piece_jointe pj ON i.id = pj.intervenant_id

WHERE

  w.etape_code = 'PJ_VALIDATION'

  AND wc.etape_code = 'PJ_SAISIE'

  AND w.type_intervenant_code = 'P'

  AND w.atteignable = 1

  AND tpj.fournie = 1

  AND tpj.validee = 0

GROUP BY (w.intervenant_id, i.structure_id)
 
 No newline at end of file

data/indicateurs.php

+14 −0
Original line number Diff line number Diff line
@@ -122,6 +122,13 @@ return [ 
                'route'             => 'piece-jointe/intervenant',

                'irrecevables'      => false,

            ],

            231 => [

                'enabled'           => true,

                'libelle_singulier' => '%s vacataire est en attente de validation de ses pièces justificatives facultatives',

                'libelle_pluriel'   => '%s vacataires sont en attente de validation de leurs pièces justificatives facultatives',

                'route'             => 'piece-jointe/intervenant',

                'irrecevables'      => false,

            ],

            240 => [

                'enabled'           => true,

                'libelle_singulier' => '%s permanent est en attente de validation de ses pièces justificatives obligatoires',
@@ -129,6 +136,13 @@ return [ 
                'route'             => 'piece-jointe/intervenant',

                'irrecevables'      => false,

            ],

            241 => [

                'enabled'           => true,

                'libelle_singulier' => '%s permanent est en attente de validation de ses pièces justificatives facultatives',

                'libelle_pluriel'   => '%s permanents sont en attente de validation de leurs pièces justificatives facultatives',

                'route'             => 'piece-jointe/intervenant',

                'irrecevables'      => false,

            ],

            250 => [

                'enabled'           => true,

                'libelle_singulier' => '%s étudiant n\'a pas fourni toutes les pièces justificatives obligatoires',

config.local.php.default

+1 −1

File changed.

Contains only whitespace changes.