class ttFavReportHelper {
// getReports - returns an array of favorite reports for user.
- static function getReports($user_id) {
+ static function getReports() {
+ global $user;
$mdb2 = getConnection();
+ $user_id = $user->getUser();
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
$result = array();
- $sql = "select * from tt_fav_reports where user_id = $user_id and status = 1";
+ $sql = "select * from tt_fav_reports".
+ " where 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')) {
while ($val = $res->fetchRow()) {
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();
// insertReport - stores reports settings in database.
static function insertReport($fields) {
+ global $user;
$mdb2 = getConnection();
- $sql = "insert into tt_fav_reports (name, user_id, client_id, cf_1_option_id, project_id, task_id,
- billable, invoice, paid_status, users, period, period_start, period_end,
- show_client, show_invoice, show_paid, show_ip,
- show_project, show_start, show_duration, show_cost,
- show_task, show_end, show_note, show_custom_field_1, show_work_units,
- group_by1, show_totals_only)
- values(".
- $mdb2->quote($fields['name']).", ".$fields['user_id'].", ".
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
+ $sql = "insert into tt_fav_reports".
+ " (name, user_id, group_id, org_id, client_id, cf_1_option_id, project_id, task_id,".
+ " billable, invoice, paid_status, users, period, period_start, period_end,".
+ " show_client, show_invoice, show_paid, show_ip,".
+ " show_project, show_start, show_duration, show_cost,".
+ " 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['client']).", ".$mdb2->quote($fields['option']).", ".
$mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
$mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['invoice']).", ".
$fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
$fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
$fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
- $mdb2->quote($fields['group_by1']).", ".$fields['chtotalsonly'].")";
+ $mdb2->quote($fields['group_by1']).", ".$mdb2->quote($fields['group_by2']).", ".
+ $mdb2->quote($fields['group_by3']).", ".$fields['chtotalsonly'].")";
$affected = $mdb2->exec($sql);
if (is_a($affected, 'PEAR_Error'))
return false;
- $sql = "select last_insert_id() as last_id";
- $res = $mdb2->query($sql);
- if (is_a($res, 'PEAR_Error'))
- return false;
-
- $val = $res->fetchRow();
- return $val['last_id'];
+ $last_id = $mdb2->lastInsertID('tt_fav_reports', 'id');
+ return $last_id;
}
// updateReport - updates report options in the database.
"show_custom_field_1 = ".$fields['chcf_1'].", ".
"show_work_units = ".$fields['chunits'].", ".
"group_by1 = ".$mdb2->quote($fields['group_by1']).", ".
+ "group_by2 = ".$mdb2->quote($fields['group_by2']).", ".
+ "group_by3 = ".$mdb2->quote($fields['group_by3']).", ".
"show_totals_only = ".$fields['chtotalsonly'].
" where id = ".$fields['id'];
$affected = $mdb2->exec($sql);
}
// saveReport - saves report options in the database.
- static function saveReport($user_id, $bean) {
+ static function saveReport($bean) {
global $user;
+ $user_id = $user->getUser();
// Set default value of 0 for not set checkboxes (in bean).
// Later in this function we use it to construct $fields array to update database.
$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);
}
'chcf_1'=>$bean->getAttribute('chcf_1'),
'chunits'=>$bean->getAttribute('chunits'),
'group_by1'=>$bean->getAttribute('group_by1'),
+ 'group_by2'=>$bean->getAttribute('group_by2'),
+ 'group_by3'=>$bean->getAttribute('group_by3'),
'chtotalsonly'=>$bean->getAttribute('chtotalsonly'));
$id = false;
}
// 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'));
if ($val) {
$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']);
$bean->setAttribute('chcf_1', $val['show_custom_field_1']);
$bean->setAttribute('chunits', $val['show_work_units']);
$bean->setAttribute('group_by1', $val['group_by1']);
+ $bean->setAttribute('group_by2', $val['group_by2']);
+ $bean->setAttribute('group_by3', $val['group_by3']);
$bean->setAttribute('chtotalsonly', $val['show_totals_only']);
$bean->setAttribute('new_fav_report', $val['name']);
} else {
'chcf_1'=>'',
'chunits'=>'',
'group_by1'=>'',
+ 'group_by2'=>'',
+ 'group_by3'=>'',
'chtotalsonly'=>'',
'new_fav_report'=>''));
$bean->setAttributes($attrs);
projects / timetracker.git / blobdiff