X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttGroupExportHelper.class.php;h=d2ee6413da56b4bdb0471dccd5bfe6c8ee9ed8b4;hb=a106b7a2db73b3e1fdab428b218212f6f38d7623;hp=41f773d7308e0d2d3b200cb2f3c29368bc43857d;hpb=5bb07193aba175a45ab558116aa8c0caeef02f15;p=timetracker.git diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php index 41f773d7..d2ee6413 100644 --- a/WEB-INF/lib/ttGroupExportHelper.class.php +++ b/WEB-INF/lib/ttGroupExportHelper.class.php @@ -335,11 +335,10 @@ class ttGroupExportHelper { } // Write time log entries and build logMap at the same time. - fwrite($this->file, $this->indentation." \n"); - $key = 0; - foreach ($this->userMap as $key => $value) { - $user_id = $key; - $records = ttTimeHelper::getAllRecords($user_id); + $records = $this->getRecordsFromTable('tt_log'); + if (count($records) > 0) { + fwrite($this->file, $this->indentation." \n"); + $key = 0; foreach ($records as $record) { $key++; $this->logMap[$record['id']] = $key; @@ -347,8 +346,7 @@ class ttGroupExportHelper { $log_part .= " user_id=\"".$this->userMap[$record['user_id']]."\""; $log_part .= " date=\"".$record['date']."\""; $log_part .= " start=\"".$record['start']."\""; - $log_part .= " finish=\"".$record['finish']."\""; - $log_part .= " duration=\"".($record['start']?"":$record['duration'])."\""; + $log_part .= " duration=\"".$record['duration']."\""; $log_part .= " client_id=\"".$this->clientMap[$record['client_id']]."\""; $log_part .= " project_id=\"".$this->projectMap[$record['project_id']]."\""; $log_part .= " task_id=\"".$this->taskMap[$record['task_id']]."\""; @@ -360,10 +358,10 @@ class ttGroupExportHelper { $log_part .= ">\n"; fwrite($this->file, $log_part); } + fwrite($this->file, $this->indentation." \n"); + unset($records); + unset($log_part); } - fwrite($this->file, $this->indentation." \n"); - unset($records); - unset($log_part); // Write custom fields. if (count($custom_fields) > 0) {