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 refactoring for subgroups.
[timetracker.git]
/
WEB-INF
/
lib
/
ttReportHelper.class.php
diff --git
a/WEB-INF/lib/ttReportHelper.class.php
b/WEB-INF/lib/ttReportHelper.class.php
index
38da987
..
26478c3
100644
(file)
--- a/
WEB-INF/lib/ttReportHelper.class.php
+++ b/
WEB-INF/lib/ttReportHelper.class.php
@@
-40,6
+40,9
@@
class ttReportHelper {
static function getWhere($options) {
global $user;
static function getWhere($options) {
global $user;
+ $group_id = $user->getGroup();
+ $org_id = $user->org_id;
+
// Prepare dropdown parts.
$dropdown_parts = '';
if ($options['client_id'])
// Prepare dropdown parts.
$dropdown_parts = '';
if ($options['client_id'])
@@
-61,17
+64,18
@@
class ttReportHelper {
if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
$user_list_part = " and l.user_id in ($userlist)";
else
if ($user->can('view_reports') || $user->can('view_all_reports') || $user->isClient())
$user_list_part = " and l.user_id in ($userlist)";
else
- $user_list_part = " and l.user_id = ".$user->
id
;
- $user_list_part .= " and l.group_id =
".$user->getGroup()
;
+ $user_list_part = " and l.user_id = ".$user->
getUser()
;
+ $user_list_part .= " and l.group_id =
$group_id and l.org_id = $org_id"
;
// Prepare sql query part for where.
// Prepare sql query part for where.
+ $dateFormat = $user->getDateFormat();
if ($options['period'])
if ($options['period'])
- $period = new Period($options['period'], new DateAndTime($
user->date_f
ormat));
+ $period = new Period($options['period'], new DateAndTime($
dateF
ormat));
else {
$period = new Period();
$period->setPeriod(
else {
$period = new Period();
$period->setPeriod(
- new DateAndTime($
user->date_f
ormat, $options['period_start']),
- new DateAndTime($
user->date_f
ormat, $options['period_end']));
+ new DateAndTime($
dateF
ormat, $options['period_start']),
+ new DateAndTime($
dateF
ormat, $options['period_end']));
}
$where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
" $user_list_part $dropdown_parts";
}
$where = " where l.status = 1 and l.date >= '".$period->getStartDate(DB_DATEFORMAT)."' and l.date <= '".$period->getEndDate(DB_DATEFORMAT)."'".
" $user_list_part $dropdown_parts";