Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
acs-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
acs-workflow
Commits
38bd270c
Commit
38bd270c
authored
May 20, 2019
by
cosine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Now adding a vacation replacement user to tasks
parent
6805997f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
19 deletions
+21
-19
workflow-procs.tcl
tcl/workflow-procs.tcl
+5
-17
task-action.adp
www/task-action.adp
+5
-1
task.tcl
www/task.tcl
+11
-1
No files found.
tcl/workflow-procs.tcl
View file @
38bd270c
...
...
@@ -109,10 +109,10 @@ ad_proc -public wf_task_list {
}
set sql
"
select
[
join
$select
",
\n
"
]
from
[
join
$from
",
\n
"
]
where
[
join
$where
"
\n
and "
]
"
select
[
join
$select
",
\n
"
]
from
[
join
$from
",
\n
"
]
where
[
join
$where
"
\n
and "
]
"
db_foreach user_tasks
$sql
-column_array row
{
lappend result
[
array
get row
]
}
if_no_rows
{
...
...
@@ -150,10 +150,9 @@ ad_proc -public wf_task_info {
task_id
}
{
Get detailed information about one task.
@param date_format Use this to customize the date-format
used. Must be a valid Oracle date format specification.
@return an <code>
[
array
get
]
</code> representation with the following keys:
<code>task_id, case_id, object_id, object_name, object_type_pretty, workflow_key, task_name,
state, state_pretty, enabled_date, enabled_date_pretty, started_date, started_date_pretty,
...
...
@@ -162,30 +161,19 @@ ad_proc -public wf_task_info {
holding_user_email, hold_timeout, hold_timeout_pretty, deadline, deadline_pretty, days_till_deadline
estimated_minutes, instructions, sysdate, journal, attributes_to_set, assigned_users,
this_user_is_assigned_p, roles_to_assign</code>.
<p>
The values for the keys <code>journal, attributes_to_set and assigned_users</code>
are themselves Tcl lists of <code>
[
array
get
]
</code> repesentations. For the journal entry, see <a
href=
"/api-doc/proc-view?proc=wf_journal"
><code>wf_journal</code></a>.
<p>
The key <code>attribute_to_set</code> contains these keys: <code>attribute_id, attribute_name,
pretty_name, datatype, value, wf_datatype</code>.
<p>
The key <code>assigned_users</code> contains these keys: <code>user_id, name, email</code>.
<p>
The key <code>transitions_to_assign</code> contains these keys: <code>transition_key, transition_name</code>
<p>
Sysdate is provided, so you can calculate the number of days
between now and any of the other dates provided.
...
...
www/task-action.adp
View file @
38bd270c
...
...
@@ -29,6 +29,10 @@ if {[llength $approval_attributes] == 0} { set approval_task_p 0 }
# is assigned to the task.
if {!$task(this_user_is_assigned_p)} { set approval_task_p 0 }
# ad_return_complaint 1 "<pre>[join [array get task] "\n"]</pre>"
# Show reassign links (Assign yourself / reassign)?
set reassign_p [im_permission $user_id wf_reassign_tasks]
...
...
@@ -115,7 +119,7 @@ set reassign_p [im_permission $user_id wf_reassign_tasks]
<tr>
<th align="right">#acs-workflow.Comment#<br></th>
<td><textarea name="msg" cols=
20 rows=4
></textarea></td>
<td><textarea name="msg" cols=
30 rows=5
></textarea></td>
</tr>
<tr>
...
...
www/task.tcl
View file @
38bd270c
...
...
@@ -58,6 +58,14 @@ wf_sweep_message_transition_tcl
# ---------------------------------------------------------
# Does the current user have a vacation replacement?
# In this case assign the user so that he or she can
# execute the same actions
im_absences_assign_vacation_replacement -task_id
$task
_id
# ---------------------------------------------------------
# Get everything about the task
...
...
@@ -70,8 +78,10 @@ if {[catch {
[
lang::message::lookup
""
acs-workflow.Task_not_found_message
"
This error can occur if a system administrator has deleted a workflow.<br>
This situation should not occur during normal operations.<p>
Please contact your System Administrator
Please contact your System Administrator
.
"
]
<br> <br>Here is the error message:
<pre>
$err
_msg</pre>
"
return
}
...
...
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