From 3ee638a857d580da53eb2b8b2b5bfab415094521 Mon Sep 17 00:00:00 2001 From: afornerot Date: Thu, 1 Jun 2023 10:32:38 +0200 Subject: [PATCH] timeextra en minute et non en heure (ref #14) --- src/ninebadge-1.0/src/Form/TimeextraType.php | 2 +- src/ninebadge-1.0/src/Repository/TallydayRepository.php | 4 ++-- src/ninebadge-1.0/templates/Timeextra/list.html.twig | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ninebadge-1.0/src/Form/TimeextraType.php b/src/ninebadge-1.0/src/Form/TimeextraType.php index c3e34d4..08c39c8 100644 --- a/src/ninebadge-1.0/src/Form/TimeextraType.php +++ b/src/ninebadge-1.0/src/Form/TimeextraType.php @@ -37,7 +37,7 @@ class TimeextraType extends AbstractType $builder->add('hour', IntegerType::class, [ - "label" => "Nombre d'Heure", + "label" => "Nombre de Minutes", "required" => true, ] ); diff --git a/src/ninebadge-1.0/src/Repository/TallydayRepository.php b/src/ninebadge-1.0/src/Repository/TallydayRepository.php index ea8e323..2e3ee83 100644 --- a/src/ninebadge-1.0/src/Repository/TallydayRepository.php +++ b/src/ninebadge-1.0/src/Repository/TallydayRepository.php @@ -92,10 +92,10 @@ class TallydayRepository extends ServiceEntityRepository } } - // Enlever du temps travailler les heures sup payƩ + // Enlever du temps travailler les minutes sup payƩ $timeextra=$this->_em->getRepository("App:Timeextra")->getTimeextrauser($user, new \DateTime()); if($timeextra[1]) { - $ework->sub(new \DateInterval("PT".$timeextra[1]."H")); + $ework->sub(new \DateInterval("PT".$timeextra[1]."M")); } // Nbday worked diff --git a/src/ninebadge-1.0/templates/Timeextra/list.html.twig b/src/ninebadge-1.0/templates/Timeextra/list.html.twig index 7c53e16..0d56a95 100644 --- a/src/ninebadge-1.0/templates/Timeextra/list.html.twig +++ b/src/ninebadge-1.0/templates/Timeextra/list.html.twig @@ -28,7 +28,7 @@ GESTION DES HEURES SUPPLEMENTAIRES Action Utilisateur Date - Nb Heure + Nb Minutes