Commit 5494deb9 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Gestion des formules obsolètes (inactives) 

petites améliorations
parent d3f42790

admin/src/DataGen.php

+1 −2
Changes for admin/src/DataGen.php: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -595,8 +595,7 @@ class DataGen 
        $formules = [];

        foreach ($data as $id => $formule) {

            $formule['ID'] = $id;

            if (!isset($formule['INTERVENANT_QUERY'])) $formule['INTERVENANT_QUERY'] = null;

            if (!isset($formule['VOLUME_HORAIRE_QUERY'])) $formule['VOLUME_HORAIRE_QUERY'] = null;

            if (!isset($formule['ACTIVE'])) $formule['ACTIVE'] = true;

            for ($i = 1; $i < 6; $i++) {

                if (!isset($formule['I_PARAM_' . $i . '_LIBELLE'])) $formule['I_PARAM_' . $i . '_LIBELLE'] = null;

                if (!isset($formule['VH_PARAM_' . $i . '_LIBELLE'])) $formule['VH_PARAM_' . $i . '_LIBELLE'] = null;

data/ddl/package/OSE_FORMULE/body.sql

+3 −4
Changes for data/ddl/package/OSE_FORMULE/body.sql: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ CREATE OR REPLACE PACKAGE BODY "OSE_FORMULE" AS 
        LOOP EXIT WHEN etat_volume_horaire_id IS NULL;

          intervenant.etat_volume_horaire_id := etat_volume_horaire_id;

          volumes_horaires := all_volumes_horaires(intervenant.id)(type_volume_horaire_id)(etat_volume_horaire_id);

          EXECUTE IMMEDIATE 'BEGIN ' || formule_definition.package_name || '.' || formule_definition.procedure_name || '; END;';

          EXECUTE IMMEDIATE 'BEGIN ' || formule_definition.package_name || '.CALCUL_RESULTAT; END;';

          all_volumes_horaires(intervenant.id)(type_volume_horaire_id)(etat_volume_horaire_id) := volumes_horaires;

          etat_volume_horaire_id := all_volumes_horaires(intervenant.id)(type_volume_horaire_id).NEXT(etat_volume_horaire_id);

        END LOOP;
@@ -843,13 +843,12 @@ CREATE OR REPLACE PACKAGE BODY "OSE_FORMULE" AS 




  PROCEDURE TEST( INTERVENANT_TEST_ID NUMERIC ) IS

    procedure_name VARCHAR2(30);

    package_name VARCHAR2(30);

  BEGIN

    intervenant.id := INTERVENANT_TEST_ID;



    SELECT

      package_name, procedure_name INTO package_name, procedure_name

      package_name INTO package_name

    FROM

      formule f JOIN formule_test_intervenant fti ON fti.formule_id = f.id

    WHERE
@@ -860,7 +859,7 @@ CREATE OR REPLACE PACKAGE BODY "OSE_FORMULE" AS 
    debug_actif := TRUE;



    BEGIN

      EXECUTE IMMEDIATE 'BEGIN ' || package_name || '.' || procedure_name || '; END;';

      EXECUTE IMMEDIATE 'BEGIN ' || package_name || '.CALCUL_RESULTAT; END;';

      SAVE_TO_TEST(1);

    EXCEPTION WHEN OTHERS THEN

      SAVE_TO_TEST(0);

data/ddl/table/FORMULE.php

+12 −12
Changes for data/ddl/table/FORMULE.php: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,18 @@ return [ 
    'commentaire' => NULL,

    'sequence'    => NULL,

    'columns'     => [

        'ACTIVE'             => [

            'name'        => 'ACTIVE',

            'type'        => 'bool',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => '0',

            'precision'   => 1,

            'nullable'    => FALSE,

            'default'     => '1',

            'position'    => 4,

            'commentaire' => 'Témoin (1=sélectionnable)',

        ],

        'ID'                 => [

            'name'        => 'ID',

            'type'        => 'int',
@@ -105,18 +117,6 @@ return [ 
            'position'    => 3,

            'commentaire' => NULL,

        ],

        'PROCEDURE_NAME'     => [

            'name'        => 'PROCEDURE_NAME',

            'type'        => 'string',

            'bdd-type'    => 'VARCHAR2',

            'length'      => 30,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => FALSE,

            'default'     => NULL,

            'position'    => 4,

            'commentaire' => NULL,

        ],

        'VH_PARAM_1_LIBELLE' => [

            'name'        => 'VH_PARAM_1_LIBELLE',

            'type'        => 'string',

data/ddl_columns_pos.php

+1 −1
Changes for data/ddl_columns_pos.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ return [ 
        'ID',

        'LIBELLE',

        'PACKAGE_NAME',

        'PROCEDURE_NAME',

        'ACTIVE',

        'I_PARAM_1_LIBELLE',

        'I_PARAM_2_LIBELLE',

        'I_PARAM_3_LIBELLE',

data/formules.php

+1 −0
Changes for data/formules.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ return [ 
    1  => [

        'LIBELLE'      => 'Université de Caen (version 2016)',

        'PACKAGE_NAME' => 'FORMULE_UNICAEN_2016',

        'ACTIVE'       => false,

    ],

    2  => [

        'LIBELLE'      => 'Université de Montpellier',