More refactoring for subgroups.

[timetracker.git] / WEB-INF / lib / ttGroupExportHelper.class.php

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 41f773d..d2ee641 100644 (file)
--- 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."  <log>\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."  <log>\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 .= "></log_item>\n";
         fwrite($this->file, $log_part);
       }
+      fwrite($this->file, $this->indentation."  </log>\n");
+      unset($records);
+      unset($log_part);
     }
-    fwrite($this->file, $this->indentation."  </log>\n");
-    unset($records);
-    unset($log_part);
 
     // Write custom fields.
     if (count($custom_fields) > 0) {