Commit c0263f1b authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge branch 'master' into alc-tags

parents 9cfa5768 25bbf680

.gitignore

+1 −0
Original line number Diff line number Diff line 
config.local.php

config/autoload/*.local.php

vendor/*

node_modules/*

cache/*

.idea

deploy.log

data/ddl/view/V_INDICATEUR_500.sql

0 → 100644
+24 −0
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_500 AS

SELECT DISTINCT

i.id AS intervenant_id,

i.structure_id

FROM

  intervenant i

  JOIN V_FORMULE_INTERVENANT vfi ON vfi.intervenant_id = i.id

  LEFT JOIN (

    SELECT ts.intervenant_id, SUM(ts.heures) heures

    FROM tbl_service ts

    WHERE ts.type_volume_horaire_code = 'PREVU'

    GROUP BY ts.intervenant_id

  ) ts ON ts.intervenant_id = i.id

  LEFT JOIN (

    SELECT tr.intervenant_id, SUM(tr.heures) heures

    FROM tbl_referentiel tr

    WHERE tr.type_volume_horaire_code = 'PREVU'

    GROUP BY tr.intervenant_id

  ) tr ON tr.intervenant_id = i.id

WHERE

  i.histo_destruction IS NULL

  AND vfi.type_intervenant_code = 'P'

  AND vfi.heures_service_statutaire + heures_service_modifie > 0

  AND COALESCE(ts.heures,0) + COALESCE(tr.heures,0) = 0
 
 No newline at end of file

data/ddl/view/V_INDICATEUR_505.sql

0 → 100644
+24 −0
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_505 AS

SELECT DISTINCT

i.id AS intervenant_id,

i.structure_id

FROM

  intervenant i

  JOIN V_FORMULE_INTERVENANT vfi ON vfi.intervenant_id = i.id

  LEFT JOIN (

    SELECT ts.intervenant_id, SUM(ts.heures) heures

    FROM tbl_service ts

    WHERE ts.type_volume_horaire_code = 'REALISE'

    GROUP BY ts.intervenant_id

  ) ts ON ts.intervenant_id = i.id

  LEFT JOIN (

    SELECT tr.intervenant_id, SUM(tr.heures) heures

    FROM tbl_referentiel tr

    WHERE tr.type_volume_horaire_code = 'REALISE'

    GROUP BY tr.intervenant_id

  ) tr ON tr.intervenant_id = i.id

WHERE

  i.histo_destruction IS NULL

  AND vfi.type_intervenant_code = 'P'

  AND vfi.heures_service_statutaire + heures_service_modifie > 0

  AND COALESCE(ts.heures,0) + COALESCE(tr.heures,0) = 0
 
 No newline at end of file

data/indicateurs.php

+14 −0
Original line number Diff line number Diff line
@@ -158,6 +158,20 @@ return [ 
    'Enseignements et référentiel <em>Permanents</em>' => [

        'id'          => 6,

        'indicateurs' => [

            500 => [

                'enabled'           => true,

                'libelle_singulier' => '%s permanent n\'a saisi aucun service <i>prévisionnels</i>',

                'libelle_pluriel'   => '%s permanents n\'ont saisi aucun service <i>prévisionnels</i>',

                'route'             => 'intervenant/voir',

                'irrecevables'      => false,

            ],

            505 => [

                'enabled'           => true,

                'libelle_singulier' => '%s permanent n\'a saisi aucun service <i>réalisés</i>',

                'libelle_pluriel'   => '%s permanents n\'ont saisi aucun service <i>réalisés</i>',

                'route'             => 'intervenant/voir',

                'irrecevables'      => false,

            ],

            510 => [

                'enabled'           => true,

                'libelle_singulier' => '%s permanent est en attente de validation de ses enseignements <i>prévisionnels</i>',

module/Application/config/type-formation.config.php

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ return [ 
                    'saisie'           => [

                        'type'          => 'Segment',

                        'options'       => [

                            'route'       => '/saisie[/:typeFormation]',

                            'route'       => '/saisie[/:typeFormation][/:groupeTypeFormation]',

                            'constraints' => [

                                'typeFormation' => '[0-9]*',

                            ],