From cbe0cbf4e7c2c2b9459107c6c56570406951cad2 Mon Sep 17 00:00:00 2001 From: Matthieu Lamalle Date: Wed, 29 Jul 2020 14:49:14 +0200 Subject: [PATCH] =?UTF-8?q?Ajout=20des=20horaires=20de=20travail=20en=20pa?= =?UTF-8?q?ram=C3=A8tres=20.env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/schedule-2.0/.env | 4 ++++ src/schedule-2.0/config/services.yaml | 2 ++ src/schedule-2.0/src/Controller/TimerController.php | 6 ++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/schedule-2.0/.env b/src/schedule-2.0/.env index c784546..b4a5ce3 100644 --- a/src/schedule-2.0/.env +++ b/src/schedule-2.0/.env @@ -32,6 +32,10 @@ APP_NAME=Schedule APP_ENV=PROD APP_CRON=false +# Office hours +OFFICE_HOUR_START=09:00 +OFFICE_HOUR_END=17:30 + # MAIL sendmail / smtp MAILER_METHOD=sendmail MAILER_URL= diff --git a/src/schedule-2.0/config/services.yaml b/src/schedule-2.0/config/services.yaml index 29a975b..c9ebaa1 100644 --- a/src/schedule-2.0/config/services.yaml +++ b/src/schedule-2.0/config/services.yaml @@ -19,6 +19,8 @@ parameters: casEmail: '%env(resolve:CAS_EMAIL)%' casLastname: '%env(resolve:CAS_LASTNAME)%' casFirstname: '%env(resolve:CAS_FIRSTNAME)%' + officeHourStart: '%env(resolve:OFFICE_HOUR_START)%' + officeHourEnd: '%env(resolve:OFFICE_HOUR_END)%' services: # default configuration for services in *this* file diff --git a/src/schedule-2.0/src/Controller/TimerController.php b/src/schedule-2.0/src/Controller/TimerController.php index 9859e28..b8ffd8b 100644 --- a/src/schedule-2.0/src/Controller/TimerController.php +++ b/src/schedule-2.0/src/Controller/TimerController.php @@ -147,8 +147,10 @@ class TimerController extends AbstractController $officeworkstart = clone $start; $officeworkend = clone $officeworkstart; - $officeworkstart->SetTime(9,0,0); - $officeworkend->SetTime(17,30,0); + $uStart = explode(":",$this->getParameter('officeHourStart')); + $uEnd = explode(":",$this->getParameter('officeHourEnd')); + $officeworkstart->SetTime(intval($uStart[0]),intval($uStart[1]),0); + $officeworkend->SetTime(intval($uEnd[0]),intval($uEnd[1]),0); if ($start < $officeworkstart || $end > $officeworkend) { $data->setAdditionalHour(true); }else{