Merge pull request #86 from PHOENIXCONTACT/fix/results-from-enum-exte…

…nsion Instructor extension did not set the new results
PHOENIXCONTACT · Jul 18, 2024 · 0cce9f1 · 0cce9f1
2 parents 6e00ae2 + df32d3a
commit 0cce9f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.2.0
+8.2.1
diff --git a/src/Moryx.ControlSystem/VisualInstructions/VisualInstructorExtensions.cs b/src/Moryx.ControlSystem/VisualInstructions/VisualInstructorExtensions.cs
@@ -96,7 +96,8 @@ public static long Execute(this IVisualInstructor instructor, string title, Acti
             {
                 Title = title,
                 Instructions = instructions,
-                PossibleResults = results
+                PossibleResults = results,
+                Results = results.Select(r => new InstructionResult { Key = r, DisplayValue = r }).ToArray()
             }, callback);
         }
 
@@ -161,11 +162,13 @@ private static long ExecuteWithEnum(this IVisualInstructor instructor, string ti
                 throw new ArgumentException("Result type is not an enum!");
 
             var results = EnumInstructionResult.PossibleResults(attr.ResultEnum);
+            var resultObjects = EnumInstructionResult.PossibleInstructionResults(attr.ResultEnum);
             return instructor.Execute(new ActiveInstruction
             {
                 Title = title,
                 Instructions = parameters,
                 PossibleResults = results,
+                Results = resultObjects.ToArray(),
                 Inputs = inputs
             }, instructionResponse => callback(EnumInstructionResult.ResultToEnumValue(attr.ResultEnum, instructionResponse.Result), instructionResponse.Inputs, activityStart));
         }