Added a completion rule for assignees, so that a use can choose based on the task when the assignments are completed enough to finish the task.

e-suite.Service.WorkflowProcessor/WorkflowProcessor.cs

@@ -191,7 +191,7 @@ public class WorkflowProcessor : IWorkflowProcessor
             .GetInterfaces()
             .FirstOrDefault(i =>
                 i.IsGenericType &&
-                i.GetGenericTypeDefinition() == typeof(IAssignees<>));
+                i.GetGenericTypeDefinition() == typeof(IAssignees<,>));
 
         if (typedInterface == null)
             throw new InvalidOperationException("Task does not implement IAssignees<T>.");

e-suite.Workflow.Core/Enums/ApprovalVerdict.cs

@@ -5,7 +5,6 @@ namespace e_suite.Workflow.Core.Enums;
 [Description("Verdict")]
 public enum ApprovalVerdict
 {
-    None,
     Approved,
     Rejected
 }

e-suite.Workflow.Core/Enums/RuleOperator.cs

@@ -0,0 +1,13 @@
+namespace e_suite.Workflow.Core.Enums;
+
+public enum RuleOperator
+{
+    All,
+    Any,
+    CountAtLeast,
+    CountExactly,
+    FilterByRaci,
+    FilterByOutcome,
+    And,
+    Or
+}

e-suite.Workflow.Core/Interfaces/CompletionRule.cs

@@ -0,0 +1,14 @@
+using e_suite.Workflow.Core.Enums;
+using eSuite.Core.Workflow;
+
+namespace e_suite.Workflow.Core.Interfaces;
+
+public class CompletionRule<TOutcome>
+{
+    public RuleOperator Operator { get; set; }
+    public List<CompletionRule<TOutcome>>? Children { get; set; }
+
+    public Raci? RaciFilter { get; set; }
+    public TOutcome RequiredOutcome { get; set; } = default!;
+    public int? Threshold { get; set; }
+}

e-suite.Workflow.Core/Interfaces/IAssignees.cs

@@ -1,4 +1,5 @@
 using e_suite.Workflow.Core.Attributes;
+using e_suite.Workflow.Core.Enums;
 using System.ComponentModel.DataAnnotations;
 
 namespace e_suite.Workflow.Core.Interfaces;
@@ -9,9 +10,10 @@ public interface IAssignees
 }
 
 [TaskCapability]
-public interface IAssignees<T> : IAssignees where T : ITaskAssignee
+public interface IAssignees<TTaskAssignee, TOutcome> : IAssignees, IOutcome<TOutcome> where TTaskAssignee : ITaskAssignee
 {
     [Required]
-    List<T> Assignees { get; set; }
+    List<TTaskAssignee> Assignees { get; set; }
 
+    CompletionRule<TOutcome> AssigneesCompletionRule { get; set; }
 }

e-suite.Workflow.Core/Tasks/AdhocApprovalTask.cs

@@ -5,9 +5,10 @@ using e_suite.Workflow.Core.Interfaces;
 namespace e_suite.Workflow.Core.Tasks;
 
 [GeneralTask(taskIcon: "faEyeSlash")]
-public class AdhocApprovalTask : TaskBase, IAssignees<ApprovalTaskAssignee>, IOutcome<ApprovalVerdict>
+public class AdhocApprovalTask : TaskBase, IAssignees<ApprovalTaskAssignee, ApprovalVerdict>
 {
     public List<ApprovalTaskAssignee> Assignees { get; set; } = [];
+    public CompletionRule<ApprovalVerdict> AssigneesCompletionRule { get; set; }
     public ApprovalVerdict TaskOutcome { get; set; }
-    public List<OutcomeAction<ApprovalVerdict>> OutcomeActions { get; set; } = [];
+    public List<OutcomeAction<ApprovalVerdict>> OutcomeActions { get; set; }
 }

e-suite.Workflow.Core/Tasks/ApprovalStep.cs

@@ -5,10 +5,10 @@ using e_suite.Workflow.Core.Interfaces;
 namespace e_suite.Workflow.Core.Tasks;
 
 [ApprovalTask]
-public class ApprovalStep : TaskBase, IAssignees<ApprovalTaskAssignee>, IOutcome<DefaultOutcome>
+public class ApprovalStep : TaskBase, IAssignees<ApprovalTaskAssignee, ApprovalVerdict>
 {
     public List<ApprovalTaskAssignee> Assignees { get; set; } = [];
+    public CompletionRule<ApprovalVerdict> AssigneesCompletionRule { get; set; }
 
-
+    public List<OutcomeAction<ApprovalVerdict>> OutcomeActions { get; set; }
-    public List<OutcomeAction<DefaultOutcome>> OutcomeActions { get; set; } = [];
 }

e-suite.Workflow.Core/Tasks/BasicTask.cs

@@ -1,5 +1,4 @@
-using System.ComponentModel;
+using e_suite.Workflow.Core.Attributes;
-using e_suite.Workflow.Core.Attributes;
 using e_suite.Workflow.Core.Enums;
 using e_suite.Workflow.Core.Interfaces;
 
@@ -9,9 +8,10 @@ namespace e_suite.Workflow.Core.Tasks;
 /// A user has to open this task, manually set it to ready to complete
 /// </summary>
 [GeneralTask(taskIcon: "faSquareCheck")]
-public class BasicTask : TaskBase, IAssignees<TaskAssignee>, IOutcome<DefaultOutcome>
+public class BasicTask : TaskBase, IAssignees<TaskAssignee, DefaultOutcome>
 {
     public List<TaskAssignee> Assignees { get; set; } = [];
+    public CompletionRule<DefaultOutcome> AssigneesCompletionRule { get; set; }
 
     public List<OutcomeAction<DefaultOutcome>> OutcomeActions { get; set; } = [];
 }

e-suite.Workflow.Core/Tasks/ContentCollationTask.cs

@@ -8,9 +8,10 @@ namespace e_suite.Workflow.Core.Tasks;
 /// Create a table of field data for output to PDF or AdobeIllustrator
 /// </summary>
 [GeneralTask]
-public class ContentCollationTask : TaskBase, IAssignees<TaskAssignee>, IOutcome<DefaultOutcome>
+public class ContentCollationTask : TaskBase, IAssignees<TaskAssignee, DefaultOutcome>
 {
     public List<TaskAssignee> Assignees { get; set; } = [];
+    public CompletionRule<DefaultOutcome> AssigneesCompletionRule { get; set; }
 
     public List<OutcomeAction<DefaultOutcome>> OutcomeActions { get; set; } = [];
 }

e-suite.Workflow.Core/Tasks/FormDataInputTask.cs

@@ -6,9 +6,10 @@ using eSuite.Core.Miscellaneous;
 namespace e_suite.Workflow.Core.Tasks;
 
 [GeneralTask(taskIcon: "faFileLines")]
-public class FormDataInputTask : TaskBase, IAssignees<TaskAssignee>, IFormTemplate, IOutcome<DefaultOutcome>
+public class FormDataInputTask : TaskBase, IAssignees<TaskAssignee, DefaultOutcome>, IFormTemplate
 {
     public List<TaskAssignee> Assignees { get; set; } = [];
+    public CompletionRule<DefaultOutcome> AssigneesCompletionRule { get; set; }
     public bool IsMultiple { get; set; }
     public required IGeneralIdRef FormIdRef { get; set; }