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

Merge branch 'b24'

parents 6b68af61 b416484f
Loading
Loading
Loading
Loading
+5 −1
Changes for data/ddl/view/V_EXPORT_SERVICE.sql: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ WITH t AS ( SELECT
  vh.type_volume_horaire_id         type_volume_horaire_id,
  fr.etat_volume_horaire_id         etat_volume_horaire_id,
  s.element_pedagogique_id          element_pedagogique_id,
  s.etape_id                        etape_id,
  s.etablissement_id                etablissement_id,
  NULL                              structure_aff_id,
  NULL                              structure_ens_id,
@@ -52,6 +53,7 @@ SELECT
  vh.type_volume_horaire_id         type_volume_horaire_id,
  vhe.etat_volume_horaire_id        etat_volume_horaire_id,
  s.element_pedagogique_id          element_pedagogique_id,
  s.etape_id                        etape_id,
  s.etablissement_id                etablissement_id,
  NULL                              structure_aff_id,
  NULL                              structure_ens_id,
@@ -102,6 +104,7 @@ SELECT
  fr.type_volume_horaire_id         type_volume_horaire_id,
  fr.etat_volume_horaire_id         etat_volume_horaire_id,
  NULL                              element_pedagogique_id,
  NULL                              etape_id,
  OSE_PARAMETRE.GET_ETABLISSEMENT   etablissement_id,
  NULL                              structure_aff_id,
  sr.structure_id                   structure_ens_id,
@@ -150,6 +153,7 @@ SELECT
  tvh.id                            type_volume_horaire_id,
  evh.id                            etat_volume_horaire_id,
  NULL                              element_pedagogique_id,
  NULL                              etape_id,
  OSE_PARAMETRE.GET_ETABLISSEMENT   etablissement_id,
  NULL                              structure_aff_id,
  NULL                              structure_ens_id,
@@ -311,7 +315,7 @@ FROM
  LEFT JOIN STRUCTURE                  sens ON sens.id  = NVL(t.structure_ens_id, ep.structure_id)
  LEFT JOIN periode                       p ON p.id     = t.periode_id
  LEFT JOIN SOURCE                      src ON src.id   = ep.source_id OR (ep.source_id IS NULL AND src.code = 'OSE')
  LEFT JOIN etape                       etp ON etp.id   = ep.etape_id
  LEFT JOIN etape                       etp ON etp.id   = CASE WHEN t.etape_id IS NOT NULL THEN t.etape_id ELSE ep.etape_id END
  LEFT JOIN type_formation               tf ON tf.id    = etp.type_formation_id AND tf.histo_destruction IS NULL
  LEFT JOIN groupe_type_formation       gtf ON gtf.id   = tf.groupe_id AND gtf.histo_destruction IS NULL
  LEFT JOIN v_formule_intervenant        fi ON fi.intervenant_id = i.id
+2 −2
Changes for data/ddl/view/V_TBL_CONTRAT_VOLUME_HORAIRE.sql: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ SELECT
  NULL                                                                            volume_horaire_ref_id,
  vhm.id                                                                          volume_horaire_mission_id,

  tm.taux_remu_id                                                                 taux_remu_id,
  tm.taux_remu_majore_id                                                          taux_remu_majore_id,
  m.taux_remu_id                                                                 taux_remu_id,
  m.taux_remu_majore_id                                                          taux_remu_majore_id,

  m.date_fin                                                                      date_fin_mission,
  m.date_debut                                                                    date_debut_mission,
+2 −2
Changes for module/Administration/src/Migration/v24ParametresAnnualises.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ class v24ParametresAnnualises extends MigrationAction

    public function utile(): bool
    {
        $param = $this->getBdd()->select($this->sql());
        $param = $this->getBdd()->selectOne($this->sql());
        if (empty($param)) {
            return false;
        } else {
@@ -38,7 +38,7 @@ class v24ParametresAnnualises extends MigrationAction
            while ($d = $stmt->next()) {

                $tableName = $d['TABLE_NAME'];
                $data      = ['HISTO_MODIFICATION' => null];
                $data      = ['HISTO_MODIFICATEUR_ID' => null];
                $key       = ['ID' => (int)$d['ID']];

                $this->getBdd()->getTable($tableName)->update($data, $key);
+5 −3
Changes for module/Contrat/view/contrat/contrat/partial/contrat-heures.phtml: 5 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -53,12 +53,14 @@ foreach ($vhs as $vh) {
        if (!empty($vh->getService()->getElementPedagogique())) {
            $epId    = $vh->getService()->getElementPedagogique()->getId();
            $periode = $vh->getVolumeHoraire()->getPeriode() ? $vh->getVolumeHoraire()->getPeriode()->getCode() : 'N/A';
            $service = $vh->getService();
            $etape = ($service->getEtape()) ?? $service->getElementPedagogique()->getEtape();

            if (!isset($enseignements[$periode][$epId])) {
                $enseignements[$periode][$epId] = [
                        'etapeId'                   => $vh->getService()->getElementPedagogique()->getEtape()->getId(),
                        'etapeLibelle'              => $vh->getService()->getElementPedagogique()->getEtape()->getLibelle(),
                        'etapeCode'                 => $vh->getService()->getElementPedagogique()->getEtape()->getCode(),
                    'etapeId'                   => $etape->getId(),
                    'etapeLibelle'              => $etape->getLibelle(),
                    'etapeCode'                 => $etape->getCode(),
                    'periode'                   => $periode,
                    'elementPedagogiqueId'      => $vh->getService()->getElementPedagogique()->getId(),
                    'elementPedagogiqueLibelle' => $vh->getService()->getElementPedagogique()->getLibelle(),
+15 −0
Changes for module/Enseignement/src/Controller/EnseignementController.php: 15 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -184,8 +184,14 @@ class EnseignementController extends AbstractController

        $form->get('service')->setIntervenant($intervenant);
        $form->get('service')->removeUnusedElements();
        //On set l'étape du service si elle a été renseigné sinon par défaut cela prendra
        //l'étape porteuse de l'élément pédagogique
        if ($service->getEtape()) {
            $form->get('service')->get('element-pedagogique')->get('etape')->setValue($service->getEtape()->getId());
        }
        $hDeb    = $service->getVolumeHoraireListe()->getHeures();
        $request = $this->getRequest();

        if ($request->isPost()) {
            $form->setData($request->getPost());
            if ($form->isValid()) {
@@ -196,6 +202,15 @@ class EnseignementController extends AbstractController
                    $this->getProcessusPlafond()->beginTransaction();
                    try {
                        $this->em()->getConnection()->setAutoCommit(true);
                        //Récupération de l'id de l'étape qui a été selectionné pour la recherche de la formation
                        $etapeId = $form->get('service')
                            ->get('element-pedagogique')
                            ->get('etape')
                            ->getValue();

                        $etape   = $etapeId ? $this->getServiceEtape()->get($etapeId) : null;
                        $service = $service->setEtape($etape);

                        $service = $this->getServiceService()->save($service);
                        $this->em()->getConnection()->setAutoCommit(false);
                        $saved   = $service;
Loading