Commit a1f86e9d authored by Florian Joriot's avatar Florian Joriot
Browse files

Correction du calcul des heures de formations dans le contrat

(cherry picked from commit c48d6022)
parent 78d05ffe
Loading
Loading
Loading
Loading
+4 −0
Changes for data/ddl/view/V_TBL_CONTRAT_VOLUME_HORAIRE.sql: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ SELECT
  CASE WHEN ti.code NOT IN ('CM','TD','TP') THEN vh.heures ELSE 0 END             autres,
  vh.heures                                                                       heures,
  frv.total                                                                       hetd,
  0.0                                                                             heures_formation,

  CASE WHEN ti.code NOT IN ('CM', 'TD', 'TP') THEN ti.code ELSE NULL END          autre_libelle,
  null                                                                            type_mission_libelle,
@@ -79,6 +80,7 @@ SELECT
  CASE WHEN ti.code NOT IN ('CM','TD','TP') THEN vh.heures ELSE 0 END             autres,
  vh.heures                                                                       heures,
  frv.total                                                                       hetd,
  0.0                                                                             heures_formation,

  CASE WHEN ti.code NOT IN ('CM', 'TD', 'TP') THEN ti.code ELSE NULL END          autre_libelle,
  null                                                                            type_mission_libelle,
@@ -131,6 +133,7 @@ SELECT
  vhr.heures                                                                      autres,
  vhr.heures                                                                      heures,
  frvr.total                                                                      hetd,
  0.0                                                                             heures_formation,

  fon_ref.libelle_long                                                            autre_libelle,
  null                                                                            type_mission_libelle,
@@ -183,6 +186,7 @@ SELECT
  vhm.heures                                                                      autres,
  vhm.heures                                                                      heures,
  vhm.heures                                                                      hetd,
  m.heures_formation                                                              heures_formation,

  CASE WHEN
    m.libelle_mission IS NOT NULL
+3 −0
Changes for module/Contrat/src/Tbl/Process/ContratProcess.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -292,6 +292,7 @@ class ContratProcess implements ProcessInterface
        $vh->autreLibelle           = $data['autre_libelle'];
        $vh->missionLibelle         = $data['mission_libelle'];
        $vh->typeMissionLibelle     = $data['type_mission_libelle'];
        $vh->heuresFormation        = (float)$data['heures_formation'];
    }


@@ -826,6 +827,7 @@ class ContratProcess implements ProcessInterface

        //On ajoute les heures du contrat pour lequel on cherche
        foreach ($contrat->volumesHoraires as $vh) {
            $contrat->heuresFormation[$vh->missionId] = $vh->heuresFormation;
            $totalHeures += $vh->heures;
        }

@@ -1056,6 +1058,7 @@ class ContratProcess implements ProcessInterface
            'volume_horaire_id'         => $vh->volumeHoraireId,
            'volume_horaire_mission_id' => $vh->volumeHoraireMissionId,
            'volume_horaire_ref_id'     => $vh->volumeHoraireRefId,
            'total_heures_formation'    => array_sum($contrat->heuresFormation),
        ];

        return $data;
+2 −0
Changes for module/Contrat/src/Tbl/Process/Model/Contrat.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ class Contrat
    public ?string    $missionsLibelles     = null;
    public ?string    $typesMissionLibelles = null;

    public array      $heuresFormation = [];

    /** @var VolumeHoraire[] */
    public array $volumesHoraires = [];
    public float $totalHeures     = 0.0;
+1 −0
Changes for module/Contrat/src/Tbl/Process/Model/VolumeHoraire.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ class VolumeHoraire
    public ?string    $autreLibelle           = null;
    public ?string    $missionLibelle         = null;
    public ?string    $typeMissionLibelle     = null;
    public float      $heuresFormation        = 0.0;