// Write group info.
$group = $this->getGroupAttrs();
- $group_part = "<group name=\"".htmlspecialchars($group['name'])."\"";
+ $group_part = "<group group_key=\"".htmlspecialchars($group['group_key'])."\"";
+ $group_part .= " name=\"".htmlspecialchars($group['name'])."\"";
$group_part .= " description=\"".htmlspecialchars($group['description'])."\"";
$group_part .= " currency=\"".htmlspecialchars($group['currency'])."\"";
$group_part .= " decimal_mark=\"".$group['decimal_mark']."\"";
$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);
$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']."\"";
fwrite($this->file, $this->indentation." <custom_fields>\n");
foreach ($custom_fields as $custom_field) {
$custom_field_part = $this->indentation.' '."<custom_field id=\"".$this->customFieldMap[$custom_field['id']]."\"";
+ $custom_field_part .= " entity_type=\"".$custom_field['entity_type']."\"";
$custom_field_part .= " type=\"".$custom_field['type']."\"";
$custom_field_part .= " label=\"".htmlspecialchars($custom_field['label'])."\"";
$custom_field_part .= " required=\"".$custom_field['required']."\"";
$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 .= " 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']."\"";
$expense_item_part .= " paid=\"".$expense_item['paid']."\"";
$expense_item_part .= " status=\"".$expense_item['status']."\"";
$expense_item_part .= "></expense_item>\n";
unset($predefined_expense_part);
}
+ // Write templates.
+ $templates = $this->getRecordsFromTable('tt_templates');
+ if (count($templates) > 0) {
+ fwrite($this->file, $this->indentation." <templates>\n");
+ foreach ($templates as $template) {
+ $template_part = $this->indentation.' '."<template name=\"".htmlspecialchars($template['name'])."\"";
+ $template_part .= " description=\"".htmlspecialchars($template['description'])."\"";
+ $template_part .= " content=\"".$this->encodeLineBreaks($template['content'])."\"";
+ $template_part .= " status=\"".$template['status']."\"";
+ $template_part .= "></template>\n";
+ fwrite($this->file, $template_part);
+ }
+ fwrite($this->file, $this->indentation." </templates>\n");
+ unset($templates);
+ unset($template_part);
+ }
+
// Write monthly quotas.
$quotas = ttTeamHelper::getMonthlyQuotas($this->group_id);
if (count($quotas) > 0) {
$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']."\"";
$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);
}
fwrite($this->file, $this->indentation."</group>\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;
+ }
}
projects / timetracker.git / blobdiff