projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A bit more progress on timesheet coding.
[timetracker.git]
/
reports.php
diff --git
a/reports.php
b/reports.php
index
d6a9a70
..
fc77e09
100644
(file)
--- a/
reports.php
+++ b/
reports.php
@@
-193,8
+193,7
@@
if ($showApproved) {
// Add timesheet assignment selector.
$showTimesheetDropdown = $user->isPluginEnabled('ts') &&
// Add timesheet assignment selector.
$showTimesheetDropdown = $user->isPluginEnabled('ts') &&
- ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
- $user->can('view_all_timesheets') || ($user->can('view_client_timesheets')));
+ ($user->can('view_own_timesheets') || $user->can('view_timesheets') || $user->can('view_all_timesheets'));
if ($showTimesheetDropdown) {
$form->addInput(array('type'=>'combobox',
'name'=>'timesheet',
if ($showTimesheetDropdown) {
$form->addInput(array('type'=>'combobox',
'name'=>'timesheet',
@@
-208,8
+207,7
@@
if ($showTimesheetDropdown) {
));
}
$showTimesheetCheckbox = $user->isPluginEnabled('ts') &&
));
}
$showTimesheetCheckbox = $user->isPluginEnabled('ts') &&
- ($user->can('view_own_timesheets') || $user->can('view_timesheets') ||
- $user->can('view_all_timesheets') || $user->can('view_client_timesheets'));
+ ($user->can('view_own_timesheets') || $user->can('view_timesheets') || $user->can('view_all_timesheets'));
// Add user table.
$showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
// Add user table.
$showUsers = $user->can('view_reports') || $user->can('view_all_reports') || $user->isClient();
@@
-336,20
+334,26
@@
if ($request->isGet() && !$bean->isSaved()) {
$period = new Period(INTERVAL_THIS_MONTH, new DateAndTime($user->getDateFormat()));
$form->setValueByElement('start_date', $period->getStartDate());
$form->setValueByElement('end_date', $period->getEndDate());
$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('chclient', '1');
- $form->setValueByElement('chinvoice', '0');
- $form->setValueByElement('chpaid', '0');
- $form->setValueByElement('chip', '0');
- $form->setValueByElement('chproject', '1');
$form->setValueByElement('chstart', '1');
$form->setValueByElement('chstart', '1');
+ $form->setValueByElement('chfinish', '1');
$form->setValueByElement('chduration', '1');
$form->setValueByElement('chduration', '1');
- $form->setValueByElement('chcost', '0');
+
+ $form->setValueByElement('chproject', '1');
$form->setValueByElement('chtask', '1');
$form->setValueByElement('chtask', '1');
- $form->setValueByElement('chfinish', '1');
$form->setValueByElement('chnote', '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('chcf_1', '0');
$form->setValueByElement('chunits', '0');
- $form->setValueByElement('chtimesheet', '0');
+ $form->setValueByElement('chinvoice', '0');
+
$form->setValueByElement('chtotalsonly', '0');
}
$form->setValueByElement('chtotalsonly', '0');
}