From 83d21d4d197f3657707186584dd6a1d1a32014ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20L=C3=A9cluse?= <laurent.lecluse@unicaen.fr>
Date: Tue, 26 Apr 2022 15:06:22 +0200
Subject: [PATCH] =?UTF-8?q?Affichage=20des=20plafonds=20sur=20les=20valida?=
=?UTF-8?q?tions=20Meilleur=20rafraichissement=20des=20plafonds=20(pour=20?=
=?UTF-8?q?le=20r=C3=A9f=C3=A9rentiel=20ils=20ne=20se=20mettaient=20pas=20?=
=?UTF-8?q?=C3=A0=20jour)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Application/view/application/intervenant/services.phtml | 6 ++++++
.../view/application/service-referentiel/validation.phtml | 2 +-
.../Application/view/application/service/validation.phtml | 1 +
public/js/service.js | 4 ----
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/module/Application/view/application/intervenant/services.phtml b/module/Application/view/application/intervenant/services.phtml
index d797690ce1..73c362f29a 100755
--- a/module/Application/view/application/intervenant/services.phtml
+++ b/module/Application/view/application/intervenant/services.phtml
@@ -113,6 +113,9 @@ echo $formuleTotauxHetd;
// on met à jour l'horodatage des services !!
$("#s-horodatage").refresh();
+ // Mise à jour des plafonds
+ $(".plafonds").refresh();
+
// chargement du menu pour faire apparaître ou disparaitre les liens de validation
$('#sidebar').load('<?= $menuUrl; ?>');
@@ -135,6 +138,9 @@ echo $formuleTotauxHetd;
// on met à jour l'horodatage des services !!
$("#sr-horodatage").refresh();
+ // Mise à jour des plafonds
+ $(".plafonds").refresh();
+
// chargement du menu pour faire apparaître ou disparaitre les liens de validation
$('#sidebar').load('<?= $menuUrl; ?>');
diff --git a/module/Application/view/application/service-referentiel/validation.phtml b/module/Application/view/application/service-referentiel/validation.phtml
index 5b65944275..fe13ca685f 100755
--- a/module/Application/view/application/service-referentiel/validation.phtml
+++ b/module/Application/view/application/service-referentiel/validation.phtml
@@ -21,7 +21,7 @@ $wells = [
];
echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
-
+echo $this->plafonds($intervenant, $typeVolumeHoraire);
foreach ($wells as $well => $title) {
if ($services[$well]) {
diff --git a/module/Application/view/application/service/validation.phtml b/module/Application/view/application/service/validation.phtml
index 645c137d35..3f5c0fe7cd 100755
--- a/module/Application/view/application/service/validation.phtml
+++ b/module/Application/view/application/service/validation.phtml
@@ -15,6 +15,7 @@ $wells = [
];
echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
+echo $this->plafonds($intervenant, $typeVolumeHoraire);
foreach ($wells as $well => $title) {
if ($services[$well]) {
diff --git a/public/js/service.js b/public/js/service.js
index d24b529103..4e3843fb44 100755
--- a/public/js/service.js
+++ b/public/js/service.js
@@ -114,10 +114,6 @@ $.widget("ose.serviceListe", {
if ($("#service-resume").length > 0) { // Si on est dans le résumé (si nécessaire)
$("#service-resume").refresh();
}
-
- if ($(".plafonds").length > 0) { // Si on est dans le résumé (si nécessaire)
- $(".plafonds").refresh();
- }
},
--
GitLab