Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OSE
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
OSE
Commits
fb49bd10
Commit
fb49bd10
authored
Sep 10, 2021
by
Laurent Lecluse
Browse files
Options
Downloads
Patches
Plain Diff
Correction bug formule Unicaen 2021.
Possibilité de choix entre les v2016 et 2021
parent
ce21535a
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
data/ddl/package/FORMULE_UNICAEN/body.sql
+12
-12
12 additions, 12 deletions
data/ddl/package/FORMULE_UNICAEN/body.sql
data/nomenclatures.php
+6
-2
6 additions, 2 deletions
data/nomenclatures.php
with
18 additions
and
14 deletions
data/ddl/package/FORMULE_UNICAEN/body.sql
+
12
−
12
View file @
fb49bd10
...
...
@@ -498,7 +498,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_UNICAEN AS
-- AG=SI(ET($D20="Oui";$H20<>"Référentiel";$H20<>"EAD";$A20=i_structure_code);$M20*$E20*$AD20;0)
WHEN
c
=
'AG'
AND
v
>=
1
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NULL
AND
vh
.
type_intervention_code
<>
'EAD'
AND
vh
.
structure_
code
=
i
.
structure_code
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NULL
AND
vh
.
type_intervention_code
<>
'EAD'
AND
vh
.
structure_
is_affectation
THEN
RETURN
vh
.
heures
*
vh
.
taux_fi
*
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -544,7 +544,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_UNICAEN AS
-- AM=SI(ET($D20="Oui";$H20<>"Référentiel";$H20<>"EAD";$A20<>i_structure_code);$M20*$E20*$AD20;0)
WHEN
c
=
'AM'
AND
v
>=
1
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NULL
AND
vh
.
type_intervention_code
<>
'EAD'
AND
vh
.
structure_
code
<>
i
.
structure_code
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NULL
AND
vh
.
type_intervention_code
<>
'EAD'
AND
NOT
vh
.
structure_
is_affectation
THEN
RETURN
vh
.
heures
*
vh
.
taux_fi
*
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -590,7 +590,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_UNICAEN AS
-- AS=SI(ET($D20="Oui";$H20="EAD";$A20=i_structure_code);$M20*$E20*$AD20;0)
WHEN
c
=
'AS'
AND
v
>=
1
THEN
IF
vh
.
service_statutaire
AND
vh
.
type_intervention_code
=
'EAD'
AND
vh
.
structure_
code
=
i
.
structure_code
THEN
IF
vh
.
service_statutaire
AND
vh
.
type_intervention_code
=
'EAD'
AND
vh
.
structure_
is_affectation
THEN
RETURN
vh
.
heures
*
vh
.
taux_fi
*
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -636,7 +636,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_UNICAEN AS
-- AY=SI(ET($D20="Oui";$H20="EAD";$A20<>i_structure_code);$M20*$E20*$AD20;0)
WHEN
c
=
'AY'
AND
v
>=
1
THEN
IF
vh
.
service_statutaire
AND
vh
.
type_intervention_code
=
'EAD'
AND
vh
.
structure_
code
<>
i
.
structure_code
THEN
IF
vh
.
service_statutaire
AND
vh
.
type_intervention_code
=
'EAD'
AND
NOT
vh
.
structure_
is_affectation
THEN
RETURN
vh
.
heures
*
vh
.
taux_fi
*
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -682,7 +682,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_UNICAEN AS
-- BE=SI(ET($D20="Oui";$H20<>"Référentiel";$H20<>"EAD";$A20=i_structure_code);$M20*$F20*$AD20;0)
WHEN
c
=
'BE'
AND
v
>=
1
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NULL
AND
vh
.
type_intervention_code
<>
'EAD'
AND
vh
.
structure_
code
=
i
.
structure_code
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NULL
AND
vh
.
type_intervention_code
<>
'EAD'
AND
vh
.
structure_
is_affectation
THEN
RETURN
vh
.
heures
*
vh
.
taux_fa
*
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -728,7 +728,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_UNICAEN AS
-- BK=SI(ET($D20="Oui";$H20<>"Référentiel";$H20<>"EAD";$A20<>i_structure_code);$M20*$F20*$AD20;0)
WHEN
c
=
'BK'
AND
v
>=
1
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NULL
AND
vh
.
type_intervention_code
<>
'EAD'
AND
vh
.
structure_
code
<>
i
.
structure_code
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NULL
AND
vh
.
type_intervention_code
<>
'EAD'
AND
NOT
vh
.
structure_
is_affectation
THEN
RETURN
vh
.
heures
*
vh
.
taux_fa
*
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -774,7 +774,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_UNICAEN AS
-- BQ=SI(ET($D20="Oui";$H20="EAD";$A20=i_structure_code);$M20*$F20*$AD20;0)
WHEN
c
=
'BQ'
AND
v
>=
1
THEN
IF
vh
.
service_statutaire
AND
vh
.
type_intervention_code
=
'EAD'
AND
vh
.
structure_
code
=
i
.
structure_code
THEN
IF
vh
.
service_statutaire
AND
vh
.
type_intervention_code
=
'EAD'
AND
vh
.
structure_
is_affectation
THEN
RETURN
vh
.
heures
*
vh
.
taux_fa
*
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -820,7 +820,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_UNICAEN AS
-- BW=SI(ET($D20="Oui";$H20="EAD";$A20<>i_structure_code);$M20*$F20*$AD20;0)
WHEN
c
=
'BW'
AND
v
>=
1
THEN
IF
vh
.
service_statutaire
AND
vh
.
type_intervention_code
=
'EAD'
AND
vh
.
structure_
code
<>
i
.
structure_code
THEN
IF
vh
.
service_statutaire
AND
vh
.
type_intervention_code
=
'EAD'
AND
NOT
vh
.
structure_
is_affectation
THEN
RETURN
vh
.
heures
*
vh
.
taux_fa
*
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -866,7 +866,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_UNICAEN AS
-- CC=SI(ET($D20="Oui";$H20<>"Référentiel";$A20=i_structure_code);$M20*$G20*$AD20;0)
WHEN
c
=
'CC'
AND
v
>=
1
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NULL
AND
vh
.
structure_
code
=
i
.
structure_code
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NULL
AND
vh
.
structure_
is_affectation
THEN
RETURN
vh
.
heures
*
vh
.
taux_fc
*
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -912,7 +912,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_UNICAEN AS
-- CI=SI(ET($D20="Oui";$H20<>"Référentiel";$A20<>i_structure_code);$M20*$G20*$AD20;0)
WHEN
c
=
'CI'
AND
v
>=
1
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NULL
AND
vh
.
structure_
code
<>
i
.
structure_code
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NULL
AND
NOT
vh
.
structure_
is_affectation
THEN
RETURN
vh
.
heures
*
vh
.
taux_fc
*
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -958,7 +958,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_UNICAEN AS
-- CO=SI(ET($D20="Oui";$H20="Référentiel";$A20=i_structure_code);$M20*$AD20;0)
WHEN
c
=
'CO'
AND
v
>=
1
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NOT
NULL
AND
vh
.
structure_
code
=
i
.
structure_code
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NOT
NULL
AND
vh
.
structure_
is_affectation
THEN
RETURN
vh
.
heures
*
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -1004,7 +1004,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_UNICAEN AS
-- CU=SI(ET($D20="Oui";$H20="Référentiel";$A20<>i_structure_code;$A20<>$K$10);$M20*$AD20;0)
WHEN
c
=
'CU'
AND
v
>=
1
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NOT
NULL
AND
vh
.
structure_
code
<>
i
.
structure_code
AND
NOT
vh
.
structure_is_univ
THEN
IF
vh
.
service_statutaire
AND
vh
.
volume_horaire_ref_id
IS
NOT
NULL
NOT
vh
.
structure_
is_affectation
AND
NOT
vh
.
structure_is_univ
THEN
RETURN
vh
.
heures
*
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
This diff is collapsed.
Click to expand it.
data/nomenclatures.php
+
6
−
2
View file @
fb49bd10
...
...
@@ -136,8 +136,8 @@ return [
'FORMULE'
=>
[
1
=>
[
'LIBELLE'
=>
'Université de Caen'
,
'PACKAGE_NAME'
=>
'FORMULE_UNICAEN'
,
'LIBELLE'
=>
'Université de Caen
(version 2016)
'
,
'PACKAGE_NAME'
=>
'FORMULE_UNICAEN
_2016
'
,
],
2
=>
[
'LIBELLE'
=>
'Université de Montpellier'
,
...
...
@@ -213,6 +213,10 @@ return [
'LIBELLE'
=>
'Université Sorbonne Nouvelle'
,
'PACKAGE_NAME'
=>
'FORMULE_SORBONNE_NOUVELLE'
,
],
19
=>
[
'LIBELLE'
=>
'Université de Caen (version 2021)'
,
'PACKAGE_NAME'
=>
'FORMULE_UNICAEN'
,
],
],
'MODELE_CONTRAT'
=>
[
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment