Merge pull request #9732 from turbo124/v5-develop

Fixes for task imports
This commit is contained in:
David Bomba 2024-07-07 08:36:36 +10:00 committed by GitHub
commit 9c7a694ef2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -117,10 +117,15 @@ class TaskRepository extends BaseRepository
} }
$key_values = array_column($time_log, 0); $key_values = array_column($time_log, 0);
if(count($key_values) > 0)
array_multisort($key_values, SORT_ASC, $time_log); array_multisort($key_values, SORT_ASC, $time_log);
foreach($time_log as $key => $value) { foreach($time_log as $key => $value) {
if(is_array($time_log[$key]) && count($time_log[$key]) >=2)
$time_log[$key][1] = $this->roundTimeLog($time_log[$key][0], $time_log[$key][1]); $time_log[$key][1] = $this->roundTimeLog($time_log[$key][0], $time_log[$key][1]);
} }
if (isset($data['action'])) { if (isset($data['action'])) {