import('form.Form');
import('form.ActionForm');
import('DateAndTime');
-import('ttTeamHelper');
+import('ttGroupHelper');
import('Period');
import('ttProjectHelper');
import('ttFavReportHelper');
import('ttClientHelper');
+import('ttReportHelper');
// Access check.
if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) {
header('Location: access_denied.php');
exit();
}
+if (!$user->exists()) {
+ header('Location: access_denied.php'); // No users in subgroup.
+ exit();
+}
+// End of access checks.
+
+$trackingMode = $user->getTrackingMode();
// Use custom fields plugin if it is enabled.
if ($user->isPluginEnabled('cf')) {
require_once('plugins/CustomFields.class.php');
- $custom_fields = new CustomFields($user->group_id);
+ $custom_fields = new CustomFields();
$smarty->assign('custom_fields', $custom_fields);
}
$form = new Form('reportForm');
// Get saved favorite reports for user.
-$report_list = ttFavReportHelper::getReports($user->id);
+$report_list = ttFavReportHelper::getReports();
$form->addInput(array('type'=>'combobox',
'name'=>'favorite_report',
- 'onchange'=>'document.reportForm.fav_report_changed.value=1;document.reportForm.submit();',
+ 'onchange'=>'this.form.fav_report_changed.value=1;this.form.submit();',
'style'=>'width: 250px;',
'data'=>$report_list,
'datakeys'=>array('id','name'),
}
// 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 {
- $project_list = ttProjectHelper::getAssignedProjects($user->id);
+ $project_list = ttProjectHelper::getAssignedProjects($user->getUser());
}
$form->addInput(array('type'=>'combobox',
'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
'data'=>$project_list,
'datakeys'=>array('id','name'),
'empty'=>array(''=>$i18n->get('dropdown.all'))));
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode) {
- $task_list = ttTeamHelper::getActiveTasks($user->group_id);
+if (MODE_PROJECTS_AND_TASKS == $trackingMode) {
+ $task_list = ttGroupHelper::getActiveTasks();
$form->addInput(array('type'=>'combobox',
'name'=>'task',
'style'=>'width: 250px;',
'empty'=>array(''=>$i18n->get('dropdown.all'))));
// Add invoiced / not invoiced selector.
-$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')) {
+ $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->canManageTeam() && $user->isPluginEnabled('ps')) {
+if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) {
$form->addInput(array('type'=>'combobox',
'name'=>'paid_status',
'style'=>'width: 250px;',
if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
// Prepare user and assigned projects arrays.
if ($user->can('view_reports') || $user->can('view_all_reports')) {
- $max_rank = $user->rank-1;
- if ($user->can('view_all_reports')) $max_rank = 512;
+ $rank = $user->getMaxRankForGroup($user->getGroup());
+ 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
$users = $user->getUsers($options); // Active and inactive users.
}
elseif ($user->isClient())
- $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
+ $users = ttGroupHelper::getUsersForClient(); // Active and inactive users for clients.
foreach ($users as $single_user) {
$user_list[$single_user['id']] = $single_user['name'];
// 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->canManageTeam() && $user->isPluginEnabled('ps'))
+if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
$form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
-if ($user->canManageTeam())
+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)
+if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
$form->addInput(array('type'=>'checkbox','name'=>'chproject'));
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS_AND_TASKS == $trackingMode)
$form->addInput(array('type'=>'checkbox','name'=>'chtask'));
-if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type)) {
+if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
$form->addInput(array('type'=>'checkbox','name'=>'chstart'));
$form->addInput(array('type'=>'checkbox','name'=>'chfinish'));
}
// 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->get('form.reports.group_by_no');
$group_by_options['date'] = $i18n->get('form.reports.group_by_date');
-if ($user->canManageTeam() || $user->isClient())
+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->get('form.reports.group_by_client');
-if (MODE_PROJECTS == $user->tracking_mode || MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
$group_by_options['project'] = $i18n->get('form.reports.group_by_project');
-if (MODE_PROJECTS_AND_TASKS == $user->tracking_mode)
+if (MODE_PROJECTS_AND_TASKS == $trackingMode)
$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.
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));
+ $period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->getDateFormat()));
$form->setValueByElement('start_date', $period->getStartDate());
$form->setValueByElement('end_date', $period->getEndDate());
$form->setValueByElement('chclient', '1');
$form->setValueByElement('chfinish', '1');
$form->setValueByElement('chnote', '1');
$form->setValueByElement('chcf_1', '0');
+ $form->setValueByElement('chunits', '0');
$form->setValueByElement('chtotalsonly', '0');
}
// User changed favorite report. We need to load new values into the form.
if ($bean->getAttribute('favorite_report')) {
// This loads new favorite report options into the bean (into our form).
- ttFavReportHelper::loadReport($user->id, $bean);
+ ttFavReportHelper::loadReport($bean);
// If user selected no favorite report - mark all user checkboxes (most probable scenario).
if ($bean->getAttribute('favorite_report') == -1)
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($bean);
if (!$id)
$err->add($i18n->get('error.db'));
if ($err->no()) {
// Load default report.
$bean->setAttribute('favorite_report','');
$bean->setAttribute('new_fav_report', $report_list[0]['name']);
- ttFavReportHelper::loadReport($user->id, $bean);
+ ttFavReportHelper::loadReport($bean);
$form->setValueByElement('users', array_keys($user_list));
$bean->saveBean();
header('Location: reports.php');
} else {
// Generate button pressed. Check some values.
if (!$bean->getAttribute('period')) {
- $start_date = new DateAndTime($user->date_format, $bean->getAttribute('start_date'));
+ $start_date = new DateAndTime($user->getDateFormat(), $bean->getAttribute('start_date'));
if ($start_date->isError() || !$bean->getAttribute('start_date'))
$err->add($i18n->get('error.field'), $i18n->get('label.start_date'));
- $end_date = new DateAndTime($user->date_format, $bean->getAttribute('end_date'));
+ $end_date = new DateAndTime($user->getDateFormat(), $bean->getAttribute('end_date'));
if ($end_date->isError() || !$bean->getAttribute('end_date'))
$err->add($i18n->get('error.field'), $i18n->get('label.end_date'));
if ($start_date->compare($end_date) > 0)
$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();
projects / timetracker.git / blobdiff