// | https://www.anuko.com/time_tracker/credits.htm
// +----------------------------------------------------------------------+
-import('ttTeamHelper');
+import('ttGroupHelper');
// Class ttFavReportHelper is used to help with favorite report related tasks.
class ttFavReportHelper {
return false;
}
+ // get - returns a report identified by its id for user.
+ static function get($id) {
+ global $user;
+ $mdb2 = getConnection();
+
+ $user_id = $user->getUser();
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
+ $sql = "select * from tt_fav_reports".
+ " where id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id and status = 1";
+ $res = $mdb2->query($sql);
+ if (!is_a($res, 'PEAR_Error')) {
+ if ($val = $res->fetchRow()) {
+ return $val;
+ }
+ }
+ return false;
+ }
// getReport - returns a report identified by its id.
+ // TODO: get rid of this function by encapsulating all cron related tasks in its own class.
+ // Because cron works for all orgs and we want this class to always work in context of
+ // a logged on user, for better security.
static function getReport($id) {
$mdb2 = getConnection();
}
// getReportByName - returns a report identified by its name.
- static function getReportByName($user_id, $report_name) {
+ static function getReportByName($report_name) {
+ global $user;
$mdb2 = getConnection();
- $sql = "select * from tt_fav_reports where user_id = $user_id and status = 1 and name = ".$mdb2->quote($report_name);
+ $user_id = $user->getUser();
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
+ $sql = "select id from tt_fav_reports".
+ " where user_id = $user_id and group_id = $group_id and org_id = $org_id and status = 1 and name = ".$mdb2->quote($report_name);
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
if ($val = $res->fetchRow()) {
global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
$group_id = $user->getGroup();
$org_id = $user->org_id;
" show_task, show_end, show_note, show_custom_field_1, show_work_units,".
" group_by1, group_by2, group_by3, show_totals_only)".
" values(".
- $mdb2->quote($fields['name']).", ".$fields['user_id'].", $group_id, $org_id, ".
+ $mdb2->quote($fields['name']).", $user_id, $group_id, $org_id, ".
$mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
$mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
$mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['invoice']).", ".
}
// updateReport - updates report options in the database.
- function updateReport($fields) {
+ static function updateReport($fields) {
+ global $user;
$mdb2 = getConnection();
+
+ $user_id = $user->getUser();
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
$sql = "update tt_fav_reports set ".
"name = ".$mdb2->quote($fields['name']).", ".
"client_id = ".$mdb2->quote($fields['client']).", ".
"group_by2 = ".$mdb2->quote($fields['group_by2']).", ".
"group_by3 = ".$mdb2->quote($fields['group_by3']).", ".
"show_totals_only = ".$fields['chtotalsonly'].
- " where id = ".$fields['id'];
+ " where id = ".$fields['id']." and user_id = $user_id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
}
// saveReport - saves report options in the database.
- static function saveReport($user_id, $bean) {
+ static function saveReport($bean) {
global $user;
// Set default value of 0 for not set checkboxes (in bean).
$users = join(',', $users_in_bean);
}
if ($bean->getAttribute('start_date')) {
- $dt = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
+ $dt = new DateAndTime($user->getDateFormat(), $bean->getAttribute('start_date'));
$from = $dt->toString(DB_DATEFORMAT);
}
if ($bean->getAttribute('end_date')) {
- $dt = new DateAndTime($user->date_format, $bean->getAttribute('end_date'));
+ $dt = new DateAndTime($user->getDateFormat(), $bean->getAttribute('end_date'));
$to = $dt->toString(DB_DATEFORMAT);
}
'chtotalsonly'=>$bean->getAttribute('chtotalsonly'));
$id = false;
- $report = ttFavReportHelper::getReportByName($user_id, $fields['name']);
+ $report = ttFavReportHelper::getReportByName($fields['name']);
if ($report) {
$fields['id'] = $report['id'];
$id = ttFavReportHelper::updateReport($fields);
} else {
- $fields['user_id'] = $user_id;
$id = ttFavReportHelper::insertReport($fields);
}
// deleteReport - deletes a favorite report.
static function deleteReport($id) {
+ global $user;
$mdb2 = getConnection();
- $sql = "delete from tt_fav_reports where id = $id";
+ $user_id = $user->getUser();
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
+ $sql = "delete from tt_cron".
+ " where report_id = $id and group_id = $group_id and org_id = $org_id";
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error'))
+ return false;
+
+ $sql = "delete from tt_fav_reports".
+ " where id = $id and user_id = $user_id and group_id = $group_id and org_id = $org_id";
$affected = $mdb2->exec($sql);
return (!is_a($affected, 'PEAR_Error'));
}
// loadReport - loads report options from database into a bean.
- static function loadReport($user_id, &$bean) {
+ static function loadReport(&$bean) {
global $user;
+ $user_id = $user->getUser();
- $val = ttFavReportHelper::getReport($bean->getAttribute('favorite_report'));
+ $val = ttFavReportHelper::get($bean->getAttribute('favorite_report'));
if ($val) {
$bean->setAttribute('client', $val['client_id']);
$bean->setAttribute('option', $val['cf_1_option_id']);
$bean->setAttribute('period', $val['period']);
if ($val['period_start']) {
$dt = new DateAndTime(DB_DATEFORMAT, $val['period_start']);
- $bean->setAttribute('start_date', $dt->toString($user->date_format));
+ $bean->setAttribute('start_date', $dt->toString($user->getDateFormat()));
}
if ($val['period_end']) {
$dt = new DateAndTime(DB_DATEFORMAT, $val['period_end']);
- $bean->setAttribute('end_date', $dt->toString($user->date_format));
+ $bean->setAttribute('end_date', $dt->toString($user->getDateFormat()));
}
$bean->setAttribute('chclient', $val['show_client']);
$bean->setAttribute('chinvoice', $val['show_invoice']);
$user_options = array('max_rank'=>$max_rank);
$users = $user->getUsers($user_options); // Active and inactive users.
} elseif ($user->isClient()) {
- $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
+ $users = ttGroupHelper::getUsersForClient(); // Active and inactive users for clients.
}
foreach ($users as $single_user) {
$user_ids[] = $single_user['id'];
} else {
$users_to_adjust = explode(',', $options['users']); // Users to adjust.
if ($user->isClient()) {
- $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
+ $users = ttGroupHelper::getUsersForClient(); // Active and inactive users for clients.
foreach ($users as $single_user) {
$user_ids[] = $single_user['id'];
}
projects / timetracker.git / blobdiff