Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-workflow
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-workflow
Commits
020c94f8
Commit
020c94f8
authored
Aug 30, 2023
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cosine #5678: Allow vacation replacements to move purchasing WF:
Fixed bug in im_workflow_replacing_vacation_users
parent
f60de344
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
intranet-workflow-procs.tcl
tcl/intranet-workflow-procs.tcl
+6
-4
No files found.
tcl/intranet-workflow-procs.tcl
View file @
020c94f8
...
...
@@ -1021,10 +1021,13 @@ ad_proc -public im_workflow_new_journal {
}
ad_proc -public im_workflow_replacing_vacation_users
{
{
-user_id
""
}
}
{
Returns the list of users that the current_user_id is replacing.
Returns the list of users that the current_user_id is replacing,
including himself.
}
{
set current_user_id
[
ad_conn user_id
]
if
{
""
ne
$user
_id
}
{
set current_user_id
$user
_id
}
# Vacation Absence Logic:
# Check if the current user is the vacation replacement for some other user
...
...
@@ -1042,9 +1045,9 @@ ad_proc -public im_workflow_replacing_vacation_users {
"
]]
}
# Check if the current user is replacing users during their vacations
if
{[
im_column_exists im_employees vacation_replacement_id
]}
{
# Get all the guys who have set vacation replacement to the current user
set replacement_ids
[
concat
[
db_list employee_replacement
"
set replacement_ids
[
concat
$replacement
_ids
[
db_list employee_replacement
"
select e.employee_id
from im_employees e
where e.vacation_replacement_id = :current_user_id
...
...
@@ -1055,7 +1058,6 @@ ad_proc -public im_workflow_replacing_vacation_users {
}
ad_proc -public im_workflow_task_action
{
-task_id:required
-action:required
...
...
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