Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
elexis
elexis-3-core
Commits
ac6a867f
Commit
ac6a867f
authored
Oct 11, 2021
by
Marco Descher
Browse files
[23238] TaskService do not incur manual tasks
parent
015b4ff2
Pipeline
#22645
passed with stages
in 4 minutes and 13 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
bundles/ch.elexis.core.tasks/src/ch/elexis/core/tasks/internal/service/TaskServiceUtil.java
View file @
ac6a867f
...
...
@@ -9,12 +9,13 @@ import ch.elexis.core.services.IQuery;
import
ch.elexis.core.services.IQuery.COMPARATOR
;
import
ch.elexis.core.tasks.model.ITaskDescriptor
;
import
ch.elexis.core.tasks.model.ModelPackage
;
import
ch.elexis.core.tasks.model.TaskTriggerType
;
public
class
TaskServiceUtil
{
/**
* Load the (active) task descriptors for a given runnable we are responsible for (that is, assigned as
* runner)
* runner)
. Task descriptors with {@link TaskTriggerType#MANUAL} are not considered.
*
* @param identifiedRunnable
* @param taskModelService
...
...
@@ -27,6 +28,8 @@ public class TaskServiceUtil {
query
.
and
(
ModelPackage
.
Literals
.
ITASK_DESCRIPTOR__ACTIVE
,
COMPARATOR
.
EQUALS
,
true
);
query
.
and
(
ModelPackage
.
Literals
.
ITASK_DESCRIPTOR__IDENTIFIED_RUNNABLE_ID
,
COMPARATOR
.
EQUALS
,
identifiedRunnable
.
getId
());
query
.
and
(
ModelPackage
.
Literals
.
ITASK_DESCRIPTOR__TRIGGER_TYPE
,
COMPARATOR
.
NOT_EQUALS
,
TaskTriggerType
.
MANUAL
.
ordinal
());
query
.
startGroup
();
query
.
and
(
ModelPackage
.
Literals
.
ITASK_DESCRIPTOR__RUNNER
,
COMPARATOR
.
EQUALS
,
contextService
.
getStationIdentifier
());
...
...
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