Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-reporting
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project-open
intranet-reporting
Commits
290c6bac
Commit
290c6bac
authored
Feb 04, 2019
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fixed report parameters that lead to no data shown
parent
c759d420
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
timesheet-monthly-hours-absences.tcl
www/timesheet-monthly-hours-absences.tcl
+3
-2
No files found.
www/timesheet-monthly-hours-absences.tcl
View file @
290c6bac
...
...
@@ -400,6 +400,7 @@ set im_user_absence_type_travel 5003
set
im_user_absence_type_bankholiday 5005
set
im_user_absence_type_training 5004
# ------------------------------------------------------------
# Conditional SQL Where-Clause
#
...
...
@@ -452,7 +453,7 @@ if { $project_status_id ne "" && $project_status_id > 0 } {
lappend criteria
"p.project_status_id in (
[
join
[
im_sub_categories
$project
_status_id
]
","
]
)"
}
if
{[
info
exists user_id
]
&& 0
!=
$user
_id &&
""
!=
$user
_id && !$view_hours_all_p
}
{
if
{[
info
exists user_id
]
&& 0
ne
$user
_id &&
""
ne
$user
_id && !$view_hours_all_p
}
{
lappend criteria
"h.user_id = :user_id"
}
...
...
@@ -475,7 +476,7 @@ set outer_where ""
set
criteria_outer
[
list
]
# Check for filter "Employee"
if
{
""
!=
$user
_id &&
$view
_hours_all_p
}
{
lappend criteria_outer
"user_id = :user_id"
}
if
{
""
ne
$user
_id && 0 ne
$user
_id &&
$view
_hours_all_p
}
{
lappend criteria_outer
"user_id = :user_id"
}
# Check for filter "Cost Center"
if
{
"0"
!=
$cost
_center_id &&
""
!=
$cost
_center_id
}
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment