Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OSE
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
OSE
Commits
32f743af
Commit
32f743af
authored
2 years ago
by
Laurent Lecluse
Browse files
Options
Downloads
Patches
Plain Diff
Formule de Picardie #47224
(cherry picked from commit
59771eec
)
parent
b3ea6950
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+6
-3
6 additions, 3 deletions
CHANGELOG.md
data/ddl/package/FORMULE_PICARDIE/body.sql
+46
-24
46 additions, 24 deletions
data/ddl/package/FORMULE_PICARDIE/body.sql
data/formules.php
+0
-5
0 additions, 5 deletions
data/formules.php
with
52 additions
and
32 deletions
CHANGELOG.md
+
6
−
3
View file @
32f743af
# Version stable
[
OSE 20.
0
](
#ose-20--
2802
2023-
)
[
OSE 20.
1
](
#ose-20
1
--
0404
2023-
)
# OSE 21 (à venir)
...
...
@@ -11,7 +11,8 @@
*
Taux HETD personnalisables
# OSE 20.1 (A venir)
# OSE 20.1 (04/04/2023)
## Nouveautés
...
...
@@ -27,7 +28,9 @@
*
Correction d'une régression de la V20 sur le module Export Siham
*
Suppression d'un message d'erreur sur l'envoi de mail via les indicateurs (#49873)
*
Formule Paris 8 : correction d'un problème de code de composante
*
Formule Poitiers : (#46805)
*
Formule La Réunion : (#24229)
*
Formule de Picardie: (#47224)
...
...
This diff is collapsed.
Click to expand it.
data/ddl/package/FORMULE_PICARDIE/body.sql
+
46
−
24
View file @
32f743af
...
...
@@ -218,10 +218,10 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
-- AB=IF([.$H20]="Référentiel";[.$
A
Q20]+[.$B
C20]+[.$BQ
20];0)
-- AB=IF([.$H20]="Référentiel";[.$
B
Q20]+[.$B
S
20];0)
WHEN
'AB'
THEN
IF
vh
.
volume_horaire_ref_id
IS
NOT
NULL
THEN
RETURN
cell
(
'
A
Q'
,
l
)
+
cell
(
'B
C'
,
l
)
+
cell
(
'BQ
'
,
l
);
RETURN
cell
(
'
B
Q'
,
l
)
+
cell
(
'B
S
'
,
l
);
ELSE
RETURN
0
;
END
IF
;
...
...
@@ -284,9 +284,9 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
-- AJ=IF([.A
H$17]=0
;([.AG20]-[.AI20])/[.$AD20];0)
-- AJ=IF([.A
I20]<[.AG20]
;([.AG20]-[.AI20])/[.$AD20];0)
WHEN
'AJ'
THEN
IF
cell
(
'A
H17'
)
=
0
THEN
IF
cell
(
'A
I'
,
l
)
<
cell
(
'AG'
,
l
)
THEN
RETURN
(
cell
(
'AG'
,
l
)
-
cell
(
'AI'
,
l
))
/
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -314,12 +314,18 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
-- AN1
5
=SUM([.AM$1:.AM$1048576])
WHEN
'AN1
5
'
THEN
-- AN1
4
=SUM([.AM$1:.AM$1048576])
WHEN
'AN1
4
'
THEN
RETURN
calcFnc
(
'somme'
,
'AM'
);
-- AN15=MIN([.AN14];i_service_du/3)
WHEN
'AN15'
THEN
RETURN
LEAST
(
cell
(
'AN14'
),
i
.
service_du
/
3
);
-- AN16=MIN([.AN15];[.AH17])
WHEN
'AN16'
THEN
RETURN
LEAST
(
cell
(
'AN15'
),
cell
(
'AH17'
));
...
...
@@ -332,10 +338,10 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
-- AN=IF([.AN$1
5
]>0;[.AM20]/[.AN$1
5
];0)
-- AN=IF([.AN$1
4
]>0;[.AM20]/[.AN$1
4
];0)
WHEN
'AN'
THEN
IF
cell
(
'AN1
5
'
)
>
0
THEN
RETURN
cell
(
'AM'
,
l
)
/
cell
(
'AN1
5
'
);
IF
cell
(
'AN1
4
'
)
>
0
THEN
RETURN
cell
(
'AM'
,
l
)
/
cell
(
'AN1
4
'
);
ELSE
RETURN
0
;
END
IF
;
...
...
@@ -348,9 +354,9 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
-- AP=IF([.A
N$17]=0
;([.AM20]-[.AO20])/[.$AD20];0)
-- AP=IF([.A
O20]<[.AM20]
;([.AM20]-[.AO20])/[.$AD20];0)
WHEN
'AP'
THEN
IF
cell
(
'A
N17'
)
=
0
THEN
IF
cell
(
'A
O'
,
l
)
<
cell
(
'AM'
,
l
)
THEN
RETURN
(
cell
(
'AM'
,
l
)
-
cell
(
'AO'
,
l
))
/
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -412,9 +418,9 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
-- AV=IF([.A
T$17]=0
;([.AS20]-[.AU20])/[.$AD20];0)
-- AV=IF([.A
U20]<[.AS20]
;([.AS20]-[.AU20])/[.$AD20];0)
WHEN
'AV'
THEN
IF
cell
(
'A
T17'
)
=
0
THEN
IF
cell
(
'A
U'
,
l
)
<
cell
(
'AS'
,
l
)
THEN
RETURN
(
cell
(
'AS'
,
l
)
-
cell
(
'AU'
,
l
))
/
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -442,12 +448,18 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
-- AZ1
5
=SUM([.AY$1:.AY$1048576])
WHEN
'AZ1
5
'
THEN
-- AZ1
4
=SUM([.AY$1:.AY$1048576])
WHEN
'AZ1
4
'
THEN
RETURN
calcFnc
(
'somme'
,
'AY'
);
-- AZ15=MIN([.AZ14];(i_service_du/3)-[.AN16])
WHEN
'AZ15'
THEN
RETURN
LEAST
(
cell
(
'AZ14'
),
(
i
.
service_du
/
3
)
-
cell
(
'AN16'
));
-- AZ16=MIN([.AZ15];[.AT17])
WHEN
'AZ16'
THEN
RETURN
LEAST
(
cell
(
'AZ15'
),
cell
(
'AT17'
));
...
...
@@ -460,10 +472,10 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
-- AZ=IF([.AZ$1
5
]>0;[.AY20]/[.AZ$1
5
];0)
-- AZ=IF([.AZ$1
4
]>0;[.AY20]/[.AZ$1
4
];0)
WHEN
'AZ'
THEN
IF
cell
(
'AZ1
5
'
)
>
0
THEN
RETURN
cell
(
'AY'
,
l
)
/
cell
(
'AZ1
5
'
);
IF
cell
(
'AZ1
4
'
)
>
0
THEN
RETURN
cell
(
'AY'
,
l
)
/
cell
(
'AZ1
4
'
);
ELSE
RETURN
0
;
END
IF
;
...
...
@@ -476,9 +488,9 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
-- BB=IF([.
AZ$17]=0
;([.AY20]-[.BA20])/[.$AD20];0)
-- BB=IF([.
BA20]<[.AY20]
;([.AY20]-[.BA20])/[.$AD20];0)
WHEN
'BB'
THEN
IF
cell
(
'
AZ17'
)
=
0
THEN
IF
cell
(
'
BA'
,
l
)
<
cell
(
'AY'
,
l
)
THEN
RETURN
(
cell
(
'AY'
,
l
)
-
cell
(
'BA'
,
l
))
/
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -540,9 +552,9 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
-- BH=IF([.B
F$17]=0
;([.BE20]-[.BG20])/[.$AD20];0)
-- BH=IF([.B
G20]<[.BE20]
;([.BE20]-[.BG20])/[.$AD20];0)
WHEN
'BH'
THEN
IF
cell
(
'B
F17'
)
=
0
THEN
IF
cell
(
'B
G'
,
l
)
<
cell
(
'BE'
,
l
)
THEN
RETURN
(
cell
(
'BE'
,
l
)
-
cell
(
'BG'
,
l
))
/
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -604,9 +616,9 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
-- BN=IF([.B
L$17]=0
;([.BK20]-[.BM20])/[.$AD20];0)
-- BN=IF([.B
M20]<[.BK20]
;([.BK20]-[.BM20])/[.$AD20];0)
WHEN
'BN'
THEN
IF
cell
(
'B
L17'
)
=
0
THEN
IF
cell
(
'B
M'
,
l
)
<
cell
(
'BK'
,
l
)
THEN
RETURN
(
cell
(
'BK'
,
l
)
-
cell
(
'BM'
,
l
))
/
cell
(
'AD'
,
l
);
ELSE
RETURN
0
;
...
...
@@ -634,6 +646,16 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_PICARDIE AS
-- BS=IF(AND([.$D20]="Oui";[.$BL$17]=0;[.$H20]="Référentiel");([.AQ20]+[.BC20])*[.$AE20];0)
WHEN
'BS'
THEN
IF
vh
.
service_statutaire
AND
cell
(
'BL17'
)
=
0
AND
vh
.
volume_horaire_ref_id
IS
NOT
NULL
THEN
RETURN
(
cell
(
'AQ'
,
l
)
+
cell
(
'BC'
,
l
))
*
cell
(
'AE'
,
l
);
ELSE
RETURN
0
;
END
IF
;
ELSE
dbms_output
.
put_line
(
'La colonne c='
||
c
||
', l='
||
l
||
' n
''
existe pas!'
);
...
...
This diff is collapsed.
Click to expand it.
data/formules.php
+
0
−
5
View file @
32f743af
...
...
@@ -110,10 +110,5 @@ return [
26
=>
[
'LIBELLE'
=>
'Université de Picardie Jules Verne'
,
'PACKAGE_NAME'
=>
'FORMULE_PICARDIE'
,
'VH_PARAM_1_LIBELLE'
=>
'param 1'
,
'VH_PARAM_2_LIBELLE'
=>
'param 2'
,
'VH_PARAM_3_LIBELLE'
=>
'param 3'
,
'VH_PARAM_4_LIBELLE'
=>
'param 4'
,
'VH_PARAM_5_LIBELLE'
=>
'param 5'
,
],
];
\ No newline at end of file
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