From e3b988424711ee61fe60d658783497d57f61f011 Mon Sep 17 00:00:00 2001
From: ayntk-ai <122374094+ayntk-ai@users.noreply.github.com>
Date: Fri, 16 Aug 2024 14:45:40 +0200
Subject: [PATCH] UI fix

---
 .../Shared/ScheduledTask/Executions.php       | 12 +++++++++--
 .../scheduled-task/executions.blade.php       | 20 +++++++++++++++++--
 .../shared/scheduled-task/show.blade.php      |  4 ++--
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/app/Livewire/Project/Shared/ScheduledTask/Executions.php b/app/Livewire/Project/Shared/ScheduledTask/Executions.php
index 7a2e14e89..3ee053e3e 100644
--- a/app/Livewire/Project/Shared/ScheduledTask/Executions.php
+++ b/app/Livewire/Project/Shared/ScheduledTask/Executions.php
@@ -7,8 +7,8 @@ use Livewire\Component;
 class Executions extends Component
 {
     public $executions = [];
-
     public $selectedKey;
+    public $task;
 
     public function getListeners()
     {
@@ -26,4 +26,12 @@ class Executions extends Component
         }
         $this->selectedKey = $key;
     }
-}
+
+    public function getServerTimezone()
+    {
+        $server = data_get($this, 'destination.server');
+        $serverTimezone = $server->settings->server_timezone;
+        ray('Server Timezone:', $serverTimezone);
+        return $serverTimezone;
+    }
+}
\ No newline at end of file
diff --git a/resources/views/livewire/project/shared/scheduled-task/executions.blade.php b/resources/views/livewire/project/shared/scheduled-task/executions.blade.php
index afbf1ea93..cf7a591d7 100644
--- a/resources/views/livewire/project/shared/scheduled-task/executions.blade.php
+++ b/resources/views/livewire/project/shared/scheduled-task/executions.blade.php
@@ -24,9 +24,25 @@
                 </div>
             @endif
             <div>Status: {{ data_get($execution, 'status') }}</div>
-            <div>Started At: {{ data_get($execution, 'created_at') }}</div>
+            <div>Started At: 
+                @php
+                    $createdAt = data_get($execution, 'created_at', now());
+                    $serverTimezone = $this->getServerTimezone();
+                    ray('Created At:', $createdAt, 'Server Timezone:', $serverTimezone);
+                    
+                    $date = new DateTime($createdAt);
+                    if ($serverTimezone) {
+                        try {
+                            $date->setTimezone(new DateTimeZone($serverTimezone));
+                        } catch (\Exception $e) {
+                            ray('Invalid timezone:', $serverTimezone);
+                        }
+                    }
+                    echo $date->format('Y-m-d H:i:s T');
+                @endphp
+            </div>
         </a>
     @empty
         <div>No executions found.</div>
     @endforelse
-</div>
+</div>
\ No newline at end of file
diff --git a/resources/views/livewire/project/shared/scheduled-task/show.blade.php b/resources/views/livewire/project/shared/scheduled-task/show.blade.php
index b69463a0e..d448000ca 100644
--- a/resources/views/livewire/project/shared/scheduled-task/show.blade.php
+++ b/resources/views/livewire/project/shared/scheduled-task/show.blade.php
@@ -42,6 +42,6 @@
 
     <div class="pt-4">
         <h3 class="py-4">Recent executions <span class="text-xs text-neutral-500">(click to check output)</span></h3>
-        <livewire:project.shared.scheduled-task.executions key="{{ $task->id }}" selectedKey="" :executions="$task->executions->take(-20)" />
+        <livewire:project.shared.scheduled-task.executions :task="$task" key="{{ $task->id }}" selectedKey="" :executions="$task->executions->take(-20)" />
     </div>
-</div>
+</div>
\ No newline at end of file