Dropped timesheet_id from tt_expense_items and simplified sql.

[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 aa9ec8c..7810c79 100644 (file)
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -331,11 +331,14 @@ class ttGroupExportHelper {
         $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 .= " project_id=\"".$this->projectMap[$timesheet_item['project_id']]."\"";
         $timesheet_part .= " name=\"".htmlspecialchars($timesheet_item['name'])."\"";
+        $timesheet_part .= " comment=\"".htmlspecialchars($timesheet_item['comment'])."\"";
+        $timesheet_part .= " start_date=\"".$timesheet_item['start_date']."\"";
+        $timesheet_part .= " end_date=\"".$timesheet_item['end_date']."\"";
         $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 .= " approve_status=\"".$timesheet_item['approve_status']."\"";
+        $timesheet_part .= " approve_comment=\"".htmlspecialchars($timesheet_item['approve_comment'])."\"";
         $timesheet_part .= " status=\"".$timesheet_item['status']."\"";
         $timesheet_part .= "></timesheet>\n";
         fwrite($this->file, $timesheet_part);
@@ -459,6 +462,7 @@ class ttGroupExportHelper {
         $expense_item_part .= " name=\"".htmlspecialchars($expense_item['name'])."\"";
         $expense_item_part .= " cost=\"".$expense_item['cost']."\"";
         $expense_item_part .= " invoice_id=\"".$this->invoiceMap[$expense_item['invoice_id']]."\"";
+        $expense_item_part .= " approved=\"".$expense_item['approved']."\"";
         $expense_item_part .= " paid=\"".$expense_item['paid']."\"";
         $expense_item_part .= " status=\"".$expense_item['status']."\"";
         $expense_item_part .= "></expense_item>\n";
@@ -520,6 +524,10 @@ class ttGroupExportHelper {
         $fav_report_part .= " project_id=\"".$this->projectMap[$fav_report['project_id']]."\"";
         $fav_report_part .= " task_id=\"".$this->taskMap[$fav_report['task_id']]."\"";
         $fav_report_part .= " billable=\"".$fav_report['billable']."\"";
+        $fav_report_part .= " approved=\"".$fav_report['approved']."\"";
+        $fav_report_part .= " invoice=\"".$fav_report['invoice']."\"";
+        $fav_report_part .= " timesheet=\"".$fav_report['timesheet']."\"";
+        $fav_report_part .= " paid_status=\"".$fav_report['paid_status']."\"";
         $fav_report_part .= " users=\"".$user_list."\"";
         $fav_report_part .= " period=\"".$fav_report['period']."\"";
         $fav_report_part .= " period_start=\"".$fav_report['period_start']."\"";
@@ -529,18 +537,20 @@ class ttGroupExportHelper {
         $fav_report_part .= " show_paid=\"".$fav_report['show_paid']."\"";
         $fav_report_part .= " show_ip=\"".$fav_report['show_ip']."\"";
         $fav_report_part .= " show_project=\"".$fav_report['show_project']."\"";
+        $fav_report_part .= " show_timesheet=\"".$fav_report['show_timesheet']."\"";
         $fav_report_part .= " show_start=\"".$fav_report['show_start']."\"";
         $fav_report_part .= " show_duration=\"".$fav_report['show_duration']."\"";
         $fav_report_part .= " show_cost=\"".$fav_report['show_cost']."\"";
         $fav_report_part .= " show_task=\"".$fav_report['show_task']."\"";
         $fav_report_part .= " show_end=\"".$fav_report['show_end']."\"";
         $fav_report_part .= " show_note=\"".$fav_report['show_note']."\"";
+        $fav_report_part .= " show_approved=\"".$fav_report['show_approved']."\"";
+        $fav_report_part .= " show_totals_only=\"".$fav_report['show_totals_only']."\"";
         $fav_report_part .= " show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"";
         $fav_report_part .= " show_work_units=\"".$fav_report['show_work_units']."\"";
         $fav_report_part .= " group_by1=\"".$fav_report['group_by1']."\"";
         $fav_report_part .= " group_by2=\"".$fav_report['group_by2']."\"";
         $fav_report_part .= " group_by3=\"".$fav_report['group_by3']."\"";
-        $fav_report_part .= " show_totals_only=\"".$fav_report['show_totals_only']."\"";
         $fav_report_part .= "></fav_report>\n";
         fwrite($this->file, $fav_report_part);
       }