}
// Add self to parent stack.
array_push($this->parents, $this->current_group_id);
- return;
- }
- if ($name == 'ROLES') {
- // If we get here, we have to recycle $currentGroupRoleMap.
- unset($this->currentGroupRoleMap);
- $this->currentGroupRoleMap = array();
- // Role map is reconstructed after processing <role> elements in XML. See below.
+ // Recycle all maps as we are starting to work on new group.
+ // Note that for this to work properly all nested groups must be last entries in xml for each group.
+ unset($this->currentGroupRoleMap); $this->currentGroupRoleMap = array();
+ unset($this->currentGroupTaskMap); $this->currentGroupTaskMap = array();
+ unset($this->currentGroupProjectMap); $this->currentGroupProjectMap = array();
+ unset($this->currentGroupClientMap); $this->currentGroupClientMap = array();
+ unset($this->currentGroupUserMap); $this->currentGroupUserMap = array();
+ unset($this->currentGroupInvoiceMap); $this->currentGroupInvoiceMap = array();
+ unset($this->currentGroupLogMap); $this->currentGroupLogMap = array();
+ unset($this->currentGroupCustomFieldMap); $this->currentGroupCustomFieldMap = array();
+ unset($this->currentGroupCustomFieldOptionMap); $this->currentGroupCustomFieldOptionMap = array();
+ unset($this->currentGroupFavReportMap); $this->currentGroupCustomFavReportMap = array();
return;
}
return;
}
- if ($name == 'TASKS') {
- // If we get here, we have to recycle $currentGroupTaskMap.
- unset($this->currentGroupTaskMap);
- $this->currentGroupTaskMap = array();
- // Task map is reconstructed after processing <task> elements in XML. See below.
- return;
- }
-
if ($name == 'TASK') {
// We get here when processing <task> tags for the current group.
$task_id = ttTaskHelper::insert(array(
if ($task_id) {
// Add a mapping.
$this->currentGroupTaskMap[$attrs['ID']] = $task_id;
- } else $this->errors->add($i18n->get('error.db'));
- return;
- }
-
- if ($name == 'PROJECTS') {
- // If we get here, we have to recycle $currentGroupProjectMap.
- unset($this->currentGroupProjectMap);
- $this->currentGroupProjectMap = array();
- // Project map is reconstructed after processing <project> elements in XML. See below.
+ } else {
+ $this->errors->add($i18n->get('error.db'));
+ }
return;
}
if ($project_id) {
// Add a mapping.
$this->currentGroupProjectMap[$attrs['ID']] = $project_id;
- } else $this->errors->add($i18n->get('error.db'));
- return;
- }
-
- if ($name == 'CLIENTS') {
- // If we get here, we have to recycle $currentGroupClientMap.
- unset($this->currentGroupClientMap);
- $this->currentGroupClientMap = array();
- // Client map is reconstructed after processing <client> elements in XML. See below.
+ } else {
+ $this->errors->add($i18n->get('error.db'));
+ }
return;
}
return;
}
- if ($name == 'USERS') {
- // If we get here, we have to recycle $currentGroupUserMap.
- unset($this->currentGroupUserMap);
- $this->currentGroupUserMap = array();
- // User map is reconstructed after processing <user> elements in XML. See below.
- return;
- }
-
if ($name == 'USER') {
// We get here when processing <user> tags for the current group.
return;
}
- if ($name == 'INVOICES') {
- // If we get here, we have to recycle $currentGroupInvoiceMap.
- unset($this->currentGroupInvoiceMap);
- $this->currentGroupInvoiceMap = array();
- // Invoice map is reconstructed after processing <invoice> elements in XML. See below.
- return;
- }
-
if ($name == 'INVOICE') {
// We get here when processing <invoice> tags for the current group.
$invoice_id = ttInvoiceHelper::insert(array(
return;
}
- if ($name == 'LOG') {
- // If we get here, we have to recycle $currentGroupLogMap.
- unset($this->currentGroupLogMap);
- $this->currentGroupLogMap = array();
- // Log map is reconstructed after processing <log_item> elements in XML. See below.
- return;
- }
-
if ($name == 'LOG_ITEM') {
// We get here when processing <log_item> tags for the current group.
- $log_item_id = ttTimeHelper::insert(array(
+ $log_item_id = $this->insertLogEntry(array(
'user_id' => $this->currentGroupUserMap[$attrs['USER_ID']],
'group_id' => $this->current_group_id,
'org_id' => $this->org_id,
'start' => $attrs['START'],
'finish' => $attrs['FINISH'],
'duration' => $attrs['DURATION'],
- 'client' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
- 'project' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
- 'task' => $this->currentGroupTaskMap[$attrs['TASK_ID']],
- 'invoice' => $this->currentGroupInvoiceMap[$attrs['INVOICE_ID']],
- 'note' => (isset($attrs['COMMENT']) ? $attrs['COMMENT'] : ''),
+ 'client_id' => $this->currentGroupClientMap[$attrs['CLIENT_ID']],
+ 'project_id' => $this->currentGroupProjectMap[$attrs['PROJECT_ID']],
+ 'task_id' => $this->currentGroupTaskMap[$attrs['TASK_ID']],
+ 'invoice_id' => $this->currentGroupInvoiceMap[$attrs['INVOICE_ID']],
+ 'comment' => (isset($attrs['COMMENT']) ? $attrs['COMMENT'] : ''),
'billable' => $attrs['BILLABLE'],
'paid' => $attrs['PAID'],
'status' => $attrs['STATUS']));
return;
}
- if ($name == 'CUSTOM_FIELDS') {
- // If we get here, we have to recycle $currentGroupCustomFieldMap.
- unset($this->currentGroupCustomFieldMap);
- $this->currentGroupCustomFieldMap = array();
- // Custom field map is reconstructed after processing <custom_field> elements in XML. See below.
- return;
- }
-
if ($name == 'CUSTOM_FIELD') {
// We get here when processing <custom_field> tags for the current group.
$custom_field_id = $this->insertCustomField(array(
return;
}
- if ($name == 'CUSTOM_FIELD_OPTIONS') {
- // If we get here, we have to recycle $currentGroupCustomFieldOptionMap.
- unset($this->currentGroupCustomFieldOptionMap);
- $this->currentGroupCustomFieldOptionMap = array();
- // Custom field option map is reconstructed after processing <custom_field_option> elements in XML. See below.
- return;
- }
-
if ($name == 'CUSTOM_FIELD_OPTION') {
// We get here when processing <custom_field_option> tags for the current group.
$custom_field_option_id = $this->insertCustomFieldOption(array(
return;
}
- if ($name == 'FAV_REPORTS') {
- // If we get here, we have to recycle $currentGroupFavReportMap.
- unset($this->currentGroupFavReportMap);
- $this->currentGroupFavReportMap = array();
- // Favorite report map is reconstructed after processing <fav_report> elements in XML. See below.
- return;
- }
-
if ($name == 'FAV_REPORT') {
$user_list = '';
if (strlen($attrs['USERS']) > 0) {
return $last_id;
}
+ // insertLogEntry - a helper function to insert a time log entry.
+ private function insertLogEntry($fields) {
+ global $user;
+ $mdb2 = getConnection();
+
+ $group_id = (int) $fields['group_id'];
+ $org_id = (int) $fields['org_id'];
+ $user_id = (int) $fields['user_id'];
+ $date = $fields['date'];
+ $start = $fields['start'];
+ $duration = $fields['duration'];
+ $client_id = $fields['client_id'];
+ $project_id = $fields['project_id'];
+ $task_id = $fields['task_id'];
+ $invoice_id = $fields['invoice_id'];
+ $comment = $fields['comment'];
+ $billable = (int) $fields['billable'];
+ $paid = (int) $fields['paid'];
+ $status = $fields['status'];
+
+ $sql = "insert into tt_log".
+ " (user_id, group_id, org_id, date, start, duration, client_id, project_id, task_id, invoice_id, comment".
+ ", billable, paid, created, created_ip, created_by, status)".
+ " values ($user_id, $group_id, $org_id".
+ ", ".$mdb2->quote($date).
+ ", ".$mdb2->quote($start).
+ ", ".$mdb2->quote($duration).
+ ", ".$mdb2->quote($client_id).
+ ", ".$mdb2->quote($project_id).
+ ", ".$mdb2->quote($task_id).
+ ", ".$mdb2->quote($invoice_id).
+ ", ".$mdb2->quote($comment).
+ ", $billable, $paid".
+ ", now(), ".$mdb2->quote($_SERVER['REMOTE_ADDR']).", ".$mdb2->quote($user->id).
+ ", ". $mdb2->quote($status).")";
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error')) {
+ $this->errors->add($i18n->get('error.db')); // TODO: review whether or not to add error here in all insert calls.
+ return false;
+ }
+
+ $log_id = $mdb2->lastInsertID('tt_log', 'id');
+ return $log_id;
+ }
+
// insertCustomFieldLogEntry - a helper function to insert a custom field log entry.
private function insertCustomFieldLogEntry($fields) {
$mdb2 = getConnection();
projects / timetracker.git / blobdiff