From 40263b0f447ad572e5ba029bbaf9e5c47c4329bb Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Mon, 5 Nov 2018 18:39:12 +0000 Subject: [PATCH] More progress on new export, adding users to output. --- WEB-INF/lib/ttGroupExportHelper.class.php | 77 ++++++++++++++++++++++- WEB-INF/templates/footer.tpl | 2 +- 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php index 364f984d..56533e10 100644 --- a/WEB-INF/lib/ttGroupExportHelper.class.php +++ b/WEB-INF/lib/ttGroupExportHelper.class.php @@ -38,6 +38,12 @@ class ttGroupExportHelper { var $indentation = null; // A string consisting of a number of spaces. var $subgroups = array(); // Immediate subgroups. + // The following arrays are maps between entity ids in the file versus the database. + // We write to the file sequentially (1,2,3...) while in the database the entities have different ids. + var $userMap = array(); // User ids. + var $roleMap = array(); // Role ids. + var $clientMap = array(); // Client ids. + // Constructor. function __construct($group_id, $file, $indentation) { global $user; @@ -61,8 +67,8 @@ class ttGroupExportHelper { // getGroupData obtains group attributes for export. function getGroupData() { global $user; - $mdb2 = getConnection(); + $sql = "select name, currency, lang from tt_groups". " where status = 1 and id = $this->group_id and org_id = $user->org_id"; $res = $mdb2->query($sql); @@ -72,6 +78,42 @@ class ttGroupExportHelper { return $val; } + // The getUsers obtains all users in group for the purpose of export. + function getUsers() { + global $user; + $mdb2 = getConnection(); + + $sql = "select u.*, r.rank from tt_users u left join tt_roles r on (u.role_id = r.id)". + " where u.group_id = $this->group_id and u.org_id = $user->org_id order by upper(u.name)"; // Note: deleted users are included. + $res = $mdb2->query($sql); + $result = array(); + if (!is_a($res, 'PEAR_Error')) { + while ($val = $res->fetchRow()) { + $result[] = $val; + } + return $result; + } + return false; + } + + // getRoles - obtains all roles defined for group. + function getRoles() { + global $user; + $mdb2 = getConnection(); + + $result = array(); + $sql = "select * from tt_roles where group_id = $this->group_id"; // and org_id = $user->org_id <-- add this when possible + $res = $mdb2->query($sql); + $result = array(); + if (!is_a($res, 'PEAR_Error')) { + while ($val = $res->fetchRow()) { + $result[] = $val; + } + return $result; + } + return false; + } + // writeData writes group data into file. function writeData() { @@ -86,6 +128,39 @@ class ttGroupExportHelper { // Write group info. fwrite($this->file, $this->indentation.$group_part); + // Prepare user map. + $users = $this->getUsers(); + foreach ($users as $key=>$user_item) + $this->userMap[$user_item['id']] = $key + 1; + + // Prepare role map. + $roles = $this->getRoles(); + foreach ($roles as $key=>$role_item) + $this->roleMap[$role_item['id']] = $key + 1; + + // Prepare client map. + $clients = ttTeamHelper::getAllClients($this->group_id, true); + foreach ($clients as $key=>$client_item) + $this->clientMap[$client_item['id']] = $key + 1; + + // Write users. + fwrite($this->file, $this->indentation."\n"); + foreach ($users as $user_item) { + $role_id = $user_item['rank'] == 512 ? 0 : $this->roleMap[$user_item['role_id']]; // Special role_id 0 (not null) for top manager. + $user_part = $this->indentation.' '."userMap[$user_item['id']]."\""; + $user_part .= " name=\"".htmlentities($user_item['name'])."\""; + $user_part .= " login=\"".htmlentities($user_item['login'])."\""; + $user_part .= " password=\"".$user_item['password']."\""; + $user_part .= " role_id=\"".$role_id."\""; + $user_part .= " client_id=\"".$this->clientMap[$user_item['client_id']]."\""; + $user_part .= " rate=\"".$user_item['rate']."\""; + $user_part .= " email=\"".$user_item['email']."\""; + $user_part .= " status=\"".$user_item['status']."\""; + $user_part .= ">\n"; + fwrite($this->file, $user_part); + } + fwrite($this->file, $this->indentation."\n"); + // Call self recursively for all subgroups. foreach ($this->subgroups as $subgroup) { $subgroup_helper = new ttGroupExportHelper($subgroup['id'], $this->file, $this->indentation.' '); diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 058c96fe..959fe31d 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.07.4368 | Copyright © Anuko | +  Anuko Time Tracker 1.18.07.4369 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1