Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-timesheet2
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
1
Merge Requests
1
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-timesheet2
Commits
6a5b8f25
Commit
6a5b8f25
authored
Jan 29, 2021
by
Weber
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Timesheet weekly report - replaced "no hours logged" with "0.00 h"
parent
19df6fa9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
weekly_report.tcl
www/weekly_report.tcl
+5
-5
No files found.
www/weekly_report.tcl
View file @
6a5b8f25
...
...
@@ -123,11 +123,11 @@ ad_proc im_do_row {
'days' is a list of dates in format 'YYYYMMDD' with seven elements, first day
}
{
set user_view_page
"/intranet/users/view"
set absence_view_page
"/intranet-timesheet2/absences/new?form_mode=display"
set date_format
"YYYY-MM-DD"
set label_hours_weekly_report
[
lang::message::lookup
""
intranet-timesheet2.hours_weekly_report
"h"
]
array set bgcolor
$bgcolorl
array set user_days
$user
_daysl
array set absence
$absencel
...
...
@@ -191,7 +191,6 @@ ad_proc im_do_row {
# Check for hours logged and write hours logged for this day
(
if
applicable
)
if
{
[
info
exists user_days
([
lindex
$days
$i
])]
}
{
set label_hours_weekly_report
[
lang::message::lookup
""
intranet-timesheet2.hours_weekly_report
"h"
]
lappend cell_text
"
$user
_days(
[
lindex
$days
$i
]
)
$label
_hours_weekly_report"
set absent_p
"t"
if
{
""
!=
$workflow
_key
}
{
...
...
@@ -212,8 +211,9 @@ ad_proc im_do_row {
# If no hours are logged and no absences are registered, set bg color of cell to yellow
if
{
$absent
_p ==
"f"
}
{
lappend cell_text
"
[
_ intranet-timesheet2.No_hours_logged
]
"
lappend cell_param
"style=
\"
background-color: #ffcc66;
\"
"
# lappend cell_text
"
[
_ intranet-timesheet2.No_hours_logged
]
"
lappend cell_text
"0.00
$label
_hours_weekly_report"
lappend cell_param
"style=
\"
background-color: #ffcc66;
\"
"
}
# Color code weekends?
...
...
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