projects
/
timetracker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduced ttGroupHelper class as part of refactoring.
[timetracker.git]
/
reports.php
diff --git
a/reports.php
b/reports.php
index
f6d9cf0
..
f6655d7
100644
(file)
--- a/
reports.php
+++ b/
reports.php
@@
-37,7
+37,7
@@
import('ttFavReportHelper');
import('ttClientHelper');
// Access check.
import('ttClientHelper');
// Access check.
-if (!ttAccess
Check(right_view_reports
)) {
+if (!ttAccess
Allowed('view_own_reports'
)) {
header('Location: access_denied.php');
exit();
}
header('Location: access_denied.php');
exit();
}
@@
-122,7
+122,7
@@
$form->addInput(array('type'=>'combobox',
'data'=>$include_options,
'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
'data'=>$include_options,
'empty'=>array(''=>$i18n->getKey('dropdown.all'))));
-if ($user->isPluginEnabled('ps')) {
+if ($user->
canManageTeam() && $user->
isPluginEnabled('ps')) {
$form->addInput(array('type'=>'combobox',
'name'=>'paid_status',
'style'=>'width: 250px;',
$form->addInput(array('type'=>'combobox',
'name'=>'paid_status',
'style'=>'width: 250px;',
@@
-187,6
+187,10
@@
if ($user->isPluginEnabled('cl'))
$form->addInput(array('type'=>'checkbox','name'=>'chclient'));
if (($user->canManageTeam() || $user->isClient()) && $user->isPluginEnabled('iv'))
$form->addInput(array('type'=>'checkbox','name'=>'chinvoice'));
$form->addInput(array('type'=>'checkbox','name'=>'chclient'));
if (($user->canManageTeam() || $user->isClient()) && $user->isPluginEnabled('iv'))
$form->addInput(array('type'=>'checkbox','name'=>'chinvoice'));
+if ($user->canManageTeam() && $user->isPluginEnabled('ps'))
+ $form->addInput(array('type'=>'checkbox','name'=>'chpaid'));
+if ($user->canManageTeam())
+ $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)
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)
@@
-197,12
+201,10
@@
if ((TYPE_START_FINISH == $user->record_type) || (TYPE_ALL == $user->record_type
}
$form->addInput(array('type'=>'checkbox','name'=>'chduration'));
$form->addInput(array('type'=>'checkbox','name'=>'chnote'));
}
$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 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'));
-
// 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');
// 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');
@@
-231,7
+233,7
@@
$form->addInput(array('type'=>'submit','name'=>'btn_generate','value'=>$i18n->ge
$bean = new ActionForm('reportBean', $form, $request);
// At this point form values are obtained from session if they are there.
$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));
// 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));
@@
-239,6
+241,8
@@
if (($request->getMethod() == 'GET') && !$bean->isSaved()) {
$form->setValueByElement('end_date', $period->getEndDate());
$form->setValueByElement('chclient', '1');
$form->setValueByElement('chinvoice', '0');
$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('chproject', '1');
$form->setValueByElement('chstart', '1');
$form->setValueByElement('chduration', '1');