From e8612865ad9644fad85cd0d6fef32ea07c8acdf9 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Mon, 19 Nov 2018 14:50:44 +0000 Subject: [PATCH] Added notifications to export. --- WEB-INF/lib/ttGroupExportHelper.class.php | 72 ++++++++++++++++++++++- WEB-INF/templates/footer.tpl | 2 +- 2 files changed, 70 insertions(+), 4 deletions(-) diff --git a/WEB-INF/lib/ttGroupExportHelper.class.php b/WEB-INF/lib/ttGroupExportHelper.class.php index 0c56117e..cf64cede 100644 --- a/WEB-INF/lib/ttGroupExportHelper.class.php +++ b/WEB-INF/lib/ttGroupExportHelper.class.php @@ -49,6 +49,7 @@ class ttGroupExportHelper { var $logMap = array(); var $customFieldMap = array(); var $customFieldOptionMap = array(); + var $favReportMap = array(); // Constructor. function __construct($group_id, $file, $indentation) { @@ -102,6 +103,9 @@ class ttGroupExportHelper { return false; } + // TODO: write a generic (private?) get function for exclusive use in this class, that obtains + // all fields from a given table. + // getRoles - obtains all roles defined for group. function getRoles() { global $user; @@ -174,13 +178,49 @@ class ttGroupExportHelper { return false; } + // getFavReports - obtains all favorite reports defined for group. + function getFavReports() { + global $user; + $mdb2 = getConnection(); + + $result = array(); + $sql = "select * from tt_fav_reports where group_id = $this->group_id and org_id = $user->org_id"; + $res = $mdb2->query($sql); + $result = array(); + if (!is_a($res, 'PEAR_Error')) { + while ($val = $res->fetchRow()) { + $result[] = $val; + } + return $result; + } + return false; + } + // getPredefinedExpenses - obtains all predefined expenses for group. function getPredefinedExpenses() { global $user; $mdb2 = getConnection(); $result = array(); - $sql = "select * from tt_predefined_expenses where group_id = $this->group_id"; // TODO: add " and org_id = $user->org_id" when possible. + $sql = "select * from tt_predefined_expenses where group_id = $this->group_id and org_id = $user->org_id"; + $res = $mdb2->query($sql); + $result = array(); + if (!is_a($res, 'PEAR_Error')) { + while ($val = $res->fetchRow()) { + $result[] = $val; + } + return $result; + } + return false; + } + + // getNotifications - obtains all notifications defined for group. + function getNotifications() { + global $user; + $mdb2 = getConnection(); + + $result = array(); + $sql = "select * from tt_cron where group_id = $this->group_id and org_id = $user->org_id"; $res = $mdb2->query($sql); $result = array(); if (!is_a($res, 'PEAR_Error')) { @@ -263,6 +303,11 @@ class ttGroupExportHelper { foreach ($custom_field_options as $key=>$option) $this->customFieldOptionMap[$option['id']] = $key + 1; + // Prepare favorite report map. + $fav_reports = $this->getFavReports(); + foreach ($fav_reports as $key=>$fav_report) + $this->favReportMap[$fav_report['id']] = $key + 1; + // Write roles. fwrite($this->file, $this->indentation." \n"); foreach ($roles as $role) { @@ -514,7 +559,7 @@ class ttGroupExportHelper { unset($quota_part); // Write fav reports. - $fav_reports = ttTeamHelper::getFavReports($this->group_id); + $fav_reports = $this->getFavReports(); fwrite($this->file, $this->indentation." \n"); foreach ($fav_reports as $fav_report) { $user_list = ''; @@ -525,7 +570,8 @@ class ttGroupExportHelper { $user_list .= (strlen($user_list) == 0? '' : ',').$this->userMap[$v]; } } - $fav_report_part = $this->indentation.' '."userMap[$fav_report['user_id']]."\""; + $fav_report_part = $this->indentation.' '."favReportMap[$fav_report['id']]."\""; + $fav_report_part .= " user_id=\"".$this->userMap[$fav_report['user_id']]."\""; $fav_report_part .= " name=\"".htmlspecialchars($fav_report['name'])."\""; $fav_report_part .= " client_id=\"".$this->clientMap[$fav_report['client_id']]."\""; $fav_report_part .= " cf_1_option_id=\"".$this->customFieldOptionMap[$fav_report['cf_1_option_id']]."\""; @@ -560,6 +606,26 @@ class ttGroupExportHelper { unset($fav_reports); unset($fav_report_part); + // Write notifications. + $notifications = $this->getNotifications(); + fwrite($this->file, $this->indentation." \n"); + foreach ($notifications as $notification) { + $notification_part = $this->indentation.' '."favReportMap[$notification['report_id']]."\""; + $notification_part .= " email=\"".htmlspecialchars($notification['email'])."\""; + $notification_part .= " cc=\"".htmlspecialchars($notification['cc'])."\""; + $notification_part .= " subject=\"".htmlspecialchars($notification['subject'])."\""; + $notification_part .= " report_condition=\"".htmlspecialchars($notification['report_condition'])."\""; + $notification_part .= " status=\"".$notification['status']."\""; + $notification_part .= ">\n"; + fwrite($this->file, $notification_part); + } + fwrite($this->file, $this->indentation." \n"); + unset($notifications); + unset($notification_part); + // We are mostly done with writing this group data, destroy all maps. unset($this->roleMap); unset($this->userMap); diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index a6340288..855cc77e 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.20.4457 | Copyright © Anuko | +  Anuko Time Tracker 1.18.20.4458 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1