X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/a2c6a874b43c46bd110fc8f6d5faf9796e931d8d..9fa13d0babab9e51a19824ec7ef64830cf530fb2:/WEB-INF/lib/ttGroupExportHelper.class.php

diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index d2ee6413..aa9ec8cf 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -42,6 +42,7 @@ class ttGroupExportHelper {
   var $taskMap    = array();
   var $projectMap = array();
   var $clientMap  = array();
+  var $timesheetMap = array();
   var $invoiceMap = array();
   var $logMap     = array();
   var $customFieldMap = array();
@@ -174,6 +175,11 @@ class ttGroupExportHelper {
     foreach ($clients as $key=>$client_item)
       $this->clientMap[$client_item['id']] = $key + 1;
 
+    // Prepare timesheet map.
+    $timesheets = $this->getRecordsFromTable('tt_timesheets');
+    foreach ($timesheets as $key=>$timesheet_item)
+      $this->timesheetMap[$timesheet_item['id']] = $key + 1;
+
     // Prepare invoice map.
     $invoices = ttTeamHelper::getAllInvoices();
     foreach ($invoices as $key=>$invoice_item)
@@ -288,6 +294,7 @@ class ttGroupExportHelper {
         $user_part .= " role_id=\"".$role_id."\"";
         $user_part .= " client_id=\"".$this->clientMap[$user_item['client_id']]."\"";
         $user_part .= " rate=\"".$user_item['rate']."\"";
+        $user_part .= " quota_percent=\"".$user_item['quota_percent']."\"";
         $user_part .= " email=\"".$user_item['email']."\"";
         $user_part .= " status=\"".$user_item['status']."\"";
         $user_part .= "></user>\n";
@@ -317,6 +324,27 @@ class ttGroupExportHelper {
       unset($bind_part);
     }
 
+    // Write timesheets.
+    if (count($timesheets) > 0) {
+      fwrite($this->file, $this->indentation."  <timesheets>\n");
+      foreach ($timesheets as $timesheet_item) {
+        $timesheet_part = $this->indentation.'    '."<timesheet id=\"".$this->timesheetMap[$timesheet_item['id']]."\"";
+        $timesheet_part .= " user_id=\"".$this->userMap[$timesheet_item['user_id']]."\"";
+        $timesheet_part .= " client_id=\"".$this->clientMap[$timesheet_item['client_id']]."\"";
+        $timesheet_part .= " name=\"".htmlspecialchars($timesheet_item['name'])."\"";
+        $timesheet_part .= " submit_status=\"".$timesheet_item['submit_status']."\"";
+        $timesheet_part .= " submitter_comment=\"".htmlspecialchars($timesheet_item['submitter_name'])."\"";
+        $timesheet_part .= " approval_status=\"".$timesheet_item['approval_status']."\"";
+        $timesheet_part .= " manager_comment=\"".htmlspecialchars($timesheet_item['manager_comment'])."\"";
+        $timesheet_part .= " status=\"".$timesheet_item['status']."\"";
+        $timesheet_part .= "></timesheet>\n";
+        fwrite($this->file, $timesheet_part);
+      }
+      fwrite($this->file, $this->indentation."  </timesheets>\n");
+      unset($timesheets);
+      unset($timesheet_part);
+    }
+
     // Write invoices.
     if (count($invoices) > 0) {
       fwrite($this->file, $this->indentation."  <invoices>\n");
@@ -335,6 +363,10 @@ class ttGroupExportHelper {
     }
 
     // Write time log entries and build logMap at the same time.
+    // TODO: big data sets get us out of memory error.
+    // We need to optimize this by working on smaller result sets at a time.
+    // tt_log is one potentially large table, but so may be others.
+    // Refactor this during next round of work here.
     $records = $this->getRecordsFromTable('tt_log');
     if (count($records) > 0) {
       fwrite($this->file, $this->indentation."  <log>\n");
@@ -350,9 +382,11 @@ class ttGroupExportHelper {
         $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']]."\"";
+        $log_part .= " timesheet_id=\"".$this->timesheetMap[$record['timesheet_id']]."\"";
         $log_part .= " invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\"";
         $log_part .= " comment=\"".htmlspecialchars($record['comment'])."\"";
         $log_part .= " billable=\"".$record['billable']."\"";
+        $log_part .= " approved=\"".$record['approved']."\"";
         $log_part .= " paid=\"".$record['paid']."\"";
         $log_part .= " status=\"".$record['status']."\"";
         $log_part .= "></log_item>\n";