$mdb2 = getConnection();
// Determine these once as they are used in multiple places in this function.
- $canViewReports = $user->can('view_reports');
+ $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
$isClient = $user->isClient();
$group_by_option = $options['group_by'];
if (($canViewReports || $isClient) && $options['show_invoice'])
array_push($fields, 'i.name as invoice');
-// TODO: refactoring in progress down from here... The above is identical to getFavItems and is ready to merge.
// Prepare sql query part for left joins.
$left_joins = null;
if ($canViewReports || $isClient)
$left_joins .= " left join tt_users u on (u.id = ei.user_id)";
- if ($bean->getAttribute('chclient') || 'client' == $group_by_option)
+ if ($options['show_client'] || 'client' == $group_by_option)
$left_joins .= " left join tt_clients c on (c.id = ei.client_id)";
- if ($bean->getAttribute('chproject') || 'project' == $group_by_option)
+ if ($options['show_project'] || 'project' == $group_by_option)
$left_joins .= " left join tt_projects p on (p.id = ei.project_id)";
- if (($canViewReports || $isClient) && $bean->getAttribute('chinvoice'))
+ if (($canViewReports || $isClient) && $options['show_invoice'])
$left_joins .= " left join tt_invoices i on (i.id = ei.invoice_id and i.status = 1)";
$where = ttReportHelper::getExpenseWhere($options);
// Determine sort part.
$sort_part = ' order by ';
- if ('no_grouping' == $group_by_option || 'date' == $group_by_option)
+ if ($group_by_option == null || 'no_grouping' == $group_by_option || 'date' == $group_by_option)
$sort_part .= 'date';
else
$sort_part .= $group_by_option.', date';
- if (($canViewReports || $isClient) && is_array($bean->getAttribute('users')) && 'user' != $group_by_option)
+ if (($canViewReports || $isClient) && $options['users'] && 'user' != $group_by_option)
$sort_part .= ', user, type';
- if ($bean->getAttribute('chstart'))
+ if ($options['show_start'])
$sort_part .= ', unformatted_start';
$sort_part .= ', id';
$mdb2 = getConnection();
// Determine these once as they are used in multiple places in this function.
- $canViewReports = $user->can('view_reports');
+ $canViewReports = $user->can('view_reports') || $user->can('view_all_reports');
$isClient = $user->isClient();
$group_by_option = $options['group_by'];
// Determine sort part.
$sort_part = ' order by ';
- if ($group_by_option == null || 'no_grouping' == $group_by_option || 'date' == $group_by_option) // TODO: fix DB for NULL values in group_by field.
+ if ($group_by_option == null || 'no_grouping' == $group_by_option || 'date' == $group_by_option)
$sort_part .= 'date';
else
$sort_part .= $group_by_option.', date';
- if (($canViewReports || $isClient) /*&& is_array($bean->getAttribute('users'))*/ && 'user' != $group_by_option)
+ if (($canViewReports || $isClient) && $options['users'] && 'user' != $group_by_option)
$sort_part .= ', user, type';
if ($options['show_start'])
$sort_part .= ', unformatted_start';
$options['show_note'] = $bean->getAttribute('chnote');
$options['show_custom_field_1'] = $bean->getAttribute('chcf_1');
$options['show_work_units'] = $bean->getAttribute('chunits');
-/*
- `show_totals_only` tinyint(4) NOT NULL default 0, # whether to show totals only
-*/
+ $options['show_totals_only'] = $bean->getAttribute('chtotalsonly');
$options['group_by'] = $bean->getAttribute('group_by');
-/*
- * TODO: remaining fields to fill in...
- `status` tinyint(4) default 1, # favorite report status
- PRIMARY KEY (`id`)
-);
-*/
return $options;
}