import('form.Form');
import('form.ActionForm');
import('DateAndTime');
-import('ttTeamHelper');
import('ttGroupHelper');
import('Period');
import('ttProjectHelper');
import('ttReportHelper');
// Access check.
-if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports'))) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports') || ttAccessAllowed('view_client_reports'))) {
header('Location: access_denied.php');
exit();
}
require_once('plugins/CustomFields.class.php');
$custom_fields = new CustomFields();
$smarty->assign('custom_fields', $custom_fields);
+ $showCustomFieldCheckbox = $custom_fields->fields[0];
+ $showCustomFieldDropdown = $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN;
+ if ($showCustomFieldDropdown)
+ $showCustomFieldDropdown &= CustomFields::getOptions($custom_fields->fields[0]['id']);
}
$form = new Form('reportForm');
$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()) {
+$showClient = $user->isPluginEnabled('cl') && !$user->isClient();
+if ($showClient) {
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();
+ if (count($client_list) == 0) $showClient = false;
+}
+if ($showClient) {
$form->addInput(array('type'=>'combobox',
+ 'onchange'=>'fillProjectDropdown(this.value);',
'name'=>'client',
'style'=>'width: 250px;',
'data'=>$client_list,
'empty'=>array(''=>$i18n->get('dropdown.all'))));
}
-// If we have a TYPE_DROPDOWN custom field - add control to select an option.
-if ($custom_fields && $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN) {
- $form->addInput(array('type'=>'combobox','name'=>'option',
- 'style'=>'width: 250px;',
- 'value'=>$cl_cf_1,
- 'data'=>$custom_fields->options,
- 'empty'=>array(''=>$i18n->get('dropdown.all'))));
+// If we have a TYPE_DROPDOWN custom field - add a control to select an option.
+if ($showCustomFieldDropdown) {
+ $form->addInput(array('type'=>'combobox','name'=>'option',
+ 'style'=>'width: 250px;',
+ 'value'=>$cl_cf_1,
+ 'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))));
}
-// Add controls for projects and tasks.
-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->getUser());
+// Add project dropdown.
+$showProject = MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showProject) {
+ 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->getUser());
+ }
+ if (count($project_list) == 0) $showProject = false;
}
-$form->addInput(array('type'=>'combobox',
- 'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
- 'name'=>'project',
- 'style'=>'width: 250px;',
- 'data'=>$project_list,
- 'datakeys'=>array('id','name'),
- 'empty'=>array(''=>$i18n->get('dropdown.all'))));
-if (MODE_PROJECTS_AND_TASKS == $trackingMode) {
+if ($showProject) {
+ $form->addInput(array('type'=>'combobox',
+ 'onchange'=>'fillTaskDropdown(this.value);selectAssignedUsers(this.value);',
+ 'name'=>'project',
+ 'style'=>'width: 250px;',
+ 'data'=>$project_list,
+ 'datakeys'=>array('id','name'),
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
+
+// Add task dropdown.
+$showTask = MODE_PROJECTS_AND_TASKS == $trackingMode;
+if ($showTask) {
$task_list = ttGroupHelper::getActiveTasks();
+ if (count($task_list) == 0) $showTask = false;
+}
+if ($showTask) {
$form->addInput(array('type'=>'combobox',
'name'=>'task',
'style'=>'width: 250px;',
'empty'=>array(''=>$i18n->get('dropdown.all'))));
}
-// Add include records control.
-$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->get('dropdown.all'))));
+// Add billable dropdown.
+$showBillable = $user->isPluginEnabled('iv');
+if ($showBillable) {
+ $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', // TODO: how about a better name here?
+ 'style'=>'width: 250px;',
+ 'data'=>$include_options,
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))));
+}
// Add invoiced / not invoiced selector.
-if ($user->can('manage_invoices')) {
+$showInvoiceDropdown = $user->isPluginEnabled('iv') && $user->can('manage_invoices');
+if ($showInvoiceDropdown) {
$invoice_options = array('1'=>$i18n->get('form.reports.include_invoiced'),
'2'=>$i18n->get('form.reports.include_not_invoiced'));
$form->addInput(array('type'=>'combobox',
'data'=>$invoice_options,
'empty'=>array(''=>$i18n->get('dropdown.all'))));
}
+$showInvoiceCheckbox = $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->isClient());
-if ($user->can('manage_invoices') && $user->isPluginEnabled('ps')) {
+// Add paid status selector.
+$showPaidStatus = $user->isPluginEnabled('ps') && $user->can('manage_invoices');
+if ($showPaidStatus) {
$form->addInput(array('type'=>'combobox',
'name'=>'paid_status',
'style'=>'width: 250px;',
));
}
+// Add approved / not approved selector.
+$showApproved = $user->isPluginEnabled('ap') &&
+ ($user->can('view_own_reports') || $user->can('view_reports') ||
+ $user->can('view_all_reports') || ($user->can('view_client_reports') && $user->can('view_client_unapproved')));
+if ($showApproved) {
+ $form->addInput(array('type'=>'combobox',
+ 'name'=>'approved',
+ 'style'=>'width: 250px;',
+ 'data'=>array('1'=>$i18n->get('dropdown.approved'),'2'=>$i18n->get('dropdown.not_approved')),
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))
+ ));
+}
+
+// Add timesheet assignment selector.
+$showTimesheetDropdown = $user->isPluginEnabled('ts');
+if ($showTimesheetDropdown) {
+ $form->addInput(array('type'=>'combobox',
+ 'name'=>'timesheet',
+ 'style'=>'width: 250px;',
+ 'data'=>array(TIMESHEET_NOT_ASSIGNED=>$i18n->get('form.reports.include_not_assigned'),
+ TIMESHEET_ASSIGNED=>$i18n->get('form.reports.include_assigned'),
+ TIMESHEET_PENDING=>$i18n->get('form.reports.include_pending'),
+ TIMESHEET_APPROVED=>$i18n->get('dropdown.approved'),
+ TIMESHEET_NOT_APPROVED=>$i18n->get('dropdown.not_approved')),
+ 'empty'=>array(''=>$i18n->get('dropdown.all'))
+ ));
+}
+$showTimesheetCheckbox = $user->isPluginEnabled('ts');
+
+// Add user table.
+$showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
$user_list = array();
-if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient()) {
+if ($showUsers) {
// Prepare user and assigned projects arrays.
if ($user->can('view_reports') || $user->can('view_all_reports')) {
$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
- $options = array('max_rank'=>$max_rank);
- $users = $user->getUsers($options); // Active and inactive users.
+ if ($user->can('view_own_reports')) {
+ $options_active = array('max_rank'=>$max_rank,'include_self'=>true,'status'=>ACTIVE);
+ $options_inactive = array('max_rank'=>$max_rank,'include_self'=>true,'status'=>INACTIVE);
+ } else {
+ $options_active = array('max_rank'=>$max_rank,'status'=>ACTIVE);
+ $options_inactive = array('max_rank'=>$max_rank,'status'=>INACTIVE);
+ }
+ $active_users = $user->getUsers($options_active);
+ $inactive_users = $user->getUsers($options_inactive);
+ }
+ elseif ($user->isClient()) {
+ $options_active = array('status'=>ACTIVE);
+ $options_inactive = array('status'=>INACTIVE);
+ $active_users = ttGroupHelper::getUsersForClient($options_active);
+ $inactive_users = ttGroupHelper::getUsersForClient($options_inactive);
+ }
+
+ foreach ($active_users as $single_user) {
+ $user_list_active[$single_user['id']] = $single_user['name'];
+ $projects = ttProjectHelper::getAssignedProjects($single_user['id']);
+ if ($projects) {
+ foreach ($projects as $single_project) {
+ $assigned_projects[$single_user['id']][] = $single_project['id'];
+ }
+ }
}
- elseif ($user->isClient())
- $users = ttTeamHelper::getUsersForClient(); // Active and inactive users for clients.
+ $row_count = ceil(count($user_list_active)/3);
+ $form->addInput(array('type'=>'checkboxgroup',
+ 'name'=>'users_active',
+ 'data'=>$user_list_active,
+ 'layout'=>'V',
+ 'groupin'=>$row_count,
+ 'style'=>'width: 100%;'));
- foreach ($users as $single_user) {
- $user_list[$single_user['id']] = $single_user['name'];
+ foreach ($inactive_users as $single_user) {
+ $user_list_inactive[$single_user['id']] = $single_user['name'];
$projects = ttProjectHelper::getAssignedProjects($single_user['id']);
if ($projects) {
foreach ($projects as $single_project) {
}
}
}
- $row_count = ceil(count($user_list)/3);
+ $row_count = ceil(count($user_list_inactive)/3);
$form->addInput(array('type'=>'checkboxgroup',
- 'name'=>'users',
- 'data'=>$user_list,
+ 'name'=>'users_inactive',
+ 'data'=>$user_list_inactive,
'layout'=>'V',
'groupin'=>$row_count,
'style'=>'width: 100%;'));
$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'))
+// Add checkboxes for "Show fields" block.
+if ($showClient)
$form->addInput(array('type'=>'checkbox','name'=>'chclient'));
-if (($user->can('manage_invoices') || $user->isClient()) && $user->isPluginEnabled('iv'))
+if ($showProject)
+ $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
+if ($showTask)
+ $form->addInput(array('type'=>'checkbox','name'=>'chtask'));
+if ($showCustomFieldCheckbox)
+ $form->addInput(array('type'=>'checkbox','name'=>'chcf_1'));
+if ($showInvoiceCheckbox)
$form->addInput(array('type'=>'checkbox','name'=>'chinvoice'));
-if ($user->can('manage_invoices') && $user->isPluginEnabled('ps'))
+if ($showPaidStatus)
$form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
-if ($user->can('view_reports') || $user->can('view_all_reports'))
+$showIP = $user->can('view_reports') || $user->can('view_all_reports');
+if ($showIP)
$form->addInput(array('type'=>'checkbox','name'=>'chip'));
-if (MODE_PROJECTS == $trackingMode || MODE_PROJECTS_AND_TASKS == $trackingMode)
- $form->addInput(array('type'=>'checkbox','name'=>'chproject'));
-if (MODE_PROJECTS_AND_TASKS == $trackingMode)
- $form->addInput(array('type'=>'checkbox','name'=>'chtask'));
-if ((TYPE_START_FINISH == $user->getRecordType()) || (TYPE_ALL == $user->getRecordType())) {
+$recordType = $user->getRecordType();
+$showStart = TYPE_START_FINISH == $recordType || TYPE_ALL == $recordType;
+$showFinish = $showStart;
+if ($showStart)
$form->addInput(array('type'=>'checkbox','name'=>'chstart'));
+if ($showFinish)
$form->addInput(array('type'=>'checkbox','name'=>'chfinish'));
-}
$form->addInput(array('type'=>'checkbox','name'=>'chduration'));
$form->addInput(array('type'=>'checkbox','name'=>'chnote'));
$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'))
+$showWorkUnits = $user->isPluginEnabled('wu');
+if ($showWorkUnits)
$form->addInput(array('type'=>'checkbox','name'=>'chunits'));
+if ($showTimesheetCheckbox)
+ $form->addInput(array('type'=>'checkbox','name'=>'chtimesheet'));
+if ($showApproved)
+ $form->addInput(array('type'=>'checkbox','name'=>'chapproved'));
+$showFiles = $user->isPluginEnabled('at');
+if ($showFiles)
+ $form->addInput(array('type'=>'checkbox','name'=>'chfiles'));
+
+// Add a hidden control for timesheet_user_id (who to generate a timesheet for).
+if ($showTimesheetCheckbox)
+ $form->addInput(array('type'=>'hidden','name'=>'timesheet_user_id'));
// Add group by control.
$group_by_options['no_grouping'] = $i18n->get('form.reports.group_by_no');
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));
+ $form->setValueByElement('users_active', array_keys($user_list_active));
$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('chinvoice', '0');
- $form->setValueByElement('chpaid', '0');
- $form->setValueByElement('chip', '0');
- $form->setValueByElement('chproject', '1');
$form->setValueByElement('chstart', '1');
+ $form->setValueByElement('chfinish', '1');
$form->setValueByElement('chduration', '1');
- $form->setValueByElement('chcost', '0');
+
+ $form->setValueByElement('chproject', '1');
$form->setValueByElement('chtask', '1');
- $form->setValueByElement('chfinish', '1');
$form->setValueByElement('chnote', '1');
+ $form->setValueByElement('chcost', '0');
+
+ $form->setValueByElement('chtimesheet', '0');
+ $form->setValueByElement('chip', '0');
+ $form->setValueByElement('chapproved', '0');
+ $form->setValueByElement('chpaid', '0');
+
$form->setValueByElement('chcf_1', '0');
$form->setValueByElement('chunits', '0');
+ $form->setValueByElement('chinvoice', '0');
+ $form->setValueByElement('chfiles', '1');
+
$form->setValueByElement('chtotalsonly', '0');
}
ttFavReportHelper::loadReport($bean);
// If user selected no favorite report - mark all user checkboxes (most probable scenario).
- if ($bean->getAttribute('favorite_report') == -1)
- $form->setValueByElement('users', array_keys($user_list));
+ if ($bean->getAttribute('favorite_report') == -1) {
+ $form->setValueByElement('users_active', array_keys($user_list_active));
+ $form->setValueByElement('users_inactive', false);
+ }
// Save form data in session for future use.
$bean->saveBean();
} 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'));
}
} // isPost
+$smarty->assign('client_list', $client_list);
+$smarty->assign('show_client', $showClient);
+$smarty->assign('show_cf_1_dropdown', $showCustomFieldDropdown);
+$smarty->assign('show_cf_1_checkbox', $showCustomFieldCheckbox);
+$smarty->assign('show_project', $showProject);
+$smarty->assign('show_task', $showTask);
+$smarty->assign('show_billable', $showBillable);
+$smarty->assign('show_approved', $showApproved);
+$smarty->assign('show_invoice_dropdown', $showInvoiceDropdown);
+$smarty->assign('show_invoice_checkbox', $showInvoiceCheckbox);
+$smarty->assign('show_paid_status', $showPaidStatus);
+$smarty->assign('show_timesheet_dropdown', $showTimesheetDropdown);
+$smarty->assign('show_timesheet_checkbox', $showTimesheetCheckbox);
+$smarty->assign('show_active_users', $showUsers && $active_users);
+$smarty->assign('show_inactive_users', $showUsers && $inactive_users);
+$smarty->assign('show_start', $showStart);
+$smarty->assign('show_finish', $showFinish);
+$smarty->assign('show_work_units', $showWorkUnits);
+$smarty->assign('show_ip', $showIP);
+$smarty->assign('show_files', $showFiles);
$smarty->assign('project_list', $project_list);
$smarty->assign('task_list', $task_list);
$smarty->assign('assigned_projects', $assigned_projects);
projects / timetracker.git / blobdiff