Commit 896d7ecb authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Module Formation : ajout de la mention du module dans l'extraction des statis... 

Module Formation : ajout de la mention du module dans l'extraction des statis sur les formations/session/seances + composer update
parent 6284be7b

doc/release-notes/v9/9.3.1/04_formation.sql

+1 −3
Original line number Diff line number Diff line
@@ -16,8 +16,7 @@ select privilege__revoke_privileges_to_profiles('formation_formation', ARRAY['in 


drop view if exists v_formation_export ;

create or replace view v_formation_export as

SELECT m.libelle as module_libelle,

       f.id AS formation_id,

SELECT f.id AS formation_id,

       f.libelle AS formation_titre,

       sess.id AS session_id,

       ( SELECT string_agg((if.nom_patronymique::text || ' '::text) || if.prenom1::text, ','::text || chr(10)) AS string_agg
@@ -67,7 +66,6 @@ SELECT m.libelle as module_libelle, 
FROM formation_seance sea

         JOIN formation_session sess ON sea.session_id = sess.id AND sess.histo_destruction IS NULL

         JOIN formation_formation f ON sess.formation_id = f.id AND f.histo_destruction IS NULL

         JOIN formation_module m ON m.id = f.module_id AND m.histo_destruction IS NULL

         JOIN structure ssr ON ssr.id = sess.site_id

         LEFT JOIN individu fir ON fir.id = f.responsable_id

         LEFT JOIN individu sir ON sir.id = sess.responsable_id

doc/release-notes/v9/9.4.0/03_formation.sql

0 → 100644
+66 −0
Original line number Diff line number Diff line 
--

-- 9.4.0

--



-- modif vue extraction



drop view if exists v_formation_export ;

create or replace view v_formation_export as

SELECT m.libelle as module_libelle,

       f.id AS formation_id,

       f.libelle AS formation_titre,

       sess.id AS session_id,

       ( SELECT string_agg((if.nom_patronymique::text || ' '::text) || if.prenom1::text, ','::text || chr(10)) AS string_agg

         FROM formation_formateur ff

                  JOIN individu if ON if.id = ff.individu_id

         WHERE ff.histo_destruction IS NULL AND sess.id = ff.session_id) AS session_intervenants,

       sess.modalite AS session_modalite,

       sess.type AS session_type,

       ( SELECT string_agg(COALESCE(fsvs.sigle, fsvs.code)::text, ','::text || chr(10)) AS string_agg

         FROM formation_session_structure_valide fsv

                  JOIN structure fsvs ON fsv.structure_id = fsvs.id

         WHERE sess.id = fsv.session_id AND fsv.histo_destruction IS NULL) AS session_structures_valides,

       ssr.sigle AS session_etab_orga,

       COALESCE((sir.nom_patronymique::text || ' '::text) || sir.prenom1::text, (fir.nom_patronymique::text || ' '::text) || fir.prenom1::text) AS session_responsable,

       ( SELECT count(fi.id) AS count

         FROM formation_inscription fi

         WHERE sess.id = fi.session_id AND fi.histo_destruction IS NULL AND fi.liste IS NULL) AS session_nb_nonclasses,

       ( SELECT count(fi.id) AS count

         FROM formation_inscription fi

         WHERE sess.id = fi.session_id AND fi.histo_destruction IS NULL AND fi.liste::text = 'P'::text) AS session_nb_liste_princ,

       ( SELECT count(fi.id) AS count

         FROM formation_inscription fi

         WHERE sess.id = fi.session_id AND fi.histo_destruction IS NULL AND fi.liste::text = 'C'::text) AS session_nb_liste_compl,

       sea.id AS seance_id,

       EXTRACT(year FROM sea.debut) AS seance_annee_debut,

       to_char(sea.debut, 'DD/MM/YYYY HH24:MI'::text) AS seance_debut,

       to_char(sea.fin, 'DD/MM/YYYY HH24:MI'::text) AS seance_fin,

       date_part('hour'::text, sea.fin - sea.debut) + date_part('min'::text, sea.fin - sea.debut) / 60::double precision AS seance_nb_h,

       ( SELECT count(fp.id) AS count

         FROM formation_presence fp

         WHERE fp.seance_id = sea.id AND fp.histo_destruction IS NULL AND fp.temoin::text = 'O'::text) AS seance_nb_presents,

       (( SELECT count(fi.id) AS count

          FROM formation_inscription fi

          WHERE sess.id = fi.session_id AND fi.histo_destruction IS NULL AND fi.liste::text = 'P'::text)) - (( SELECT count(fp.id) AS count

                                                                                                               FROM formation_presence fp

                                                                                                               WHERE sea.id = fp.seance_id AND fp.histo_destruction IS NULL AND fp.temoin::text = 'O'::text)) AS seance_nb_absents,

       ( SELECT string_agg(tmp.str, ','::text || chr(10)) AS string_agg

         FROM ( SELECT (des.sigle::text || ':'::text) || count(*) AS str

                FROM formation_presence fp

                         JOIN formation_inscription fi ON fp.inscription_id = fi.id AND fi.histo_destruction IS NULL

                         JOIN doctorant d ON fi.doctorant_id = d.id

                         JOIN etablissement de ON d.etablissement_id = de.id

                         JOIN structure des ON de.structure_id = des.id

                WHERE fp.temoin::text = 'O'::text AND fp.seance_id = sea.id

                GROUP BY des.sigle, fp.temoin

                ORDER BY des.sigle) tmp) AS seance_nb_presents_etab

FROM formation_seance sea

         JOIN formation_session sess ON sea.session_id = sess.id AND sess.histo_destruction IS NULL

         JOIN formation_formation f ON sess.formation_id = f.id AND f.histo_destruction IS NULL

         JOIN formation_module m ON m.id = f.module_id AND m.histo_destruction IS NULL

         JOIN structure ssr ON ssr.id = sess.site_id

         LEFT JOIN individu fir ON fir.id = f.responsable_id

         LEFT JOIN individu sir ON sir.id = sess.responsable_id

WHERE sea.histo_destruction IS NULL

--ORDER BY f.id desc, f.libelle, sea.debut

;

module/Formation/config/others/formation.config.php

+19 −19
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ return [ 
                'data_tabs' => [

                    FormationStatsXlsxExport::FORMATION_DATA_TAB => [

                        'view_name' => 'v_formation_export',

                        'view_columns' => 'formation_id	formation_titre	session_id	session_intervenants	session_modalite	session_type	session_structures_valides	session_etab_orga	session_responsable	session_nb_nonclasses	session_nb_liste_princ	session_nb_liste_compl	seance_id	seance_annee_debut	seance_debut	seance_fin	seance_nb_h	seance_nb_presents	seance_nb_absents	seance_nb_presents_etab',

                        'view_columns' => 'module_libelle formation_id	formation_titre	session_id	session_intervenants	session_modalite	session_type	session_structures_valides	session_etab_orga	session_responsable	session_nb_nonclasses	session_nb_liste_princ	session_nb_liste_compl	seance_id	seance_annee_debut	seance_debut	seance_fin	seance_nb_h	seance_nb_presents	seance_nb_absents	seance_nb_presents_etab',

                    ],

                    FormationStatsXlsxExport::ENQUETE_DATA_TAB => [

                        'view_name' => 'v_formation_enquete_export',
@@ -54,24 +54,24 @@ return [ 
        ],

    ],



    'xlsx_exports' => [

        FormationStatsXlsxExport::class => [

            'factory' => FormationStatsXlsxExportFactory::class,

            'alias' => FormationStatsXlsxExport::CODE,

            'writer_class' => ExcelDataTablesXlsxWriter::class,

            'input_file_path' => __DIR__ . '/../../resources/formation_stats_export.xlsx',

            'data_tabs' => [

                FormationStatsXlsxExport::FORMATION_DATA_TAB => [

                    'view_name' => 'v_formation_export',

                    'view_columns' => 'formation_id	formation_titre	session_id	session_intervenants	session_modalite	session_type	session_structures_valides	session_etab_orga	session_responsable	session_nb_nonclasses	session_nb_liste_princ	session_nb_liste_compl	seance_id	seance_annee_debut	seance_debut	seance_fin	seance_nb_h	seance_nb_presents	seance_nb_absents	seance_nb_presents_etab',

                ],

                FormationStatsXlsxExport::ENQUETE_DATA_TAB => [

                    'view_name' => 'v_formation_enquete_export',

                    'view_columns' => 'formation_id	formation_libelle	session_id	question_categorie	question_libelle	reponse_niveau	reponse_commentaire	reponse_date',

                ],

            ],

        ],

    ],

//    'xlsx_exports' => [

//        FormationStatsXlsxExport::class => [

//            'factory' => FormationStatsXlsxExportFactory::class,

//            'alias' => FormationStatsXlsxExport::CODE,

//            'writer_class' => ExcelDataTablesXlsxWriter::class,

//            'input_file_path' => __DIR__ . '/../../resources/formation_stats_export.xlsx',

//            'data_tabs' => [

//                FormationStatsXlsxExport::FORMATION_DATA_TAB => [

//                    'view_name' => 'v_formation_export',

//                    'view_columns' => 'formation_id	formation_titre	session_id	session_intervenants	session_modalite	session_type	session_structures_valides	session_etab_orga	session_responsable	session_nb_nonclasses	session_nb_liste_princ	session_nb_liste_compl	seance_id	seance_annee_debut	seance_debut	seance_fin	seance_nb_h	seance_nb_presents	seance_nb_absents	seance_nb_presents_etab',

//                ],

//                FormationStatsXlsxExport::ENQUETE_DATA_TAB => [

//                    'view_name' => 'v_formation_enquete_export',

//                    'view_columns' => 'formation_id	formation_libelle	session_id	question_categorie	question_libelle	reponse_niveau	reponse_commentaire	reponse_date',

//                ],

//            ],

//        ],

//    ],



    'bjyauthorize' => [

        'rule_providers' => [

module/Formation/src/Formation/Controller/Recherche/FormationRechercheController.php

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ class FormationRechercheController extends AbstractRechercheController 
        }



        $export->setContext($context);

        //$export->exportToFile(sys_get_temp_dir().'/formation.xlsx');

        $export->exportToClient();

        exit(0);

    }