X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2FttExportHelper.class.php;h=375de2f371caab138d0c49605d01ae8b583ed39e;hb=40e7c879cbbc4f00227c039f1a86d48f81e10101;hp=ef13e2ee9cf6e27c75bebaf564918d9ef2777749;hpb=ecbf1ecf19bfeb85794717fc7a6deb7ecc8c5f58;p=timetracker.git
diff --git a/WEB-INF/lib/ttExportHelper.class.php b/WEB-INF/lib/ttExportHelper.class.php
index ef13e2ee..375de2f3 100644
--- a/WEB-INF/lib/ttExportHelper.class.php
+++ b/WEB-INF/lib/ttExportHelper.class.php
@@ -36,6 +36,7 @@ class ttExportHelper {
// 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 $projectMap = array(); // Project ids.
var $taskMap = array(); // Task ids.
var $clientMap = array(); // Client ids.
@@ -71,8 +72,13 @@ class ttExportHelper {
fwrite($file, " team."]]>\n");
fwrite($file, "\n");
+ // Prepare role map.
+ $roles = $this->getRoles();
+ foreach ($roles as $key=>$role_item)
+ $this->roleMap[$role_item['id']] = $key + 1;
+
// Prepare user map.
- $users = ttTeamHelper::getAllUsers($user->team_id, true);
+ $users = $this->getUsers();
foreach ($users as $key=>$user_item)
$this->userMap[$user_item['id']] = $key + 1;
@@ -106,10 +112,22 @@ class ttExportHelper {
foreach ($custom_field_options as $key=>$option)
$this->customFieldOptionMap[$option['id']] = $key + 1;
+ // Write roles.
+ fwrite($file, "\n");
+ foreach ($roles as $role) {
+ fwrite($file, " roleMap[$role['id']]."\" rank=\"".$role['rank']."\"".
+ " rights=\"".$role['rights']."\" status=\"".$role['status']."\">\n");
+ fwrite($file, " \n");
+ fwrite($file, " \n");
+ }
+ fwrite($file, "\n");
+ unset($roles);
+
// Write users.
fwrite($file, "\n");
foreach ($users as $user_item) {
- fwrite($file, " userMap[$user_item['id']]."\" login=\"".htmlentities($user_item['login'])."\" password=\"".$user_item['password']."\" role=\"".$user_item['role']."\" client_id=\"".$this->clientMap[$user_item['client_id']]."\" rate=\"".$user_item['rate']."\" email=\"".$user_item['email']."\" status=\"".$user_item['status']."\">\n");
+ $role_id = $user_item['rank'] == 512 ? 0 : $this->roleMap[$user_item['role_id']]; // Special role_id 0 (not null) for top manager.
+ fwrite($file, " userMap[$user_item['id']]."\" login=\"".htmlentities($user_item['login'])."\" password=\"".$user_item['password']."\" role_id=\"".$role_id."\" client_id=\"".$this->clientMap[$user_item['client_id']]."\" rate=\"".$user_item['rate']."\" email=\"".$user_item['email']."\" status=\"".$user_item['status']."\">\n");
fwrite($file, " \n");
fwrite($file, " \n");
}
@@ -219,7 +237,7 @@ class ttExportHelper {
foreach ($records as $record) {
$key++;
$this->logMap[$record['id']] = $key;
- fwrite($file, " userMap[$record['user_id']]."\" date=\"".$record['date']."\" start=\"".$record['start']."\" finish=\"".$record['finish']."\" duration=\"".($record['start']?"":$record['duration'])."\" client_id=\"".$this->clientMap[$record['client_id']]."\" project_id=\"".$this->projectMap[$record['project_id']]."\" task_id=\"".$this->taskMap[$record['task_id']]."\" invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\" billable=\"".$record['billable']."\" paid=\"".$record['paid']."\" status=\"".$record['status']."\">\n");
+ fwrite($file, " userMap[$record['user_id']]."\" date=\"".$record['date']."\" start=\"".$record['start']."\" finish=\"".$record['finish']."\" duration=\"".($record['start']?"":$record['duration'])."\" client_id=\"".$this->clientMap[$record['client_id']]."\" project_id=\"".$this->projectMap[$record['project_id']]."\" task_id=\"".$this->taskMap[$record['task_id']]."\" invoice_id=\"".$this->invoiceMap[$record['invoice_id']]."\" billable=\"".$record['billable']."\" paid=\"".$record['paid']."\" status=\"".$record['status']."\">\n");
fwrite($file, " \n");
fwrite($file, " \n");
}
@@ -261,7 +279,7 @@ class ttExportHelper {
$user_list .= (strlen($user_list) == 0? '' : ',').$this->userMap[$v];
}
}
- fwrite($file, "\tuserMap[$fav_report['user_id']]."\"".
+ fwrite($file, " userMap[$fav_report['user_id']]."\"".
" client_id=\"".$this->clientMap[$fav_report['client_id']]."\"".
" cf_1_option_id=\"".$this->customFieldOptionMap[$fav_report['cf_1_option_id']]."\"".
" project_id=\"".$this->projectMap[$fav_report['project_id']]."\"".
@@ -273,6 +291,8 @@ class ttExportHelper {
" period_end=\"".$fav_report['period_end']."\"".
" show_client=\"".$fav_report['show_client']."\"".
" show_invoice=\"".$fav_report['show_invoice']."\"".
+ " show_paid=\"".$fav_report['show_paid']."\"".
+ " show_ip=\"".$fav_report['show_ip']."\"".
" show_project=\"".$fav_report['show_project']."\"".
" show_start=\"".$fav_report['show_start']."\"".
" show_duration=\"".$fav_report['show_duration']."\"".
@@ -283,26 +303,15 @@ class ttExportHelper {
" show_custom_field_1=\"".$fav_report['show_custom_field_1']."\"".
" group_by=\"".$fav_report['group_by']."\"".
" show_totals_only=\"".$fav_report['show_totals_only']."\">\n");
- fwrite($file, "\t\t\n");
- fwrite($file, "\t\n");
+ fwrite($file, " \n");
+ fwrite($file, " \n");
}
fwrite($file, "\n");
unset($fav_reports);
- // Write roles.
- fwrite($file, "\n");
- $roles = ttTeamHelper::getAllRoles($user->team_id);
- foreach ($roles as $role) {
- fwrite($file, "\t\n");
- fwrite($file, "\t\t\n");
- fwrite($file, "\t\n");
- }
- fwrite($file, "\n");
- unset($roles);
-
// Cleanup.
unset($users);
+ $this->roleMap = array();
$this->userMap = array();
$this->projectMap = array();
$this->taskMap = array();
@@ -348,4 +357,56 @@ class ttExportHelper {
fclose ($in_file);
return true;
}
+
+ /*
+ * Note about the utility functions below.
+ * We have roughly 4 groups of operations:
+ * 1) Regular system usage for tracking time, etc.
+ * 2) Registration process - used infrequently.
+ * 3) Admin usage - used infrequently.
+ * 4) Export - used infrequently.
+ *
+ * It is tempting to have a generic function to get things done for
+ * all situations. However, as registration, export and admin access are one-off
+ * operations, while regular system usage is daily and must be efficient,
+ * the current approach is to have SEPARATE functions for each mode.
+ *
+ * This is because each mode requires a slightly different approach,
+ * and we don't want to over-complicate things.
+ */
+
+ // getRoles - obtains all roles defined for team.
+ function getRoles() {
+ global $user;
+ $mdb2 = getConnection();
+
+ $result = array();
+ $sql = "select * from tt_roles where team_id = $user->team_id";
+ $res = $mdb2->query($sql);
+ $result = array();
+ if (!is_a($res, 'PEAR_Error')) {
+ while ($val = $res->fetchRow()) {
+ $result[] = $val;
+ }
+ return $result;
+ }
+ return false;
+ }
+
+ // The getUsers obtains all users in team 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.team_id = $user->team_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;
+ }
}