var $canImport = true; // False if we cannot import data due to a login collision.
var $groupData = array(); // Array of group data such as group name, etc.
+ var $org_id = null; // New organization id we are importing. It is created during the import operation.
var $group_id = null; // New group id we are importing. It is created during the import operation.
var $roles = array(); // Array of arrays of role properties.
var $users = array(); // Array of arrays of user properties.
var $logMap = array(); // Time log ids.
// Constructor.
- function ttImportHelper(&$errors) {
+ function __construct(&$errors) {
$this->errors = &$errors;
}
// Now we can create a group.
if ($this->canImport) {
$this->top_role_id = ttRoleHelper::getRoleByRank(512, 0);
- $group_id = ttTeamHelper::insert(array(
+ $group_id = $this->createGroup(array(
'name' => $this->groupData['NAME'],
'currency' => $this->groupData['CURRENCY'],
'decimal_mark' => $this->groupData['DECIMAL_MARK'],
'task_required' => $this->groupData['TASK_REQUIRED'],
'record_type' => $this->groupData['RECORD_TYPE'],
'bcc_email' => $this->groupData['BCC_EMAIL'],
+ 'allow_ip' => $this->groupData['ALLOW_IP'],
+ 'password_complexity' => $this->groupData['PASSWORD_COMPLEXITY'],
'plugins' => $this->groupData['PLUGINS'],
'lock_spec' => $this->groupData['LOCK_SPEC'],
'workday_minutes' => $this->groupData['WORKDAY_MINUTES'],
'config' => $this->groupData['CONFIG']));
if ($group_id) {
+ $this->org_id = $group_id;
$this->group_id = $group_id;
// Create roles.
foreach ($this->roles as $key=>$role_item) {
$role_id = ttRoleHelper::insert(array(
'group_id' => $this->group_id,
+ 'org_id' => $this->org_id,
'name' => $role_item['NAME'],
+ 'description' => $role_item['DESCRIPTION'],
'rank' => $role_item['RANK'],
'rights' => $role_item['RIGHTS'],
'status' => $role_item['STATUS']));
$role_id = $user_item['ROLE_ID'] === '0' ? $this->top_role_id : $this->roleMap[$user_item['ROLE_ID']]; // 0 (not null) means top manager role.
$user_id = ttUserHelper::insert(array(
'group_id' => $this->group_id,
+ 'org_id' => $this->org_id,
'role_id' => $role_id,
'client_id' => $user_item['CLIENT_ID'], // Note: NOT mapped value, replaced in CLIENT handler.
'name' => $user_item['NAME'],
$this->taskMap[$this->currentElement['ID']] =
ttTaskHelper::insert(array(
'group_id' => $this->group_id,
+ 'org_id' => $this->org_id,
'name' => $this->currentElement['NAME'],
'description' => $this->currentElement['DESCRIPTION'],
'status' => $this->currentElement['STATUS']));
$this->projectMap[$this->currentElement['ID']] =
ttProjectHelper::insert(array(
'group_id' => $this->group_id,
+ 'org_id' => $this->org_id,
'name' => $this->currentElement['NAME'],
'description' => $this->currentElement['DESCRIPTION'],
'tasks' => $mapped_tasks,
'status' => $this->currentElement['STATUS']));
}
if ($name == 'USER_PROJECT_BIND' && $this->canImport) {
- ttUserHelper::insertBind(
- $this->userMap[$this->currentElement['USER_ID']],
- $this->projectMap[$this->currentElement['PROJECT_ID']],
- $this->currentElement['RATE'],
- $this->currentElement['STATUS']);
+ ttUserHelper::insertBind(array(
+ 'user_id' => $this->userMap[$this->currentElement['USER_ID']],
+ 'project_id' => $this->projectMap[$this->currentElement['PROJECT_ID']],
+ 'group_id' => $this->group_id,
+ 'org_id' => $this->org_id,
+ 'rate' => $this->currentElement['RATE'],
+ 'status' => $this->currentElement['STATUS']));
}
if ($name == 'CLIENT' && $this->canImport) {
$this->clientMap[$this->currentElement['ID']] =
ttClientHelper::insert(array(
'group_id' => $this->group_id,
+ 'org_id' => $this->org_id,
'name' => $this->currentElement['NAME'],
'address' => $this->currentElement['ADDRESS'],
'tax' => $this->currentElement['TAX'],
$this->invoiceMap[$this->currentElement['ID']] =
ttInvoiceHelper::insert(array(
'group_id' => $this->group_id,
+ 'org_id' => $this->org_id,
'name' => $this->currentElement['NAME'],
'date' => $this->currentElement['DATE'],
'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
- 'discount' => $this->currentElement['DISCOUNT'],
'status' => $this->currentElement['STATUS']));
}
$this->logMap[$this->currentElement['ID']] =
ttTimeHelper::insert(array(
'user_id' => $this->userMap[$this->currentElement['USER_ID']],
+ 'group_id' => $this->group_id,
+ 'org_id' => $this->org_id,
'date' => $this->currentElement['DATE'],
'start' => $this->currentElement['START'],
'finish' => $this->currentElement['FINISH'],
ttExpenseHelper::insert(array(
'date' => $this->currentElement['DATE'],
'user_id' => $this->userMap[$this->currentElement['USER_ID']],
+ 'group_id' => $this->group_id,
'client_id' => $this->clientMap[$this->currentElement['CLIENT_ID']],
'project_id' => $this->projectMap[$this->currentElement['PROJECT_ID']],
'name' => $this->currentElement['NAME'],
'chfinish' => (int) $this->currentElement['SHOW_END'],
'chnote' => (int) $this->currentElement['SHOW_NOTE'],
'chcf_1' => (int) $this->currentElement['SHOW_CUSTOM_FIELD_1'],
- 'group_by' => $this->currentElement['GROUP_BY'],
+ 'chunits' => (int) $this->currentElement['SHOW_WORK_UNITS'],
+ 'group_by1' => $this->currentElement['GROUP_BY1'],
+ 'group_by2' => $this->currentElement['GROUP_BY2'],
+ 'group_by3' => $this->currentElement['GROUP_BY3'],
'chtotalsonly' => (int) $this->currentElement['SHOW_TOTALS_ONLY']));
}
$this->currentTag = '';
|| $this->currentTag == 'LABEL'
|| $this->currentTag == 'VALUE'
|| $this->currentTag == 'COMMENT'
- || $this->currentTag == 'ADDRESS') {
+ || $this->currentTag == 'ADDRESS'
+ || $this->currentTag == 'ALLOW_IP'
+ || $this->currentTag == 'PASSWORD_COMPLEXITY') {
if (isset($this->currentElement[$this->currentTag]))
$this->currentElement[$this->currentTag] .= trim($data);
else
return true;
}
+ // createGroup function creates a new group.
+ private function createGroup($fields) {
+
+ global $user;
+ $mdb2 = getConnection();
+
+ $columns = '(name, currency, decimal_mark, lang, date_format, time_format, week_start, tracking_mode'.
+ ', project_required, task_required, record_type, bcc_email, allow_ip, password_complexity, plugins'.
+ ', lock_spec, workday_minutes, config, created, created_ip, created_by)';
+
+ $values = ' values ('.$mdb2->quote(trim($fields['name']));
+ $values .= ', '.$mdb2->quote(trim($fields['currency']));
+ $values .= ', '.$mdb2->quote($fields['decimal_mark']);
+ $values .= ', '.$mdb2->quote($fields['lang']);
+ $values .= ', '.$mdb2->quote($fields['date_format']);
+ $values .= ', '.$mdb2->quote($fields['time_format']);
+ $values .= ', '.(int)$fields['week_start'];
+ $values .= ', '.(int)$fields['tracking_mode'];
+ $values .= ', '.(int)$fields['project_required'];
+ $values .= ', '.(int)$fields['task_required'];
+ $values .= ', '.(int)$fields['record_type'];
+ $values .= ', '.$mdb2->quote($fields['bcc_email']);
+ $values .= ', '.$mdb2->quote($fields['allow_ip']);
+ $values .= ', '.$mdb2->quote($fields['password_complexity']);
+ $values .= ', '.$mdb2->quote($fields['plugins']);
+ $values .= ', '.$mdb2->quote($fields['lock_spec']);
+ $values .= ', '.(int)$fields['workday_minutes'];
+ $values .= ', '.$mdb2->quote($fields['config']);
+ $values .= ', now(), '.$mdb2->quote($_SERVER['REMOTE_ADDR']).', '.$mdb2->quote($user->id);
+ $values .= ')';
+
+ $sql = 'insert into tt_groups '.$columns.$values;
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error')) return false;
+
+ $group_id = $mdb2->lastInsertID('tt_groups', 'id');
+
+ // Update org_id with group_id.
+ // NOTE: Both export and import need an additional effort to properly operate on subgroups.
+ // Currently we are importing one group only, which becomes a top level group.
+ $sql = "update tt_groups set org_id = $group_id where org_id is NULL and id = $group_id";
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error')) return false;
+
+ return $group_id;
+ }
+
// insertMonthlyQuota - a helper function to insert a monthly quota.
private function insertMonthlyQuota($group_id, $year, $month, $minutes) {
$mdb2 = getConnection();
projects / timetracker.git / blobdiff