Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
open-source
OSE
Commits
884f3d8b
Commit
884f3d8b
authored
Oct 08, 2018
by
Laurent Lécluse
Browse files
Correction bug calcul HETD
parent
46064bfe
Changes
5
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
884f3d8b
...
...
@@ -15,7 +15,8 @@ author: Laurent Lécluse - DSI - Unicaen
## Corrections de bugs
Le modèle de contrat est désormais téléchargeable depuis l'interface d'administration.
* Le modèle de contrat est désormais téléchargeable depuis l'interface d'administration.
* Un bug affectant l'affichage de la page "Calcul HETD" dans certains cas est résolu.
#OSE 7.0.2
...
...
data/Déploiement/Changements.pdf
View file @
884f3d8b
No preview for this file type
data/Déploiement/Procédure d'installation.pdf
View file @
884f3d8b
No preview for this file type
data/Déploiement/Procédure de mise à jour.pdf
View file @
884f3d8b
No preview for this file type
module/Application/src/Application/Controller/IntervenantController.php
View file @
884f3d8b
...
...
@@ -373,8 +373,15 @@ class IntervenantController extends AbstractController
];
}
$typesIntervention
[
$fvh
->
getTypeIntervention
()
->
getId
()][
'heures'
]
+=
$fvh
->
getHeures
();
$hetd
=
$fvh
->
getVolumeHoraire
()
->
getFormuleResultatVolumeHoraire
()
->
first
()
->
getTotal
();
$typesIntervention
[
$fvh
->
getTypeIntervention
()
->
getId
()][
'hetd'
]
+=
$hetd
;
$hetd
=
0
;
if
(
$frvh
=
$fvh
->
getVolumeHoraire
()
->
getFormuleResultatVolumeHoraire
())
{
if
(
$frvhf
=
$frvh
->
first
())
{
$hetd
=
$frvhf
->
getTotal
();
}
}
$typesIntervention
[
$fvh
->
getTypeIntervention
()
->
getId
()][
'hetd'
]
+=
$hetd
;
}
if
(
$totalHeures
>
0
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment