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

Corrections reconduction centre de coût

parent dc1df3c5

data/ddl.php

+64 −22
Original line number Diff line number Diff line
@@ -13382,6 +13382,17 @@ 
          'default' => '0',

          'commentaire' => NULL,

        ),

        'ANNEE_AGREMENT' => 

        array (

          'name' => 'ANNEE_AGREMENT',

          'type' => 'NUMBER',

          'length' => 0,

          'scale' => NULL,

          'precision' => NULL,

          'nullable' => true,

          'default' => NULL,

          'commentaire' => NULL,

        ),

      ),

    ),

    'TBL_CHARGENS' =>
@@ -16055,17 +16066,6 @@ 
          'default' => NULL,

          'commentaire' => NULL,

        ),

        'PREMIER_RECRUTEMENT' =>

        array (

          'name' => 'PREMIER_RECRUTEMENT',

          'type' => 'NUMBER',

          'length' => 0,

          'scale' => '0',

          'precision' => 1,

          'nullable' => true,

          'default' => NULL,

          'commentaire' => NULL,

        ),

        'HISTO_CREATION' => 

        array (

          'name' => 'HISTO_CREATION',
@@ -16132,6 +16132,17 @@ 
          'default' => NULL,

          'commentaire' => NULL,

        ),

        'PREMIER_RECRUTEMENT' => 

        array (

          'name' => 'PREMIER_RECRUTEMENT',

          'type' => 'NUMBER',

          'length' => 0,

          'scale' => '0',

          'precision' => 1,

          'nullable' => true,

          'default' => NULL,

          'commentaire' => NULL,

        ),

      ),

    ),

    'TYPE_CONTRAT' =>
@@ -31541,6 +31552,36 @@ END UNICAEN_TBL;', 
  ),

  'BddAdmin\\Ddl\\DdlView' => 

  array (

    'NEWVIEW' => 

    array (

      'name' => 'NEWVIEW',

      'definition' => 'CREATE OR REPLACE FORCE VIEW NEWVIEW AS

WITH t AS (

SELECT

  e.id                etape_id,

  ep.id               element_pedagogique_id,

  ccep.centre_cout_id centre_cout_id,

  ccep.type_heures_id type_heures_id,

  ep.annee_id         annee_id,

  ep.code             code

FROM

  etape                     e

  JOIN source               s ON s.importable = 0

  JOIN element_pedagogique ep ON ep.etape_id = e.id AND ep.histo_destruction IS NULL

  JOIN centre_cout_ep    ccep ON ccep.element_pedagogique_id = ep.id AND ccep.histo_destruction IS NULL AND ccep.source_id = s.id

WHERE

  e.histo_destruction IS NULL

)

SELECT

  t."ETAPE_ID",t."ELEMENT_PEDAGOGIQUE_ID",t."CENTRE_COUT_ID",t."TYPE_HEURES_ID",t."ANNEE_ID",t."CODE",

  ep.id new_element_pedagogique_id,

  ccep.id new_centre_cout_ep_id,

  ccep.histo_destruction

FROM

  t

  JOIN element_pedagogique ep ON ep.annee_id = t.annee_id + 1 AND ep.code = t.code AND ep.histo_destruction IS NULL

  LEFT JOIN centre_cout_ep ccep ON ccep.element_pedagogique_id = ep.id AND ccep.centre_cout_id = t.centre_cout_id AND ccep.type_heures_id = t.type_heures_id',

    ),

    'V_AGREMENT_EXPORT_CSV' => 

    array (

      'name' => 'V_AGREMENT_EXPORT_CSV',
@@ -35804,6 +35845,7 @@ SELECT 
  e.code              etape_code,

  ep.id               element_pedagogique_id,

  ccep.centre_cout_id centre_cout_id,

  em.id				  element_modulateur_id,

  em.MODULATEUR_ID    modulateur_id,

  ccep.type_heures_id type_heures_id,

  ep.annee_id         annee_id,
@@ -35813,12 +35855,12 @@ FROM 
  JOIN source               s ON s.importable = 0

  JOIN element_pedagogique ep ON ep.etape_id = e.id AND ep.histo_destruction IS NULL

  LEFT JOIN centre_cout_ep    ccep ON ccep.element_pedagogique_id = ep.id AND ccep.histo_destruction IS NULL AND ccep.source_id = s.id

  LEFT JOIN ELEMENT_MODULATEUR em ON em.ELEMENT_ID = ep.ID

  LEFT JOIN ELEMENT_MODULATEUR em ON em.ELEMENT_ID = ep.ID AND em.HISTO_DESTRUCTION  IS NULL

WHERE

  e.histo_destruction IS NULL

)

SELECT

  t."ETAPE_ID",t."ETAPE_LIBELLE", t."ETAPE_CODE", t."ELEMENT_PEDAGOGIQUE_ID",t."CENTRE_COUT_ID", t.modulateur_id, t."TYPE_HEURES_ID",t."ANNEE_ID",t."CODE",

  t."ETAPE_ID",t."ETAPE_LIBELLE", t."ETAPE_CODE", t."ELEMENT_PEDAGOGIQUE_ID",t."CENTRE_COUT_ID", t."ELEMENT_MODULATEUR_ID",t."MODULATEUR_ID", t."TYPE_HEURES_ID",t."ANNEE_ID",t."CODE",

  ep.id new_element_pedagogique_id,

  ccep.id new_centre_cout_ep_id,

  em.id new_element_modulateur_id
@@ -35826,7 +35868,7 @@ FROM 
  t

  LEFT JOIN element_pedagogique ep ON ep.annee_id = t.annee_id + 1 AND ep.code = t.code AND ep.histo_destruction IS NULL

  LEFT JOIN centre_cout_ep ccep ON ccep.element_pedagogique_id = ep.id AND ccep.centre_cout_id = t.centre_cout_id AND ccep.type_heures_id = t.type_heures_id

  LEFT JOIN ELEMENT_MODULATEUR em ON em.ELEMENT_ID = ep.ID',

  LEFT JOIN ELEMENT_MODULATEUR em ON em.ELEMENT_ID = ep.ID AND em.HISTO_DESTRUCTION  IS NULL',

    ),

    'V_REF_INTERVENANT' => 

    array (

module/Application/view/application/offre-formation/reconduction-centre-cout.phtml

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ echo $this->messenger()->addCurrentMessagesFromFlashMessenger()->addMessagesFrom 
                    </td>

                    <td><?= $er['ETAPE_CODE']; ?></td>

                    <td><?= $er['ETAPE_LIBELLE']; ?></td>

                    <td><?= ($er['NB_EP_TYPE_HEURE']-$er['NB_CC_EP'] == 0)?'Aucun centre de coût à reconduire':$er['NB_EP']-$er['NB_CC_EP']; ?></td>

                    <td><?= ($er['NB_EP_TYPE_HEURE']-$er['NB_CC_EP'] <= 0)?'Aucun centre de coût à reconduire':$er['NB_EP_TYPE_HEURE']-$er['NB_CC_EP']; ?></td>

                </tr>

            <?php endforeach; ?>

            </tbody>