Commit 5d15f2a2 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/master'

parents f6681a6e 9b40b46f

data/Etats de sortie/export_services_csv.php

+2 −6
Original line number Diff line number Diff line
@@ -116,12 +116,8 @@ foreach ($data as $d) { 
        'date-cloture-service-realise' => $d['DATE_CLOTURE_REALISE'],

    ];



    if (

        $ds['heures-service-statutaire'] > 0

        && $ds['heures-service-statutaire'] + $ds['heures-service-du-modifie'] == 0

        && empty($ds['etape-code'])

    ) {

        $ds['__total__']++; // pour que le cas spécifique des décharges totales soit pris en compte

    if ($ds['heures-service-du-modifie'] != 0) {

        $ds['__total__']++; // pour que les modifs de service apparaissent

    }



    if ($d['TYPE_INTERVENTION_ID'] != null) {

data/ddl/view/V_EXPORT_SERVICE.sql

+6 −7
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ SELECT 
  0                                 heures_compl_fc_majorees,

  NULL                              heures_compl_referentiel,

  0                                 total,

  0                                 solde,

  si.service_statutaire + SUM(msd.heures * mms.multiplicateur) solde,

  NULL                              service_ref_formation,

  NULL                              commentaires

FROM
@@ -172,16 +172,15 @@ FROM 
  JOIN statut               si ON si.id = i.statut_id

  JOIN etat_volume_horaire evh ON evh.code IN ('saisi','valide')

  JOIN type_volume_horaire tvh ON tvh.code IN ('PREVU','REALISE')

  LEFT JOIN modification_service_du msd ON msd.intervenant_id = i.id AND msd.histo_destruction IS NULL

  LEFT JOIN motif_modification_service mms ON mms.id = msd.motif_id

  JOIN modification_service_du msd ON msd.intervenant_id = i.id AND msd.histo_destruction IS NULL

  JOIN motif_modification_service mms ON mms.id = msd.motif_id

  LEFT JOIN formule_resultat fr ON fr.intervenant_id = i.id AND fr.type_volume_horaire_id = tvh.id AND fr.etat_volume_horaire_id = evh.id

WHERE

  i.histo_destruction IS NULL

  AND si.service_statutaire > 0

  AND COALESCE(fr.total,0) = 0

  AND msd.heures <> 0

GROUP BY

  i.id, si.service_statutaire, evh.id, tvh.id

HAVING

  si.service_statutaire + SUM(msd.heures * mms.multiplicateur) = 0





), ponds AS (

SELECT