$mdb2 = getConnection();
$result = array();
- $sql = "select * from tt_fav_reports where user_id = $user_id";
+ $sql = "select * from tt_fav_reports where user_id = $user_id and status = 1";
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
while ($val = $res->fetchRow()) {
// getReport - returns a report identified by its id.
static function getReport($id) {
- $mdb2 = getConnection();
-
- $sql = "select * from tt_fav_reports where id = $id";
- $res = $mdb2->query($sql);
- if (!is_a($res, 'PEAR_Error')) {
+ $mdb2 = getConnection();
+
+ $sql = "select * from tt_fav_reports where id = $id and status = 1";
+ $res = $mdb2->query($sql);
+ if (!is_a($res, 'PEAR_Error')) {
if ($val = $res->fetchRow()) {
- return $val;
+ return $val;
}
}
return false;
}
-
+
// getReportByName - returns a report identified by its name.
static function getReportByName($user_id, $report_name) {
- $mdb2 = getConnection();
-
- $sql = "select * from tt_fav_reports where user_id = $user_id and name = ".$mdb2->quote($report_name);
+ $mdb2 = getConnection();
+
+ $sql = "select * from tt_fav_reports where user_id = $user_id and status = 1 and name = ".$mdb2->quote($report_name);
$res = $mdb2->query($sql);
if (!is_a($res, 'PEAR_Error')) {
if ($val = $res->fetchRow()) {
}
return false;
}
-
+
// insertReport - stores reports settings in database.
static function insertReport($fields) {
$mdb2 = getConnection();
-
+
$sql = "insert into tt_fav_reports (name, user_id, client_id, cf_1_option_id, project_id, task_id,
- billable, invoice, users, period, period_start, period_end,
- show_client, show_invoice,
+ billable, invoice, paid_status, users, period, period_start, period_end,
+ show_client, show_invoice, show_paid,
show_project, show_start, show_duration, show_cost,
show_task, show_end, show_note, show_custom_field_1,
group_by, show_totals_only)
$mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
$mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
$mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['invoice']).", ".
+ $mdb2->quote($fields['paid_status']).", ".
$mdb2->quote($fields['users']).", ".$mdb2->quote($fields['period']).", ".
$mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ".
- $fields['chclient'].", ".$fields['chinvoice'].", ".
+ $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".
$fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
$fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".
$mdb2->quote($fields['group_by']).", ".$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'))
$val = $res->fetchRow();
return $val['last_id'];
}
-
+
// updateReport - updates report options in the database.
function updateReport($fields) {
- $mdb2 = getConnection();
- $sql = "update tt_fav_reports set ".
- "name = ".$mdb2->quote($fields['name']).", ".
- "client_id = ".$mdb2->quote($fields['client']).", ".
- "cf_1_option_id = ".$mdb2->quote($fields['option']).", ".
- "project_id = ".$mdb2->quote($fields['project']).", ".
- "task_id = ".$mdb2->quote($fields['task']).", ".
- "billable = ".$mdb2->quote($fields['billable']).", ".
- "invoice = ".$mdb2->quote($fields['invoice']).", ".
- "users = ".$mdb2->quote($fields['users']).", ".
- "period = ".$mdb2->quote($fields['period']).", ".
- "period_start = ".$mdb2->quote($fields['from']).", ".
- "period_end = ".$mdb2->quote($fields['to']).", ".
- "show_client = ".$fields['chclient'].", ".
- "show_invoice = ".$fields['chinvoice'].", ".
- "show_project = ".$fields['chproject'].", ".
- "show_start = ".$fields['chstart'].", ".
- "show_duration = ".$fields['chduration'].", ".
- "show_cost = ".$fields['chcost'].", ".
- "show_task = ".$fields['chtask'].", ".
- "show_end = ".$fields['chfinish'].", ".
- "show_note = ".$fields['chnote'].", ".
- "show_custom_field_1 = ".$fields['chcf_1'].", ".
- "group_by = ".$mdb2->quote($fields['group_by']).", ".
- "show_totals_only = ".$fields['chtotalsonly'].
- " where id = ".$fields['id'];
- $affected = $mdb2->exec($sql);
- if (is_a($affected, 'PEAR_Error'))
- return false;
-
+ $mdb2 = getConnection();
+ $sql = "update tt_fav_reports set ".
+ "name = ".$mdb2->quote($fields['name']).", ".
+ "client_id = ".$mdb2->quote($fields['client']).", ".
+ "cf_1_option_id = ".$mdb2->quote($fields['option']).", ".
+ "project_id = ".$mdb2->quote($fields['project']).", ".
+ "task_id = ".$mdb2->quote($fields['task']).", ".
+ "billable = ".$mdb2->quote($fields['billable']).", ".
+ "invoice = ".$mdb2->quote($fields['invoice']).", ".
+ "paid_status = ".$mdb2->quote($fields['paid_status']).", ".
+ "users = ".$mdb2->quote($fields['users']).", ".
+ "period = ".$mdb2->quote($fields['period']).", ".
+ "period_start = ".$mdb2->quote($fields['from']).", ".
+ "period_end = ".$mdb2->quote($fields['to']).", ".
+ "show_client = ".$fields['chclient'].", ".
+ "show_invoice = ".$fields['chinvoice'].", ".
+ "show_paid = ".$fields['chpaid'].", ".
+ "show_project = ".$fields['chproject'].", ".
+ "show_start = ".$fields['chstart'].", ".
+ "show_duration = ".$fields['chduration'].", ".
+ "show_cost = ".$fields['chcost'].", ".
+ "show_task = ".$fields['chtask'].", ".
+ "show_end = ".$fields['chfinish'].", ".
+ "show_note = ".$fields['chnote'].", ".
+ "show_custom_field_1 = ".$fields['chcf_1'].", ".
+ "group_by = ".$mdb2->quote($fields['group_by']).", ".
+ "show_totals_only = ".$fields['chtotalsonly'].
+ " where id = ".$fields['id'];
+ $affected = $mdb2->exec($sql);
+ if (is_a($affected, 'PEAR_Error'))
+ return false;
+
return $fields['id'];
}
-
+
// saveReport - saves report options in the database.
static function saveReport($user_id, $bean) {
global $user;
-
+
// 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.
if (!$bean->getAttribute('chclient')) $bean->setAttribute('chclient', 0);
if (!$bean->getAttribute('chinvoice')) $bean->setAttribute('chinvoice', 0);
+ if (!$bean->getAttribute('chpaid')) $bean->setAttribute('chpaid', 0);
if (!$bean->getAttribute('chproject')) $bean->setAttribute('chproject', 0);
- if (!$bean->getAttribute('chstart')) $bean->setAttribute('chstart', 0);
+ if (!$bean->getAttribute('chstart')) $bean->setAttribute('chstart', 0);
if (!$bean->getAttribute('chduration')) $bean->setAttribute('chduration', 0);
if (!$bean->getAttribute('chcost')) $bean->setAttribute('chcost', 0);
if (!$bean->getAttribute('chtask')) $bean->setAttribute('chtask', 0);
if (!$bean->getAttribute('chfinish')) $bean->setAttribute('chfinish', 0);
if (!$bean->getAttribute('chnote')) $bean->setAttribute('chnote', 0);
if (!$bean->getAttribute('chcf_1')) $bean->setAttribute('chcf_1', 0);
- if (!$bean->getAttribute('chtotalsonly')) $bean->setAttribute('chtotalsonly', 0);
-
+ if (!$bean->getAttribute('chtotalsonly')) $bean->setAttribute('chtotalsonly', 0);
+
if ($bean->getAttribute('users') && is_array($bean->getAttribute('users'))) {
$users_in_bean = $bean->getAttribute('users');
// If all users are selected - use a null value (which means "all users").
$all_users_selected = true;
- if ($user->canManageTeam()) {
+ if ($user->can('view_reports')) {
$all = ttTeamHelper::getActiveUsers();
foreach ($all as $one) {
if (!in_array($one['id'], $users_in_bean)) {
$all_users_selected = false;
- break;
+ break;
}
}
}
if ($all_users_selected)
$users = null;
else
- $users = join(',', $users_in_bean);
- }
- if ($bean->getAttribute('start_date')) {
- $dt = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
- $from = $dt->toString(DB_DATEFORMAT);
- }
- if ($bean->getAttribute('end_date')) {
+ $users = join(',', $users_in_bean);
+ }
+ if ($bean->getAttribute('start_date')) {
+ $dt = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
+ $from = $dt->toString(DB_DATEFORMAT);
+ }
+ if ($bean->getAttribute('end_date')) {
$dt = new DateAndTime($user->date_format, $bean->getAttribute('end_date'));
$to = $dt->toString(DB_DATEFORMAT);
}
-
- $fields = array(
+
+ $fields = array(
'name'=>$bean->getAttribute('new_fav_report'),
- 'client'=>$bean->getAttribute('client'),
- 'option'=>$bean->getAttribute('option'),
- 'project'=>$bean->getAttribute('project'),
- 'task'=>$bean->getAttribute('task'),
- 'billable'=>$bean->getAttribute('include_records'),
- 'invoice'=>$bean->getAttribute('invoice'),
- 'users'=>$users,
- 'period'=>$bean->getAttribute('period'),
- 'from'=>$from,
- 'to'=>$to,
- 'chclient'=>$bean->getAttribute('chclient'),
- 'chinvoice'=>$bean->getAttribute('chinvoice'),
+ 'client'=>$bean->getAttribute('client'),
+ 'option'=>$bean->getAttribute('option'),
+ 'project'=>$bean->getAttribute('project'),
+ 'task'=>$bean->getAttribute('task'),
+ 'billable'=>$bean->getAttribute('include_records'),
+ 'invoice'=>$bean->getAttribute('invoice'),
+ 'paid_status'=>$bean->getAttribute('paid_status'),
+ 'users'=>$users,
+ 'period'=>$bean->getAttribute('period'),
+ 'from'=>$from,
+ 'to'=>$to,
+ 'chclient'=>$bean->getAttribute('chclient'),
+ 'chinvoice'=>$bean->getAttribute('chinvoice'),
+ 'chpaid'=>$bean->getAttribute('chpaid'),
'chproject'=>$bean->getAttribute('chproject'),
- 'chstart'=>$bean->getAttribute('chstart'),
- 'chduration'=>$bean->getAttribute('chduration'),
- 'chcost'=>$bean->getAttribute('chcost'),
- 'chtask'=>$bean->getAttribute('chtask'),
- 'chfinish'=>$bean->getAttribute('chfinish'),
- 'chnote'=>$bean->getAttribute('chnote'),
- 'chcf_1'=>$bean->getAttribute('chcf_1'),
- 'group_by'=>$bean->getAttribute('group_by'),
- 'chtotalsonly'=>$bean->getAttribute('chtotalsonly'));
-
- $id = false;
- $report = ttFavReportHelper::getReportByName($user_id, $fields['name']);
- if ($report) {
- $fields['id'] = $report['id'];
- $id = ttFavReportHelper::updateReport($fields);
+ 'chstart'=>$bean->getAttribute('chstart'),
+ 'chduration'=>$bean->getAttribute('chduration'),
+ 'chcost'=>$bean->getAttribute('chcost'),
+ 'chtask'=>$bean->getAttribute('chtask'),
+ 'chfinish'=>$bean->getAttribute('chfinish'),
+ 'chnote'=>$bean->getAttribute('chnote'),
+ 'chcf_1'=>$bean->getAttribute('chcf_1'),
+ 'group_by'=>$bean->getAttribute('group_by'),
+ 'chtotalsonly'=>$bean->getAttribute('chtotalsonly'));
+
+ $id = false;
+ $report = ttFavReportHelper::getReportByName($user_id, $fields['name']);
+ if ($report) {
+ $fields['id'] = $report['id'];
+ $id = ttFavReportHelper::updateReport($fields);
+ } else {
+ $fields['user_id'] = $user_id;
+ $id = ttFavReportHelper::insertReport($fields);
}
- else {
- $fields['user_id'] = $user_id;
- $id = ttFavReportHelper::insertReport($fields);
- }
-
- return $id;
+
+ return $id;
}
-
+
// deleteReport - deletes a favorite report.
static function deleteReport($id) {
$mdb2 = getConnection();
-
+
$sql = "delete from tt_fav_reports where id = $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) {
- global $user;
-
- $val = ttFavReportHelper::getReport($bean->getAttribute('favorite_report'));
- if ($val) {
+ global $user;
+
+ $val = ttFavReportHelper::getReport($bean->getAttribute('favorite_report'));
+ if ($val) {
$bean->setAttribute('client', $val['client_id']);
$bean->setAttribute('option', $val['cf_1_option_id']);
$bean->setAttribute('project', $val['project_id']);
$bean->setAttribute('task', $val['task_id']);
$bean->setAttribute('include_records', $val['billable']);
$bean->setAttribute('invoice', $val['invoice']);
+ $bean->setAttribute('paid_status', $val['paid_status']);
if ($val['users'])
$bean->setAttribute('users', explode(',', $val['users']));
else {
- // Null users value means "all users". Add them to the bean.
- if ($user->canManageTeam()) {
+ // Null users value means "all users". Add them to the bean.
+ if ($user->can('view_reports')) {
$all = ttTeamHelper::getActiveUsers();
foreach ($all as $one) {
$all_user_ids[] = $one['id'];
$bean->setAttribute('end_date', $dt->toString($user->date_format));
}
$bean->setAttribute('chclient', $val['show_client']);
- $bean->setAttribute('chinvoice', $val['show_invoice']);
+ $bean->setAttribute('chinvoice', $val['show_invoice']);
+ $bean->setAttribute('chpaid', $val['show_paid']);
$bean->setAttribute('chproject', $val['show_project']);
$bean->setAttribute('chstart', $val['show_start']);
- $bean->setAttribute('chduration', $val['show_duration']);
- $bean->setAttribute('chcost', $val['show_cost']);
+ $bean->setAttribute('chduration', $val['show_duration']);
+ $bean->setAttribute('chcost', $val['show_cost']);
$bean->setAttribute('chtask', $val['show_task']);
$bean->setAttribute('chfinish', $val['show_end']);
$bean->setAttribute('chnote', $val['show_note']);
$bean->setAttribute('chcf_1', $val['show_custom_field_1']);
$bean->setAttribute('group_by', $val['group_by']);
- $bean->setAttribute('chtotalsonly', $val['show_totals_only']);
+ $bean->setAttribute('chtotalsonly', $val['show_totals_only']);
$bean->setAttribute('new_fav_report', $val['name']);
- } else {
- $attrs = $bean->getAttributes();
- $attrs = array_merge($attrs, array(
- 'client'=>'',
- 'option'=>'',
- 'project'=>'',
- 'task'=>'',
- 'include_records'=>'',
- 'invoice'=>'',
- 'users'=>$user_id,
- 'period'=>'',
- 'chclient'=>'1',
- 'chinvoice'=>'',
- 'chproject'=>'1',
- 'chstart'=>'1',
- 'chduration'=>'1',
- 'chcost'=>'',
+ } else {
+ $attrs = $bean->getAttributes();
+ $attrs = array_merge($attrs, array(
+ 'client'=>'',
+ 'option'=>'',
+ 'project'=>'',
+ 'task'=>'',
+ 'include_records'=>'',
+ 'invoice'=>'',
+ 'users'=>$user_id,
+ 'period'=>'',
+ 'chclient'=>'1',
+ 'chinvoice'=>'',
+ 'chproject'=>'1',
+ 'chstart'=>'1',
+ 'chduration'=>'1',
+ 'chcost'=>'',
'chtask'=>'1',
- 'chfinish'=>'1',
- 'chnote'=>'1',
+ 'chfinish'=>'1',
+ 'chnote'=>'1',
'chcf_1'=>'',
- 'group_by'=>'',
- 'chtotalsonly'=>'',
- 'new_fav_report'=>''
- ));
- $bean->setAttributes($attrs);
- }
+ 'group_by'=>'',
+ 'chtotalsonly'=>'',
+ 'new_fav_report'=>''));
+ $bean->setAttributes($attrs);
+ }
}
}
-?>
\ No newline at end of file
projects / timetracker.git / blobdiff