X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttGroupExportHelper.class.php;h=9f0465d902e95915a858087398479aee608efe3b;hb=54d64e3d8f517e65577aa47fb6e38114e42f4970;hp=06a3697d05fd1ff8f66edd9eea65fe8642d4f20b;hpb=d4760fcf826cf3e528bd7a8f5301896d16da0266;p=timetracker.git
diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php
index 06a3697d..9f0465d9 100644
--- a/WEB-INF/lib/ttGroupExportHelper.class.php
+++ b/WEB-INF/lib/ttGroupExportHelper.class.php
@@ -331,11 +331,14 @@ class ttGroupExportHelper {
$timesheet_part = $this->indentation.' '."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 .= ">\n";
fwrite($this->file, $timesheet_part);
@@ -384,7 +387,7 @@ class ttGroupExportHelper {
$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 .= " comment=\"".$this->encodeLineBreaks($record['comment'])."\"";
$log_part .= " billable=\"".$record['billable']."\"";
$log_part .= " approved=\"".$record['approved']."\"";
$log_part .= " paid=\"".$record['paid']."\"";
@@ -456,8 +459,7 @@ class ttGroupExportHelper {
$expense_item_part .= " user_id=\"".$this->userMap[$expense_item['user_id']]."\"";
$expense_item_part .= " client_id=\"".$this->clientMap[$expense_item['client_id']]."\"";
$expense_item_part .= " project_id=\"".$this->projectMap[$expense_item['project_id']]."\"";
- $expense_item_part .= " timesheet_id=\"".$this->timesheetMap[$expense_item['timesheet_id']]."\"";
- $expense_item_part .= " name=\"".htmlspecialchars($expense_item['name'])."\"";
+ $expense_item_part .= " name=\"".$this->encodeLineBreaks($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']."\"";
@@ -486,6 +488,23 @@ class ttGroupExportHelper {
unset($predefined_expense_part);
}
+ // Write templates.
+ $templates = $this->getRecordsFromTable('tt_templates');
+ if (count($templates) > 0) {
+ fwrite($this->file, $this->indentation." \n");
+ foreach ($templates as $template) {
+ $template_part = $this->indentation.' '."encodeLineBreaks($template['content'])."\"";
+ $template_part .= " status=\"".$template['status']."\"";
+ $template_part .= ">\n";
+ fwrite($this->file, $template_part);
+ }
+ fwrite($this->file, $this->indentation." \n");
+ unset($templates);
+ unset($template_part);
+ }
+
// Write monthly quotas.
$quotas = ttTeamHelper::getMonthlyQuotas($this->group_id);
if (count($quotas) > 0) {
@@ -615,4 +634,18 @@ class ttGroupExportHelper {
fwrite($this->file, $this->indentation."\n");
}
+
+ // encodeLineBreaks encodes line breaks with an escape sequence.
+ // We do this, because our strings are attribute values inside XML tags.
+ //
+ // If we don't, we lose line breaks after importing data because
+ // XML parser converts line breaks into a single white character.
+ //
+ // TODO: investigate whether we need to encode \t, etc.
+ private function encodeLineBreaks($source) {
+ $result = htmlspecialchars($source);
+ $result = str_replace ("\n", '
', $result);
+ $result = str_replace ("\r", '
', $result);
+ return $result;
+ }
}