Merge remote-tracking branch 'origin/dev'

Author: 1nf0rmagician

VERSION

@@ -1 +1 @@
-8.4.0
+8.4.1

src/Moryx.ControlSystem/Processes/IProcessExtensions.cs

@@ -1,8 +1,7 @@
-using Moryx.AbstractionLayer.Products;
+using System;
 using Moryx.AbstractionLayer;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using Moryx.AbstractionLayer.Products;
+using Moryx.ControlSystem.Recipes;
 
 namespace Moryx.ControlSystem.Processes
 {
@@ -66,5 +65,37 @@ public static bool TryModifyProductInstance<TInstance>(this IProcess process, Ac
             setter.Invoke(instance);
             return true;
         }
+
+        /// <summary>
+        /// Returns <see cref="IOrderBasedRecipe.OrderNumber"/> on the <see cref="IProcess"/> using the given <paramref name="process"/>. 
+        /// </summary>
+        /// <param name="process">The process holding the order number</param>
+        /// <example>
+        /// <code>
+        /// <![CDATA[
+        /// process.GetOrderNumber()
+        /// ]]>
+        /// </code>
+        /// </example>
+        public static string GetOrderNumber(this IProcess process)
+        {
+            return (process.Recipe as IOrderBasedRecipe)?.OrderNumber;
+        }
+
+        /// <summary>
+        /// Returns <see cref="IOrderBasedRecipe.OperationNumber"/> on the <see cref="IProcess"/> using the given <paramref name="process"/>. 
+        /// </summary>
+        /// <param name="process">The process holding the operation number</param>
+        /// <example>
+        /// <code>
+        /// <![CDATA[
+        /// process.GetOperationNumber()
+        /// ]]>
+        /// </code>
+        /// </example>
+        public static string GetOperationNumber(this IProcess process)
+        {
+            return (process.Recipe as IOrderBasedRecipe)?.OperationNumber;
+        }
     }
 }

src/Moryx.ControlSystem/VisualInstructions/EnumInstructionResult.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Globalization;
 
 namespace Moryx.ControlSystem.VisualInstructions
 {
@@ -24,15 +25,28 @@ public static IReadOnlyList<string> PossibleResults(Type resultEnum, params stri
         /// <summary>
         /// Determine possible string buttons from enum result
         /// </summary>
+        [Obsolete("Use the 'InstructionResults' method instead!'")]
         public static IReadOnlyList<InstructionResult> PossibleInstructionResults(Type resultEnum, params string[] exceptions)
         {
             return ParseEnum(resultEnum, exceptions).Select(pair => new InstructionResult
             {
-                Key = pair.Value.ToString("D"),
+                Key = pair.Value.ToString("D", CultureInfo.InvariantCulture),
                 DisplayValue = pair.Key
             }).ToList();
         }
 
+        /// <summary>
+        /// Determine possible string buttons from enum result
+        /// </summary>
+        public static InstructionResult[] InstructionResults(Type resultEnum, params string[] exceptions)
+        {
+            return ParseEnum(resultEnum, exceptions).Select(pair => new InstructionResult
+            {
+                Key = pair.Value.ToString("D", CultureInfo.InvariantCulture),
+                DisplayValue = pair.Key
+            }).ToArray();
+        }
+
         /// <summary>
         /// Parse the given result back to an enum value
         /// </summary>
@@ -46,7 +60,7 @@ public static int ResultToEnumValue(Type resultEnum, string result)
         /// </summary>
         public static int ResultToEnumValue(Type resultEnum, InstructionResult result)
         {
-            return int.Parse(result.Key);
+            return int.Parse(result.Key, CultureInfo.InvariantCulture);
         }
 
         /// <summary>
@@ -79,7 +93,7 @@ public static TEnum ResultToGenericEnumValue<TEnum>(string result)
         public static TEnum ResultToGenericEnumValue<TEnum>(InstructionResult result)
             where TEnum : Enum
         {
-            var numeric = int.Parse(result.Key);
+            var numeric = int.Parse(result.Key, CultureInfo.InvariantCulture);
             return (TEnum)Enum.ToObject(typeof(TEnum), numeric);
         }
 

src/Tests/Moryx.ControlSystem.Tests/Mocks/DummyRecipe.cs

@@ -0,0 +1,17 @@
+// Copyright (c) 2023, Phoenix Contact GmbH & Co. KG
+
+using Moryx.AbstractionLayer.Recipes;
+using Moryx.ControlSystem.Recipes;
+
+namespace Moryx.ControlSystem.Tests.Mocks
+{
+    public class DummyRecipe : ProductionRecipe, IOrderBasedRecipe
+    {
+        public string OrderNumber { get; set; }
+        public string OperationNumber { get; set; }
+
+        public DummyRecipe()
+        {
+        }
+    }
+}

src/Tests/Moryx.ControlSystem.Tests/ProcessExtensionsTest.cs

@@ -0,0 +1,41 @@
+// Copyright (c) 2023, Phoenix Contact GmbH & Co. KG
+
+using Moryx.AbstractionLayer;
+using Moryx.ControlSystem.Processes;
+using Moryx.ControlSystem.Tests.Mocks;
+using NUnit.Framework;
+
+namespace Moryx.ControlSystem.Tests
+{
+    [TestFixture]
+    internal class ProcessExtensionsTest
+    {
+        [Test]
+        public void ShouldReturnOrderNumber()
+        {
+            // Arrange
+            var recipe = new DummyRecipe { OrderNumber = "O10", OperationNumber = "Op082" };
+            var process = new Process { Recipe = recipe };
+
+            // Act
+            var orderNumber = process?.GetOrderNumber();
+
+            // Assert
+            Assert.That(orderNumber, Is.EqualTo(recipe.OrderNumber));
+        }
+        
+        [Test]
+        public void ShouldReturnOperationNumber()
+        {
+            // Arrange
+            var recipe = new DummyRecipe { OrderNumber = "O10", OperationNumber = "Op082" };
+            var process = new Process { Recipe = recipe };
+
+            // Act
+            var operationNumber = process?.GetOperationNumber();
+
+            // Assert
+            Assert.That(operationNumber, Is.EqualTo(recipe.OperationNumber));
+        }
+    }
+}