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

Merge branch 'b19' of https://git.unicaen.fr/open-source/OSE into b19

parents 4fa6657d 94171b8d

admin/actions/maj-taux-hetd-2022-07.php

+9 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ $bdd->exec($isql); 


$vreps = [

    'V_CONTRAT_MAIN'                => [

        'taux_horaire_hetd( +)th[\n\( ._,a-zA-Z]*' => "taux_horaire_hetd    th ON th.valeur = OSE_FORMULE.GET_TAUX_HORAIRE_HETD(a.date_debut",

        'left join taux_horaire_hetd( +)th[\n\(\= ._,a-zA-Z]*' => "LEFT JOIN taux_horaire_hetd    th ON th.valeur = OSE_FORMULE.GET_TAUX_HORAIRE_HETD(a.date_debut",

        'th.histo_creation'                        => 'th.histo_modification',

    ],

    'V_ETAT_PAIEMENT'               => [
@@ -56,14 +56,19 @@ $vreps = [ 
$dir   = '/app/data/ddl/view/';



foreach ($vreps as $view => $reps) {

    $c->msg('Mise à jour de la vue ' . $view);



    $vcm = $bdd->view()->get($view);



    $count = 0;

    if (isset($vcm[$view]['definition'])) {

        $vcm = $vcm[$view]['definition'];

        foreach ($reps as $s => $r) {

            $vcm = preg_replace('/' . $s . '/si', $r, $vcm);

            $cnt = 0;

            $vcm = preg_replace('/' . $s . '/si', $r, $vcm, -1, $cnt);

            $count += $cnt;

        }



        $c->msg('Mise à jour de la vue ' . $view.' : '.$count.' modification(s) apportée(s)');

        $bdd->exec($vcm);

    }

}

data/ddl/package/FORMULE_POITIERS_2021/body.sql

+4 −4
Original line number Diff line number Diff line
@@ -288,9 +288,9 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_POITIERS_2021 AS 






      -- AN=IF(AND([.$E20]="Oui";[.$I20]<>"Référentiel";[.$I20]<>"ETD";[.$G20]=1;OR([.$A20]="I2000";[.$A20]="I2300"));[.$N20]*[.$AE20];0)

      -- AN=IF(AND([.$E20]="Oui";[.$I20]<>"Référentiel";[.$I20]<>"ETD";NOT(AND([.$G20]=1;OR([.$A20]="I2000";[.$A20]="I2300"))));[.$N20]*[.$AE20];0)

      WHEN 'AN' THEN

        IF vh.service_statutaire AND vh.volume_horaire_ref_id IS NULL AND vh.type_intervention_code <> 'ETD' AND vh.taux_fa = 1 AND (vh.structure_code = 'I2000' OR vh.structure_code = 'I2300') THEN

        IF vh.service_statutaire AND vh.volume_horaire_ref_id IS NULL AND vh.type_intervention_code <> 'ETD' AND NOT(vh.taux_fa = 1 AND (vh.structure_code = 'I2000' OR vh.structure_code = 'I2300')) THEN

          RETURN vh.heures * cell('AE',l);

        ELSE

          RETURN 0;
@@ -352,9 +352,9 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_POITIERS_2021 AS 






      -- AT=IF(AND([.$E20]="Oui";[.$I20]<>"Référentiel";[.$I20]<>"ETD";NOT(AND([.$G20]=1;OR([.$A20]="I2000";[.$A20]="I2300"))));[.$N20]*[.$AE20];0)

      -- AT=IF(AND([.$E20]="Oui";[.$I20]<>"Référentiel";[.$I20]<>"ETD";[.$G20]=1;OR([.$A20]="I2000";[.$A20]="I2300"));[.$N20]*[.$AE20];0)

      WHEN 'AT' THEN

        IF vh.service_statutaire AND vh.volume_horaire_ref_id IS NULL AND vh.type_intervention_code <> 'ETD' AND NOT(vh.taux_fa = 1 AND (vh.structure_code = 'I2000' OR vh.structure_code = 'I2300')) THEN

        IF vh.service_statutaire AND vh.volume_horaire_ref_id IS NULL AND vh.type_intervention_code <> 'ETD' AND vh.taux_fa = 1 AND (vh.structure_code = 'I2000' OR vh.structure_code = 'I2300') THEN

          RETURN vh.heures * cell('AE',l);

        ELSE

          RETURN 0;