diff --git a/CHANGELOG b/CHANGELOG index 81a8656d901e3e7dda96db72ab8b28342bc8bc8f..27f246262ed103f8f225442bb10cb0be2712ad99 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git "a/data/D\303\251ploiement/Changements.pdf" "b/data/D\303\251ploiement/Changements.pdf" index c65f78e724d8c7af5abb1d9c8ce41d5ee8a7a96a..1d71070d000c45e5f0c2bc90b7300a5c257f7618 100644 Binary files "a/data/D\303\251ploiement/Changements.pdf" and "b/data/D\303\251ploiement/Changements.pdf" differ diff --git "a/data/D\303\251ploiement/Proc\303\251dure d'installation.pdf" "b/data/D\303\251ploiement/Proc\303\251dure d'installation.pdf" index 0243c9cf0600269f2d9c92e953aa9174b783801f..e094452c632afe054e2635f82bdb3b856f3dd41f 100644 Binary files "a/data/D\303\251ploiement/Proc\303\251dure d'installation.pdf" and "b/data/D\303\251ploiement/Proc\303\251dure d'installation.pdf" differ diff --git "a/data/D\303\251ploiement/Proc\303\251dure de mise \303\240 jour.pdf" "b/data/D\303\251ploiement/Proc\303\251dure de mise \303\240 jour.pdf" index 8edcfe39a6ff7b46045b2059abe4fd5568f5b11c..f60d9bfbc481a583dd0d5d8018fadce028968c5b 100644 Binary files "a/data/D\303\251ploiement/Proc\303\251dure de mise \303\240 jour.pdf" and "b/data/D\303\251ploiement/Proc\303\251dure de mise \303\240 jour.pdf" differ diff --git a/module/Application/src/Application/Controller/IntervenantController.php b/module/Application/src/Application/Controller/IntervenantController.php index bcedb908f4ceabbde71606dd628266c25f2ece77..ec48f2081c8d95588e29331c2862cdf51d8bb6ef 100644 --- a/module/Application/src/Application/Controller/IntervenantController.php +++ b/module/Application/src/Application/Controller/IntervenantController.php @@ -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) {