Skip to content
Snippets Groups Projects
Commit 59523f9c authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

FEAT #19031 TIME 1:00 fix notification schedule for php 8.1

parent c111a6bd
No related branches found
No related tags found
No related merge requests found
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
namespace Notification\controllers; namespace Notification\controllers;
use Configuration\models\ConfigurationModel; use Configuration\models\ConfigurationModel;
use DateTime;
use Notification\models\NotificationsScheduleModel; use Notification\models\NotificationsScheduleModel;
use Group\controllers\PrivilegeController; use Group\controllers\PrivilegeController;
use History\controllers\HistoryController; use History\controllers\HistoryController;
...@@ -79,6 +80,16 @@ class NotificationsScheduleController ...@@ -79,6 +80,16 @@ class NotificationsScheduleController
$notificationsSchedule = []; $notificationsSchedule = [];
foreach ($rawNotificationsSchedule as $value) { foreach ($rawNotificationsSchedule as $value) {
$startTime = null;
$endTime = null;
if (!empty($value['start_time'])) {
$startTime = (new DateTime($value['start_time']))->format('H:i');
}
if (!empty($value['end_time'])) {
$endTime = (new DateTime($value['end_time']))->format('H:i');
}
$notificationsSchedule[] = [ $notificationsSchedule[] = [
'id' => $value['id'], 'id' => $value['id'],
'label' => $value['label'], 'label' => $value['label'],
...@@ -86,8 +97,8 @@ class NotificationsScheduleController ...@@ -86,8 +97,8 @@ class NotificationsScheduleController
'months' => json_decode($value['months']), 'months' => json_decode($value['months']),
'daysOfMonth' => json_decode($value['days_of_month']), 'daysOfMonth' => json_decode($value['days_of_month']),
'daysOfWeek' => json_decode($value['days_of_week']), 'daysOfWeek' => json_decode($value['days_of_week']),
'startTime' => (new \DateTime($value['start_time'] ?? ''))->format('H:i'), 'startTime' => $startTime,
'endTime' => (new \DateTime($value['end_time'] ?? ''))->format('H:i'), 'endTime' => $endTime,
'frequency' => $value['frequency'], 'frequency' => $value['frequency'],
'frequencyMode' => $value['frequency_mode'], 'frequencyMode' => $value['frequency_mode'],
'status' => $value['status'], 'status' => $value['status'],
...@@ -119,8 +130,8 @@ class NotificationsScheduleController ...@@ -119,8 +130,8 @@ class NotificationsScheduleController
'months' => json_decode($rawNotificationsScheduleItem['months']), 'months' => json_decode($rawNotificationsScheduleItem['months']),
'daysOfMonth' => json_decode($rawNotificationsScheduleItem['days_of_month']), 'daysOfMonth' => json_decode($rawNotificationsScheduleItem['days_of_month']),
'daysOfWeek' => json_decode($rawNotificationsScheduleItem['days_of_week']), 'daysOfWeek' => json_decode($rawNotificationsScheduleItem['days_of_week']),
'startTime' => (new \DateTime($rawNotificationsScheduleItem['start_time']))->format('H:i'), 'startTime' => (new DateTime($rawNotificationsScheduleItem['start_time']))->format('H:i'),
'endTime' => !empty($rawNotificationsScheduleItem['end_time']) ? (new \DateTime($rawNotificationsScheduleItem['end_time']))->format('H:i') : null, 'endTime' => !empty($rawNotificationsScheduleItem['end_time']) ? (new DateTime($rawNotificationsScheduleItem['end_time']))->format('H:i') : null,
'frequency' => $rawNotificationsScheduleItem['frequency'], 'frequency' => $rawNotificationsScheduleItem['frequency'],
'frequencyMode' => $rawNotificationsScheduleItem['frequency_mode'], 'frequencyMode' => $rawNotificationsScheduleItem['frequency_mode'],
'status' => $rawNotificationsScheduleItem['status'], 'status' => $rawNotificationsScheduleItem['status'],
...@@ -262,7 +273,7 @@ class NotificationsScheduleController ...@@ -262,7 +273,7 @@ class NotificationsScheduleController
HistoryController::add([ HistoryController::add([
'code' => 'OK', 'code' => 'OK',
'objectType' => 'configurations', 'objectType' => 'configurations',
'objectId' => $configuration['id'] ?? null, 'objectId' => $configuration['id'],
'type' => 'MODIFICATION', 'type' => 'MODIFICATION',
'message' => "{schedulerScriptCreated} : {$configuration['value']['schedulerPath']}" 'message' => "{schedulerScriptCreated} : {$configuration['value']['schedulerPath']}"
]); ]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment