$showCustomFieldCheckbox = $custom_fields->fields[0];
$showCustomFieldDropdown = $custom_fields->fields[0] && $custom_fields->fields[0]['type'] == CustomFields::TYPE_DROPDOWN;
if ($showCustomFieldDropdown)
- $showCustomFieldDropdown &= count($custom_fields->options) > 0;
+ $showCustomFieldDropdown &= CustomFields::getOptions($custom_fields->fields[0]['id']);
}
$form = new Form('reportForm');
}
if ($showClient) {
$form->addInput(array('type'=>'combobox',
+ 'onchange'=>'fillProjectDropdown(this.value);',
'name'=>'client',
'style'=>'width: 250px;',
'data'=>$client_list,
$form->addInput(array('type'=>'combobox','name'=>'option',
'style'=>'width: 250px;',
'value'=>$cl_cf_1,
- 'data'=>$custom_fields->options,
+ 'data'=>CustomFields::getOptions($custom_fields->fields[0]['id']),
'empty'=>array(''=>$i18n->get('dropdown.all'))));
}
));
}
+// 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.
-$showTimesheet = $user->isPluginEnabled('ts') &&
- ($user->can('view_own_timesheets') || $user->can('manage_own_timesheets') ||
- $user->can('view_timesheets') || $user->can('manage_timesheets') || $user->can('approve_timesheets'));
-if ($showTimesheet) {
+$showTimesheetDropdown = $user->isPluginEnabled('ts');
+if ($showTimesheetDropdown) {
$form->addInput(array('type'=>'combobox',
'name'=>'timesheet',
'style'=>'width: 250px;',
- 'data'=>array('1'=>$i18n->get('form.reports.include_assigned'),'2'=>$i18n->get('form.reports.include_not_assigned')),
+ '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();
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 = ttGroupHelper::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%;'));
$showWorkUnits = $user->isPluginEnabled('wu');
if ($showWorkUnits)
$form->addInput(array('type'=>'checkbox','name'=>'chunits'));
-if ($showTimesheet)
+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 ($showTimesheet)
+if ($showTimesheetCheckbox)
$form->addInput(array('type'=>'hidden','name'=>'timesheet_user_id'));
// Add group by control.
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('chtimesheet', '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();
}
} // 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', $showTimesheet);
-$smarty->assign('show_users', $showUsers);
+$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);