import('ttProjectHelper');
import('ttFavReportHelper');
import('ttClientHelper');
+import('ttReportHelper');
// 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($user->group_id);
$smarty->assign('custom_fields', $custom_fields);
}
'style'=>'width: 250px;',
'data'=>$report_list,
'datakeys'=>array('id','name'),
- 'empty'=>array('-1'=>$i18n->getKey('dropdown.no'))));
+ 'empty'=>array('-1'=>$i18n->get('dropdown.no'))));
$form->addInput(array('type'=>'hidden','name'=>'fav_report_changed'));
// Generate and Delete buttons.
-$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->getKey('button.generate')));
-$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->getKey('label.delete'),'onclick'=>"return confirm('".$i18n->getKey('form.reports.confirm_delete')."')"));
+$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->get('button.generate')));
+$form->addInput(array('type'=>'submit','name'=>'btn_delete','value'=>$i18n->get('label.delete'),'onclick'=>"return confirm('".$i18n->get('form.reports.confirm_delete')."')"));
// Dropdown for clients if the clients plugin is enabled.
-if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id)) {
- if ($user->canManageTeam() || ($user->isClient() && !$user->client_id))
- $client_list = ttClientHelper::getClients($user->team_id);
- else
+if ($user->isPluginEnabled('cl') && !$user->isClient()) {
+ if ($user->can('view_reports') || $user->can('view_all_reports')) {
+ $client_list = ttClientHelper::getClients(); // TODO: improve getClients for "view_reports"
+ // by filtering out not relevant clients.
+ } else
$client_list = ttClientHelper::getClientsForUser();
$form->addInput(array('type'=>'combobox',
'name'=>'client',
'style'=>'width: 250px;',
'data'=>$client_list,
'datakeys'=>array('id', 'name'),
- 'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))));
}
// If we have a TYPE_DROPDOWN custom field - add control to select an option.
'style'=>'width: 250px;',
'value'=>$cl_cf_1,
'data'=>$custom_fields->options,
- 'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))));
}
// Add controls for projects and tasks.
-if ($user->canManageTeam()) {
- $project_list = ttProjectHelper::getProjects(); // Manager and co-managers can run reports on all active and inactive projects.
+if ($user->can('view_reports') || $user->can('view_all_reports')) {
+ $project_list = ttProjectHelper::getProjects(); // All active and inactive projects.
} elseif ($user->isClient()) {
$project_list = ttProjectHelper::getProjectsForClient();
} else {
'style'=>'width: 250px;',
'data'=>$project_list,
'datakeys'=>array('id','name'),
- 'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))));
if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
- $task_list = ttTeamHelper::getActiveTasks($user->team_id);
+ $task_list = ttTeamHelper::getActiveTasks($user->group_id);
$form->addInput(array('type'=>'combobox',
'name'=>'task',
'style'=>'width: 250px;',
'data'=>$task_list,
'datakeys'=>array('id','name'),
- 'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))));
}
// Add include records control.
-$include_options = array('1'=>$i18n->getKey('form.reports.include_billable'),
- '2'=>$i18n->getKey('form.reports.include_not_billable'));
+$include_options = array('1'=>$i18n->get('form.reports.include_billable'),
+ '2'=>$i18n->get('form.reports.include_not_billable'));
$form->addInput(array('type'=>'combobox',
'name'=>'include_records',
'style'=>'width: 250px;',
'data'=>$include_options,
- 'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))));
// Add invoiced / not invoiced selector.
-$invoice_options = array('1'=>$i18n->getKey('form.reports.include_invoiced'),
- '2'=>$i18n->getKey('form.reports.include_not_invoiced'));
-$form->addInput(array('type'=>'combobox',
- 'name'=>'invoice',
- 'style'=>'width: 250px;',
- 'data'=>$invoice_options,
- 'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
+if ($user->can('manage_invoices')) {
+ $invoice_options = array('1'=>$i18n->get('form.reports.include_invoiced'),
+ '2'=>$i18n->get('form.reports.include_not_invoiced'));
+ $form->addInput(array('type'=>'combobox',
+ 'name'=>'invoice',
+ 'style'=>'width: 250px;',
+ 'data'=>$invoice_options,
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
+
+if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) {
+ $form->addInput(array('type'=>'combobox',
+ 'name'=>'paid_status',
+ 'style'=>'width: 250px;',
+ 'data'=>array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid')),
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))
+ ));
+}
$user_list = array();
-if ($user->canManageTeam() || $user->isClient()) {
+if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
// Prepare user and assigned projects arrays.
- if ($user->canManageTeam())
- $users = ttTeamHelper::getUsers(); // Active and inactive users for managers.
+ if ($user->can('view_reports') || $user->can('view_all_reports')) {
+ $max_rank = $user->rank-1;
+ if ($user->can('view_all_reports')) $max_rank = MAX_RANK;
+ if ($user->can('view_own_reports'))
+ $options = array('max_rank'=>$max_rank,'include_self'=>true);
+ else
+ $options = array('max_rank'=>$max_rank);
+ $users = $user->getUsers($options); // Active and inactive users.
+ }
elseif ($user->isClient())
$users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
$form->addInput(array('type'=>'combobox',
'name'=>'period',
'style'=>'width: 250px;',
- 'data'=>array(INTERVAL_THIS_MONTH=>$i18n->getKey('dropdown.this_month'),
- INTERVAL_LAST_MONTH=>$i18n->getKey('dropdown.last_month'),
- INTERVAL_THIS_WEEK=>$i18n->getKey('dropdown.this_week'),
- INTERVAL_LAST_WEEK=>$i18n->getKey('dropdown.last_week')),
- 'empty'=>array(''=>$i18n->getKey('dropdown.select'))));
+ 'data'=>array(INTERVAL_THIS_MONTH=>$i18n->get('dropdown.current_month'),
+ INTERVAL_LAST_MONTH=>$i18n->get('dropdown.previous_month'),
+ INTERVAL_THIS_WEEK=>$i18n->get('dropdown.current_week'),
+ INTERVAL_LAST_WEEK=>$i18n->get('dropdown.previous_week'),
+ INTERVAL_THIS_DAY=>$i18n->get('dropdown.current_day'),
+ INTERVAL_LAST_DAY=>$i18n->get('dropdown.previous_day')),
+ 'empty'=>array(''=>$i18n->get('dropdown.select'))));
// Add controls for start and end dates.
$form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'start_date'));
$form->addInput(array('type'=>'datefield','maxlength'=>'20','name'=>'end_date'));
// Add checkboxes for fields.
if ($user->isPluginEnabled('cl'))
$form->addInput(array('type'=>'checkbox','name'=>'chclient'));
-if (($user->canManageTeam() || $user->isClient()) && $user->isPluginEnabled('iv'))
+if (($user->can('manage_invoices') || $user->isClient()) && $user->isPluginEnabled('iv'))
$form->addInput(array('type'=>'checkbox','name'=>'chinvoice'));
+if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
+ $form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
+if ($user->can('view_reports') || $user->can('view_all_reports'))
+ $form->addInput(array('type'=>'checkbox','name'=>'chip'));
if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
$form->addInput(array('type'=>'checkbox','name'=>'chproject'));
if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
}
$form->addInput(array('type'=>'checkbox','name'=>'chduration'));
$form->addInput(array('type'=>'checkbox','name'=>'chnote'));
-if (defined('COST_ON_REPORTS') && isTrue(COST_ON_REPORTS))
- $form->addInput(array('type'=>'checkbox','name'=>'chcost'));
+$form->addInput(array('type'=>'checkbox','name'=>'chcost'));
// If we have a custom field - add a checkbox for it.
if ($custom_fields && $custom_fields->fields[0])
$form->addInput(array('type'=>'checkbox','name'=>'chcf_1'));
+if ($user->isPluginEnabled('wu'))
+ $form->addInput(array('type'=>'checkbox','name'=>'chunits'));
// Add group by control.
-$group_by_options['no_grouping'] = $i18n->getKey('form.reports.group_by_no');
-$group_by_options['date'] = $i18n->getKey('form.reports.group_by_date');
-if ($user->canManageTeam() || $user->isClient())
- $group_by_options['user'] = $i18n->getKey('form.reports.group_by_user');
+$group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no');
+$group_by_options['date'] = $i18n->get('form.reports.group_by_date');
+if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
+ $group_by_options['user'] = $i18n->get('form.reports.group_by_user');
if ($user->isPluginEnabled('cl') && !($user->isClient() && $user->client_id))
- $group_by_options['client'] = $i18n->getKey('form.reports.group_by_client');
+ $group_by_options['client'] = $i18n->get('form.reports.group_by_client');
if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
- $group_by_options['project'] = $i18n->getKey('form.reports.group_by_project');
+ $group_by_options['project'] = $i18n->get('form.reports.group_by_project');
if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
- $group_by_options['task'] = $i18n->getKey('form.reports.group_by_task');
+ $group_by_options['task'] = $i18n->get('form.reports.group_by_task');
if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
$group_by_options['cf_1'] = $custom_fields->fields[0]['label'];
}
-$form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by','data'=>$group_by_options));
+$group_by_options_size = sizeof($group_by_options);
+$form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by1','data'=>$group_by_options));
+if ($group_by_options_size > 2) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by2','data'=>$group_by_options));
+if ($group_by_options_size > 3) $form->addInput(array('type'=>'combobox','onchange'=>'handleCheckboxes();','name'=>'group_by3','data'=>$group_by_options));
$form->addInput(array('type'=>'checkbox','name'=>'chtotalsonly'));
// Add text field for a new favorite report name.
$form->addInput(array('type'=>'text','name'=>'new_fav_report','maxlength'=>'30','style'=>'width: 250px;'));
// Save button.
-$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->getKey('button.save')));
+$form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('button.save')));
-$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->getKey('button.generate')));
+$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->get('button.generate')));
// Create a bean (which is a mechanism to remember form values in session).
$bean = new ActionForm('reportBean', $form, $request);
// At this point form values are obtained from session if they are there.
-if (($request->getMethod() == 'GET') && !$bean->isSaved()) {
+if ($request->isGet() && !$bean->isSaved()) {
// No previous form data were found in session. Use the following default values.
$form->setValueByElement('users', array_keys($user_list));
$period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->date_format));
- $form->setValueByElement('start_date', $period->getBeginDate());
+ $form->setValueByElement('start_date', $period->getStartDate());
$form->setValueByElement('end_date', $period->getEndDate());
$form->setValueByElement('chclient', '1');
$form->setValueByElement('chinvoice', '0');
+ $form->setValueByElement('chpaid', '0');
+ $form->setValueByElement('chip', '0');
$form->setValueByElement('chproject', '1');
$form->setValueByElement('chstart', '1');
$form->setValueByElement('chduration', '1');
$form->setValueByElement('chfinish', '1');
$form->setValueByElement('chnote', '1');
$form->setValueByElement('chcf_1', '0');
+ $form->setValueByElement('chunits', '0');
$form->setValueByElement('chtotalsonly', '0');
}
}
} elseif ($bean->getAttribute('btn_save')) {
// User clicked the Save button. We need to save form options as new favorite report.
- if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->getKey('error.field'), $i18n->getKey('form.reports.save_as_favorite'));
+ if (!ttValidString($bean->getAttribute('new_fav_report'))) $err->add($i18n->get('error.field'), $i18n->get('form.reports.save_as_favorite'));
if ($err->no()) {
- $id = ttFavReportHelper::saveReport($user->id, $bean);
+ $id = ttFavReportHelper::saveReport($user->id, $bean); // TODO: review "on behalf" situations (both user and group), redesign if needed.
if (!$id)
- $err->add($i18n->getKey('error.db'));
+ $err->add($i18n->get('error.db'));
if ($err->no()) {
$bean->setAttribute('favorite_report', $id);
$bean->saveBean();
$start_date = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
if ($start_date->isError() || !$bean->getAttribute('start_date'))
- $err->add($i18n->getKey('error.field'), $i18n->getKey('label.start_date'));
+ $err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
$end_date = new DateAndTime($user->date_format, $bean->getAttribute('end_date'));
if ($end_date->isError() || !$bean->getAttribute('end_date'))
- $err->add($i18n->getKey('error.field'), $i18n->getKey('label.end_date'));
+ $err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
if ($start_date->compare($end_date) > 0)
- $err->add($i18n->getKey('error.interval'), $i18n->getKey('label.end_date'), $i18n->getKey('label.start_date'));
+ $err->add($i18n->get('error.interval'), $i18n->get('label.end_date'), $i18n->get('label.start_date'));
}
-
- $bean->saveBean();
+ $group_by1 = $bean->getAttribute('group_by1');
+ $group_by2 = $bean->getAttribute('group_by2');
+ $group_by3 = $bean->getAttribute('group_by3');
+ if (($group_by3 != null && $group_by3 != 'no_grouping') && ($group_by3 == $group_by1 || $group_by3 == $group_by2))
+ $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
+ if (($group_by2 != null && $group_by2 != 'no_grouping') && ($group_by2 == $group_by1 || $group_by3 == $group_by2))
+ $err->add($i18n->get('error.field'), $i18n->get('form.reports.group_by'));
+ // Check remaining values.
+ if (!ttReportHelper::verifyBean($bean)) $err->add($i18n->get('error.sys'));
if ($err->no()) {
+ $bean->saveBean();
// Now we can go ahead and create a report.
header('Location: report.php');
exit();
$smarty->assign('assigned_projects', $assigned_projects);
$smarty->assign('forms', array($form->getName()=>$form->toArray()));
$smarty->assign('onload', 'onLoad="handleCheckboxes()"');
-$smarty->assign('title', $i18n->getKey('title.reports'));
+$smarty->assign('title', $i18n->get('title.reports'));
$smarty->assign('content_page_name', 'reports.tpl');
$smarty->display('index.tpl');
projects / timetracker.git / blobdiff