Commit 3b06fdf6 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'master' of https://git.unicaen.fr/open-source/OSE

parents 9ebaeca0 7f8ff577

config.local.php.default

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ return [ 
        //définition du connecteur SI RH à utiliser pour le module export RH de OSE

        'actif'      => true,

        'connecteur' => 'siham',

        'sync-code' => true,

    ],

config/autoload/export-rh.global.php

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ return [ 
    'export-rh' => [

        'actif'      => AppConfig::get('export-rh', 'actif') ? AppConfig::get('export-rh', 'actif') : false,

        'connecteur' => AppConfig::get('export-rh', 'connecteur') ? AppConfig::get('export-rh', 'connecteur') : '',

        'sync-code'  => AppConfig::get('export-rh', 'sync-code') ? AppConfig::get('export-rh', 'sync-code') : false,

    ],



];
 
 No newline at end of file

data/ddl/package/OSE_WORKFLOW/body.sql

+3 −4
Original line number Diff line number Diff line
@@ -558,7 +558,6 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS 
            WHEN e.code = ''PJ_VALIDATION'' THEN pj.demandees

          END                                                       objectif,

          CASE

			WHEN pj.obligatoire = 0 THEN 1

            WHEN e.code = ''PJ_SAISIE'' THEN pj.fournies

            WHEN e.code = ''PJ_VALIDATION'' THEN pj.validees

          END                                                       realisation
@@ -567,9 +566,9 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS 
          SELECT

            intervenant_id,

            SUM(demandee) demandees,

            SUM(fournie)  fournies,

            SUM(validee)  validees,

			MIN(obligatoire) obligatoire

            SUM(CASE WHEN obligatoire = 0 THEN 1 ELSE fournie END)  fournies,

            SUM(CASE WHEN obligatoire = 0 THEN 1 ELSE validee END)  validees,

			SUM(CASE WHEN obligatoire = 0 THEN 1 ELSE 0 END) facultatives

          FROM

            tbl_piece_jointe

          WHERE

data/ddl/view/V_INDICATEUR_430.sql

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ SELECT 
  w.structure_id

FROM

	intervenant i

	JOIN PARAMETRE p ON p.VALEUR = 'avenant'

	JOIN tbl_workflow w ON w.intervenant_id = i.id

	JOIN (

    SELECT DISTINCT

data/ddl/view/V_TBL_PIECE_JOINTE.sql

+5 −7
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ WITH t AS ( 
    pjd.type_piece_jointe_id                                    type_piece_jointe_id,

    pjd.intervenant_id                                          intervenant_id,

    CASE WHEN pjd.intervenant_id IS NULL THEN 0 ELSE 1 END      demandee,

    SUM(CASE WHEN pjf.id IS NULL THEN 0 ELSE 1 END)             fournie,

    MAX(pjf.validation_id) keep(DENSE_RANK FIRST ORDER BY pjf.annee_id DESC) validee,

    SUM(CASE WHEN pjf.id IS NOT NULL THEN 1 ELSE 0 END)             fournie,

    MAX(pjf.validation_id) KEEP(DENSE_RANK FIRST ORDER BY pjf.annee_id DESC) validee,

    COALESCE(pjd.heures_pour_seuil,0)                           heures_pour_seuil,

    COALESCE(pjd.obligatoire,1)                                 obligatoire

  FROM
@@ -29,7 +29,7 @@ WITH t AS ( 
    pjf.intervenant_id                                          intervenant_id,

    0                                                           demandee,

    1                                                           fournie,

    MAX(pjf.validation_id) keep(DENSE_RANK FIRST ORDER BY pjf.annee_id DESC) validee,

    MAX(pjf.validation_id) KEEP(DENSE_RANK FIRST ORDER BY pjf.annee_id DESC) validee,

    0                                                           heures_pour_seuil,

    0                                                           obligatoire

  FROM
@@ -43,8 +43,7 @@ WITH t AS ( 
  GROUP BY

    pjf.annee_id, pjf.type_piece_jointe_id, pjf.intervenant_id

)

SELECT

  annee_id,

SELECT annee_id,

       type_piece_jointe_id,

       intervenant_id,

       demandee,
@@ -52,5 +51,4 @@ SELECT 
       CASE WHEN validee IS NULL THEN 0 ELSE 1 END validee,

       heures_pour_seuil,

       obligatoire

FROM

  t
 
 No newline at end of file
 
FROM t
 
 No newline at end of file