import('ttTeamHelper');
// Access check.
-if (!ttAccessCheck(right_view_reports)) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) {
header('Location: access_denied.php');
exit();
}
// Use custom fields plugin if it is enabled.
if ($user->isPluginEnabled('cf')) {
require_once('plugins/CustomFields.class.php');
- $custom_fields = new CustomFields($user->team_id);
+ $custom_fields = new CustomFields();
$smarty->assign('custom_fields', $custom_fields);
}
// Do we need to show checkboxes?
if ($bean->getAttribute('chpaid') ||
- ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by')) && !$user->isClient())) {
- $smarty->assign('use_checkboxes', true);
+ ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) {
+ if ($user->can('manage_invoices'))
+ $smarty->assign('use_checkboxes', true);
}
// Controls for "Mark paid" block.
-if ($bean->getAttribute('chpaid')) {
- $mark_paid_select_options = array('1'=>$i18n->getKey('dropdown.all'),'2'=>$i18n->getKey('dropdown.select'));
+if ($user->can('manage_invoices') && $bean->getAttribute('chpaid')) {
+ $mark_paid_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
$form->addInput(array('type'=>'combobox',
'name'=>'mark_paid_select_options',
'data'=>$mark_paid_select_options,
'value'=>$cl_mark_paid_select_option));
- $mark_paid_action_options = array('1'=>$i18n->getKey('dropdown.paid'),'2'=>$i18n->getKey('dropdown.not_paid'));
+ $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
$form->addInput(array('type'=>'combobox',
'name'=>'mark_paid_action_options',
'data'=>$mark_paid_action_options,
'value'=>$cl_mark_paid_action_option));
- $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->getKey('button.submit')));
+ $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
$smarty->assign('use_mark_paid', true);
}
// Controls for "Assign to invoice" block.
-if ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by')) && !$user->isClient()) {
+if ($user->can('manage_invoices') &&
+ ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) {
// Client is selected and we are displaying the invoice column.
- $recent_invoices = ttTeamHelper::getRecentInvoices($user->team_id, $client_id);
+ $recent_invoices = ttTeamHelper::getRecentInvoices($user->group_id, $client_id);
if ($recent_invoices) {
- $assign_invoice_select_options = array('1'=>$i18n->getKey('dropdown.all'),'2'=>$i18n->getKey('dropdown.select'));
+ $assign_invoice_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
$form->addInput(array('type'=>'combobox',
'name'=>'assign_invoice_select_options',
'data'=>$assign_invoice_select_options,
'data'=>$recent_invoices,
'datakeys'=>array('id','name'),
'value'=>$cl_recent_invoice_option,
- 'empty'=>array(''=>$i18n->getKey('dropdown.select_invoice'))));
- $form->addInput(array('type'=>'submit','name'=>'btn_assign','value'=>$i18n->getKey('button.submit')));
+ 'empty'=>array(''=>$i18n->get('dropdown.select_invoice'))));
+ $form->addInput(array('type'=>'submit','name'=>'btn_assign','value'=>$i18n->get('button.submit')));
$smarty->assign('use_assign_to_invoice', true);
}
}
if ('item_id_' == substr($key, 0, 8))
$expense_item_ids[] = substr($key, 8);
}
- if (!$time_log_ids && !$expense_item_ids) $err->Add($i18n->getKey('error.record')); // There are no selected records.
+ if (!$time_log_ids && !$expense_item_ids) $err->Add($i18n->get('error.record')); // There are no selected records.
// Validation of parameteres ended here.
} else {
// We are assigning all report items. Get the arrays from session.
}
} // isPost
-$group_by = $bean->getAttribute('group_by');
+$group_by = $bean->getAttribute('group_by1');
-$report_items = ttReportHelper::getItems($bean);
+$options = ttReportHelper::getReportOptions($bean);
+
+$group_by_tag = ttReportHelper::makeGroupByXmlTag($options);
+$report_items = ttReportHelper::getItems($options);
// Store record ids in session in case user wants to act on records such as marking them all paid.
if ($request->isGet() && $user->isPluginEnabled('ps'))
ttReportHelper::putInSession($report_items);
-if ('no_grouping' != $group_by)
- $subtotals = ttReportHelper::getSubtotals($bean);
-$totals = ttReportHelper::getTotals($bean);
+if (ttReportHelper::grouping($options))
+ $subtotals = ttReportHelper::getSubtotals($options);
+$totals = ttReportHelper::getTotals($options);
// Assign variables that are used to print subtotals.
-if ($report_items && 'no_grouping' != $group_by) {
+if ($report_items && 'no_grouping' != $group_by1) {
$smarty->assign('print_subtotals', true);
$smarty->assign('first_pass', true);
- $smarty->assign('group_by', $group_by);
+ $smarty->assign('group_by1', $group_by1);
$smarty->assign('prev_grouped_by', '');
$smarty->assign('cur_grouped_by', '');
}
// Determine group by header.
if ('no_grouping' != $group_by) {
+ /*
if ('cf_1' == $group_by)
$smarty->assign('group_by_header', $custom_fields->fields[0]['label']);
else {
$key = 'label.'.$group_by;
- $smarty->assign('group_by_header', $i18n->getKey($key));
- }
+ $smarty->assign('group_by_header', $i18n->get($key));
+ } */
+ $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
}
+
+$smarty->assign('group_by', $group_by_tag);
+
// Assign variables that are used to alternate color of rows for different dates.
$smarty->assign('prev_date', '');
$smarty->assign('cur_date', '');
$smarty->assign('subtotals', $subtotals);
$smarty->assign('totals', $totals);
$smarty->assign('bean', $bean);
-$smarty->assign('title', $i18n->getKey('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
+$smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
$smarty->assign('content_page_name', 'report.tpl');
$smarty->display('index.tpl');
projects / timetracker.git / blobdiff