From 72d67df9d37ae1f3a8a7711b2c7e101e3904fafc Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 23 Mar 2024 07:53:56 +1100 Subject: [PATCH] Improvements to task exports --- app/DataProviders/Domains.php | 3 +++ app/Export/CSV/TaskExport.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/DataProviders/Domains.php b/app/DataProviders/Domains.php index f4c025b0b151..a26b843b454b 100644 --- a/app/DataProviders/Domains.php +++ b/app/DataProviders/Domains.php @@ -12,6 +12,9 @@ namespace App\DataProviders; +/** + * Class Domain. + */ class Domains { private static array $verify_domains = [ diff --git a/app/Export/CSV/TaskExport.php b/app/Export/CSV/TaskExport.php index e70609307bdb..2010b112e06f 100644 --- a/app/Export/CSV/TaskExport.php +++ b/app/Export/CSV/TaskExport.php @@ -197,7 +197,7 @@ class TaskExport extends BaseExport if (in_array('task.duration', $this->input['report_keys']) || in_array('duration', $this->input['report_keys'])) { $seconds = $task->calcDuration(); $entity['task.duration'] = $seconds; - $entity['task.duration_words'] = CarbonInterval::seconds($seconds)->locale($this->company->locale())->cascade()->forHumans(); + $entity['task.duration_words'] = $seconds > 86400 ? CarbonInterval::seconds($seconds)->locale($this->company->locale())->cascade()->forHumans() : now()->startOfDay()->addSeconds($seconds)->format('H:i:s'); } $entity = $this->decorateAdvancedFields($task, $entity);