Skip to content
Snippets Groups Projects
Commit d2acfb6e authored by joriot221's avatar joriot221
Browse files

Merge remote-tracking branch 'origin/master'

parents 0c20ebad 969bf025
Branches
Tags
No related merge requests found
...@@ -14,6 +14,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS ...@@ -14,6 +14,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS
TYPE t_colls IS TABLE OF t_coll INDEX BY VARCHAR2(50); TYPE t_colls IS TABLE OF t_coll INDEX BY VARCHAR2(50);
feuille t_colls; feuille t_colls;
debugActif BOOLEAN DEFAULT TRUE;
debugLine NUMERIC; debugLine NUMERIC;
...@@ -64,7 +65,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS ...@@ -64,7 +65,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS
feuille(c).cells(l).enCalcul := true; feuille(c).cells(l).enCalcul := true;
val := calcCell( c, l ); val := calcCell( c, l );
IF ose_formule.debug_actif THEN IF debugActif THEN
dbgCell( c, l, val ); dbgCell( c, l, val );
END IF; END IF;
feuille(c).cells(l).valeur := val; feuille(c).cells(l).valeur := val;
...@@ -113,7 +114,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS ...@@ -113,7 +114,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS
ELSE ELSE
raise_application_error( -20001, 'La formule "' || fncName || '" n''existe pas!'); raise_application_error( -20001, 'La formule "' || fncName || '" n''existe pas!');
END CASE; END CASE;
IF ose_formule.debug_actif THEN IF debugActif THEN
dbgCalc(fncName, c, val ); dbgCalc(fncName, c, val );
END IF; END IF;
feuille('__' || fncName || '__' || c || '__').cells(1).valeur := val; feuille('__' || fncName || '__' || c || '__').cells(1).valeur := val;
...@@ -192,40 +193,14 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS ...@@ -192,40 +193,14 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS
-- =SI(I9=0;2/3;SI(I8="Oui";1 ;SI(SOMME(K26:K35)<=384;1;((384+((SOMME(K26:K35)-384)*(2/3)))/SOMME(K26:K35)))))
-- I8= TP vaut TD
-- I9 = i.heures_service_statutaire
-- I15 = i.service_du
-- I26:I35 = Somme des CM I=CM, J=TD, K=TP
-- K26:K35 = Somme des TP
WHEN c = 'tauxTPService' AND v >= 1 THEN
IF i.heures_service_statutaire = 0 OR LOWER(i.param_2)='oui' THEN
RETURN 2/3;
ELSE
-- SI(I8="Oui";SI(SOMME(I26:K35)=0;1;(2+(I15/((1,5*SOMME(I26:I35))+SOMME(J26:K35))))/3);SI(SOMME(K26:K35)<=384;1;((384+((SOMME(K26:K35)-384)*(2/3)))/SOMME(K26:K35))))
IF LOWER(i.param_1)='oui' THEN
RETURN 1;
ELSE
-- SI(SOMME(K26:K35)<=384;1;((384+((SOMME(K26:K35)-384)*(2/3)))/SOMME(K26:K35)))
IF cell('sTP') <= 384 THEN
RETURN 1;
ELSE
--(384+((SOMME(K26:K35)-384)*(2/3)))/SOMME(K26:K35)
RETURN (384+((cell('sTP')-384)*(2/3)))/cell('sTP');
END IF;
END IF;
END IF;
-- =SI(I9=0;2/3;SI(I8="Oui";SI(SOMME(I26:K35)=0;1;(2+(I15/((1,5*SOMME(I26:I35))+SOMME(J26:K35))))/3);SI(SOMME(K26:K35)<=384;1;((384+((SOMME(K26:K35)-384)*(2/3)))/SOMME(K26:K35))))) -- =SI(I9=0;2/3;SI(I8="Oui";SI(SOMME(I26:K35)=0;1;(2+(I15/((1,5*SOMME(I26:I35))+SOMME(J26:K35))))/3);SI(SOMME(K26:K35)<=384;1;((384+((SOMME(K26:K35)-384)*(2/3)))/SOMME(K26:K35)))))
-- I8= TP vaut TD -- I8= TP vaut TD
-- I9 = i.heures_service_statutaire -- I9 = i.heures_service_statutaire
-- I15 = i.service_du -- I15 = i.service_du
-- I26:I35 = Somme des CM I=CM, J=TD, K=TP -- I26:I35 = Somme des CM I=CM, J=TD, K=TP
-- K26:K35 = Somme des TP -- K26:K35 = Somme des TP
WHEN c = 'tauxTPCompl' AND v >= 1 THEN WHEN c = 'tauxTP' AND v >= 1 THEN
IF i.heures_service_statutaire = 0 OR LOWER(i.param_2)='oui' THEN IF i.heures_service_statutaire = 0 THEN
RETURN 2/3; RETURN 2/3;
ELSE ELSE
-- SI(I8="Oui";SI(SOMME(I26:K35)=0;1;(2+(I15/((1,5*SOMME(I26:I35))+SOMME(J26:K35))))/3);SI(SOMME(K26:K35)<=384;1;((384+((SOMME(K26:K35)-384)*(2/3)))/SOMME(K26:K35)))) -- SI(I8="Oui";SI(SOMME(I26:K35)=0;1;(2+(I15/((1,5*SOMME(I26:I35))+SOMME(J26:K35))))/3);SI(SOMME(K26:K35)<=384;1;((384+((SOMME(K26:K35)-384)*(2/3)))/SOMME(K26:K35))))
...@@ -252,7 +227,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS ...@@ -252,7 +227,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS
WHEN c = 'tauxServiceDu' AND v >= 1 THEN WHEN c = 'tauxServiceDu' AND v >= 1 THEN
IF vh.type_intervention_code = 'TP' THEN IF vh.type_intervention_code = 'TP' THEN
RETURN cell('tauxTPService'); RETURN cell('tauxTP');
ELSE ELSE
RETURN vh.taux_service_du; RETURN vh.taux_service_du;
END IF; END IF;
...@@ -261,7 +236,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS ...@@ -261,7 +236,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS
WHEN c = 'tauxServiceCompl' AND v >= 1 THEN WHEN c = 'tauxServiceCompl' AND v >= 1 THEN
IF vh.type_intervention_code = 'TP' THEN IF vh.type_intervention_code = 'TP' THEN
RETURN cell('tauxTPCompl'); RETURN cell('tauxTP');
ELSE ELSE
RETURN vh.taux_service_compl; RETURN vh.taux_service_compl;
END IF; END IF;
...@@ -879,11 +854,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS ...@@ -879,11 +854,7 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS
-- us=SI($I$13="Oui";SOMME(I182:AU182);0) -- us=SI($I$13="Oui";SOMME(I182:AU182);0)
WHEN c = 'us' AND v >= 1 THEN WHEN c = 'us' AND v >= 1 THEN
IF NOT ose_formule.intervenant.depassement_service_du_sans_hc THEN
RETURN cell('t131',l) + cell('t132',l); RETURN cell('t131',l) + cell('t132',l);
ELSE
RETURN 0;
END IF;
...@@ -943,10 +914,6 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS ...@@ -943,10 +914,6 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS
BEGIN BEGIN
feuille.delete; feuille.delete;
IF ose_formule.intervenant.depassement_service_du_sans_hc THEN -- HC traitées comme du service
ose_formule.intervenant.service_du := ose_formule.intervenant.heures_service_statutaire + ose_formule.intervenant.heures_service_modifie;
END IF;
-- transmission des résultats aux volumes horaires et volumes horaires référentiel -- transmission des résultats aux volumes horaires et volumes horaires référentiel
FOR l IN 1 .. ose_formule.volumes_horaires.length LOOP FOR l IN 1 .. ose_formule.volumes_horaires.length LOOP
ose_formule.volumes_horaires.items(l).service_fi := mainCell('Service FI', 'rs',l); ose_formule.volumes_horaires.items(l).service_fi := mainCell('Service FI', 'rs',l);
...@@ -961,41 +928,4 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS ...@@ -961,41 +928,4 @@ CREATE OR REPLACE PACKAGE BODY "FORMULE_UBO" AS
END LOOP; END LOOP;
END; END;
FUNCTION INTERVENANT_QUERY RETURN CLOB IS
BEGIN
RETURN '
SELECT
fi.*,
CASE WHEN si.code IN (''ENS_CH'',''ASS_MI_TPS'',''ENS_CH_LRU'',''DOCTOR'') THEN ''oui'' ELSE ''non'' END param_1,
CASE WHEN si.code IN (''LECTEUR'',''ATER'') THEN ''oui'' ELSE ''non'' END param_2,
NULL param_3,
NULL param_4,
NULL param_5
FROM
V_FORMULE_INTERVENANT fi
JOIN intervenant i ON i.id = fi.intervenant_id
JOIN statut si ON si.id = i.statut_id
';
END;
FUNCTION VOLUME_HORAIRE_QUERY RETURN CLOB IS
BEGIN
RETURN '
SELECT
fvh.*,
NULL param_1,
NULL param_2,
NULL param_3,
NULL param_4,
NULL param_5
FROM
V_FORMULE_VOLUME_HORAIRE fvh
ORDER BY
ordre';
END;
END FORMULE_UBO; END FORMULE_UBO;
\ No newline at end of file
...@@ -4,7 +4,4 @@ CREATE OR REPLACE PACKAGE "FORMULE_UBO" AS ...@@ -4,7 +4,4 @@ CREATE OR REPLACE PACKAGE "FORMULE_UBO" AS
FUNCTION calcCell( c VARCHAR2, l NUMERIC ) RETURN FLOAT; FUNCTION calcCell( c VARCHAR2, l NUMERIC ) RETURN FLOAT;
FUNCTION INTERVENANT_QUERY RETURN CLOB;
FUNCTION VOLUME_HORAIRE_QUERY RETURN CLOB;
END FORMULE_UBO; END FORMULE_UBO;
\ No newline at end of file
CREATE OR REPLACE PACKAGE "OSE_PAIEMENT" AS CREATE OR REPLACE PACKAGE "OSE_PAIEMENT" AS
PROCEDURE check_bad_paiements(formule_res_service_id NUMERIC DEFAULT NULL, PROCEDURE CHECK_BAD_PAIEMENTS( FORMULE_RES_SERVICE_ID NUMERIC DEFAULT NULL, FORMULE_RES_SERVICE_REF_ID NUMERIC DEFAULT NULL );
formule_res_service_ref_id NUMERIC DEFAULT NULL);
PROCEDURE set_mois_extraction_paie(mois_extraction_paie VARCHAR2); PROCEDURE set_mois_extraction_paie(mois_extraction_paie VARCHAR2);
......
...@@ -558,6 +558,7 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS ...@@ -558,6 +558,7 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS
WHEN e.code = ''PJ_VALIDATION'' THEN pj.demandees WHEN e.code = ''PJ_VALIDATION'' THEN pj.demandees
END objectif, END objectif,
CASE CASE
WHEN pj.obligatoire = 0 THEN 1
WHEN e.code = ''PJ_SAISIE'' THEN pj.fournies WHEN e.code = ''PJ_SAISIE'' THEN pj.fournies
WHEN e.code = ''PJ_VALIDATION'' THEN pj.validees WHEN e.code = ''PJ_VALIDATION'' THEN pj.validees
END realisation END realisation
...@@ -567,13 +568,13 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS ...@@ -567,13 +568,13 @@ CREATE OR REPLACE PACKAGE BODY OSE_WORKFLOW AS
intervenant_id, intervenant_id,
SUM(demandee) demandees, SUM(demandee) demandees,
SUM(fournie) fournies, SUM(fournie) fournies,
SUM(validee) validees SUM(validee) validees,
MIN(obligatoire) obligatoire
FROM FROM
tbl_piece_jointe tbl_piece_jointe
WHERE WHERE
' || unicaen_tbl.MAKE_WHERE(param, VALUE) || ' ' || unicaen_tbl.MAKE_WHERE(param, VALUE) || '
AND demandee > 0 AND demandee > 0
AND obligatoire = 1
GROUP BY GROUP BY
annee_id, annee_id,
intervenant_id intervenant_id
......
create or replace PACKAGE BODY "UNICAEN_TBL" AS CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
TYPE t_dems_values IS TABLE OF BOOLEAN INDEX BY VARCHAR2(80); TYPE t_dems_values IS TABLE OF BOOLEAN INDEX BY VARCHAR2(80);
TYPE t_dems_params IS TABLE OF t_dems_values INDEX BY VARCHAR2(30); TYPE t_dems_params IS TABLE OF t_dems_values INDEX BY VARCHAR2(30);
TYPE t_dems IS TABLE OF t_dems_params INDEX BY VARCHAR2(30); TYPE t_dems IS TABLE OF t_dems_params INDEX BY VARCHAR2(30);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment