From 5523ec76ae6c48a813c374047601c3d27837d713 Mon Sep 17 00:00:00 2001 From: Benjamin Solbrig Date: Mon, 20 Jul 2020 14:19:27 +0200 Subject: [PATCH 1/2] Format due date in Email with strtotime --- src/api/controllers/Comments.php | 2 +- src/api/controllers/Tasks.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/controllers/Comments.php b/src/api/controllers/Comments.php index 75466f5..1ea5c87 100644 --- a/src/api/controllers/Comments.php +++ b/src/api/controllers/Comments.php @@ -212,7 +212,7 @@ class Comments extends BaseController { $data->taskName = $task->title ?: ''; $data->taskDescription = $task->description ?: ''; - $data->taskDueDate = date('F j, Y, g:i:s A', (int)$task->due_date * 1000); + $data->taskDueDate = date('F j, Y, g:i:s A', strtotime($task->due_date)); $data->taskAssignees = ''; foreach($task->sharedUserList as $assignee) { diff --git a/src/api/controllers/Tasks.php b/src/api/controllers/Tasks.php index f79b37b..e1e686a 100644 --- a/src/api/controllers/Tasks.php +++ b/src/api/controllers/Tasks.php @@ -386,7 +386,7 @@ class Tasks extends BaseController { $data->taskName = $task->title ?: ''; $data->taskDescription = $task->description ?: ''; - $data->taskDueDate = date('F j, Y, g:i:s A', (int)$task->due_date * 1000); + $data->taskDueDate = date('F j, Y, g:i:s A', strtotime($task->due_date)); $data->taskAssignees = ''; foreach($task->sharedUserList as $assignee) { From fec8dbe915595f325abdfa5fdcdf2149926c636e Mon Sep 17 00:00:00 2001 From: Benjamin Solbrig Date: Mon, 20 Jul 2020 14:37:17 +0200 Subject: [PATCH 2/2] Removed time from due date in email notification --- src/api/controllers/Comments.php | 2 +- src/api/controllers/Tasks.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/controllers/Comments.php b/src/api/controllers/Comments.php index 1ea5c87..59ef77c 100644 --- a/src/api/controllers/Comments.php +++ b/src/api/controllers/Comments.php @@ -212,7 +212,7 @@ class Comments extends BaseController { $data->taskName = $task->title ?: ''; $data->taskDescription = $task->description ?: ''; - $data->taskDueDate = date('F j, Y, g:i:s A', strtotime($task->due_date)); + $data->taskDueDate = date('F j, Y', strtotime($task->due_date)); $data->taskAssignees = ''; foreach($task->sharedUserList as $assignee) { diff --git a/src/api/controllers/Tasks.php b/src/api/controllers/Tasks.php index e1e686a..3a033e3 100644 --- a/src/api/controllers/Tasks.php +++ b/src/api/controllers/Tasks.php @@ -386,7 +386,7 @@ class Tasks extends BaseController { $data->taskName = $task->title ?: ''; $data->taskDescription = $task->description ?: ''; - $data->taskDueDate = date('F j, Y, g:i:s A', strtotime($task->due_date)); + $data->taskDueDate = date('F j, Y', strtotime($task->due_date)); $data->taskAssignees = ''; foreach($task->sharedUserList as $assignee) {