collector and wage type function: added culture for payrun and custom results

Jani Giannoudis · Jani Giannoudis · commit 1183766c46a7 · 2025-09-14T14:47:23.000+02:00
updated version to 0.9.0-beta.10
diff --git a/Client.Scripting/Extensions.cs b/Client.Scripting/Extensions.cs
@@ -497,7 +497,6 @@ public static decimal Round(this decimal value, DecimalRounding rounding) =>
             DecimalRounding.Twentieth => RoundTwentieth(value),
             DecimalRounding.Fiftieth => RoundFiftieth(value),
             DecimalRounding.Hundredth => RoundHundredth(value),
-            DecimalRounding.None => value,
             _ => value
         };
 
diff --git a/Client.Scripting/Function/CaseAction.cs b/Client.Scripting/Function/CaseAction.cs
@@ -328,6 +328,7 @@ public interface IActionMethod
 public interface IActionMethod<in T> : IActionMethod
 {
     /// <summary>Evaluate the value</summary>
+    // ReSharper disable once UnusedMemberInSuper.Global
     object EvaluateValue(T value);
 }
 
diff --git a/Client.Scripting/Function/CaseBuildFunction.cs b/Client.Scripting/Function/CaseBuildFunction.cs
@@ -107,13 +107,12 @@ public void RemoveInfo(string name)
             return;
         }
         var values = JsonSerializer.Deserialize<Dictionary<string, object>>(attribute);
-        if (!values.ContainsKey(name))
+        if (!values.Remove(name))
         {
             return;
         }
 
         // remove value
-        values.Remove(name);
         SetCaseAttribute(InputAttributes.EditInfo, values.Count > 0 ? JsonSerializer.Serialize(values) : null);
     }
 
diff --git a/Client.Scripting/Function/CaseValidateFunction.cs b/Client.Scripting/Function/CaseValidateFunction.cs
@@ -86,13 +86,12 @@ public void RemoveInfo(string name)
             return;
         }
         var values = JsonSerializer.Deserialize<Dictionary<string, object>>(attribute);
-        if (!values.ContainsKey(name))
+        if (!values.Remove(name))
         {
             return;
         }
 
         // remove value
-        values.Remove(name);
         SetCaseAttribute(InputAttributes.EditInfo, values.Count > 0 ? JsonSerializer.Serialize(values) : null);
     }
 
diff --git a/Client.Scripting/Function/CollectorFunction.cs b/Client.Scripting/Function/CollectorFunction.cs
@@ -138,9 +138,11 @@ public decimal GetCollectorCurrentConsolidatedValue(CollectorConsolidatedResultQ
     /// <param name="slot">The result slot</param>
     /// <param name="tags">The result tags</param>
     /// <param name="attributes">The wage type custom result attributes</param>
+    /// <param name="culture">The result culture</param>
     public void AddPayrunResult(string name, object value, ValueType? valueType = null, string source = null,
-        string slot = null, IEnumerable<string> tags = null, Dictionary<string, object> attributes = null) =>
-        AddPayrunResult(name, value, PeriodStart, PeriodEnd, valueType, source, slot, tags, attributes);
+        string slot = null, IEnumerable<string> tags = null,
+        Dictionary<string, object> attributes = null, string culture = null) =>
+        AddPayrunResult(name, value, PeriodStart, PeriodEnd, valueType, source, slot, tags, attributes, culture);
 
     /// <summary>Add payrun result</summary>
     /// <param name="name">The result name</param>
@@ -152,9 +154,10 @@ public void AddPayrunResult(string name, object value, ValueType? valueType = nu
     /// <param name="slot">The result slot</param>
     /// <param name="tags">The result tags</param>
     /// <param name="attributes">The wage type custom result attributes</param>
+    /// <param name="culture">The result culture</param>
     public void AddPayrunResult(string name, object value, DateTime startDate, DateTime endDate,
         ValueType? valueType = null, string source = null, string slot = null,
-        IEnumerable<string> tags = null, Dictionary<string, object> attributes = null)
+        IEnumerable<string> tags = null, Dictionary<string, object> attributes = null, string culture = null)
     {
         if (string.IsNullOrWhiteSpace(name))
         {
@@ -168,7 +171,8 @@ public void AddPayrunResult(string name, object value, DateTime startDate, DateT
         source ??= GetType().Name;
         var json = JsonSerializer.Serialize(value);
         valueType ??= value.GetValueType();
-        Runtime.AddPayrunResult(source, name, json, (int)valueType.Value, startDate, endDate, slot, tags?.ToList(), attributes);
+        Runtime.AddPayrunResult(source, name, json, (int)valueType.Value, startDate, endDate, 
+            slot, tags?.ToList(), attributes, culture);
     }
 
     #endregion
@@ -181,9 +185,10 @@ public void AddPayrunResult(string name, object value, DateTime startDate, DateT
     /// <param name="tags">The result tags</param>
     /// <param name="attributes">The collector custom result attributes</param>
     /// <param name="valueType">The result value type (numeric), default is the collector value type</param>
+    /// <param name="culture">The result culture</param>
     public void AddCustomResult(string source, decimal value, IEnumerable<string> tags = null,
-        Dictionary<string, object> attributes = null, ValueType? valueType = null) =>
-        AddCustomResult(source, value, PeriodStart, PeriodEnd, tags, attributes, valueType);
+        Dictionary<string, object> attributes = null, ValueType? valueType = null, string culture = null) =>
+        AddCustomResult(source, value, PeriodStart, PeriodEnd, tags, attributes, valueType, culture);
 
     /// <summary>Adds a custom collector result</summary>
     /// <param name="source">The value source</param>
@@ -193,10 +198,11 @@ public void AddCustomResult(string source, decimal value, IEnumerable<string> ta
     /// <param name="tags">The result tags</param>
     /// <param name="attributes">The collector custom result attributes</param>
     /// <param name="valueType">The result value type (numeric), default is the collector value type</param>
+    /// <param name="culture">The result culture</param>
     public void AddCustomResult(string source, decimal value, DateTime startDate, DateTime endDate,
         IEnumerable<string> tags = null, Dictionary<string, object> attributes = null,
-        ValueType? valueType = null) =>
-        Runtime.AddCustomResult(source, value, startDate, endDate, tags?.ToList(), attributes, (int?)valueType);
+        ValueType? valueType = null, string culture = null) =>
+        Runtime.AddCustomResult(source, value, startDate, endDate, tags?.ToList(), attributes, (int?)valueType, culture);
 
     #endregion
 
diff --git a/Client.Scripting/Function/ReportFunction.cs b/Client.Scripting/Function/ReportFunction.cs
@@ -617,7 +617,7 @@ public DataTable ExecuteEmployeeTimeCaseValueQuery(string tableName, int payroll
                 {"TenantId", TenantId.ToString()},
                 {"PayrollId", payrollId.ToString()},
                 {"EmployeeId", employeeId.ToString()},
-                {"CaseType", CaseType.Employee.ToString()},
+                {"CaseType", nameof(CaseType.Employee)},
                 // fallback culture
                 {"Culture", culture ?? UserCulture},
                 {"CaseFieldNames", JsonSerializer.Serialize(columnNames)}
@@ -1100,13 +1100,12 @@ public void RemoveInfo(string name)
             return;
         }
         var values = JsonSerializer.Deserialize<Dictionary<string, object>>(attribute);
-        if (!values.ContainsKey(name))
+        if (!values.Remove(name))
         {
             return;
         }
 
         // remove value
-        values.Remove(name);
         SetReportAttribute(InputAttributes.EditInfo, values.Count > 0 ? JsonSerializer.Serialize(values) : null);
     }
 
diff --git a/Client.Scripting/Function/WageTypeFunction.cs b/Client.Scripting/Function/WageTypeFunction.cs
@@ -146,9 +146,11 @@ public decimal GetWageTypeCurrentConsolidatedValue(WageTypeConsolidatedResultQue
     /// <param name="slot">The result slot</param>
     /// <param name="tags">The result tags</param>
     /// <param name="attributes">The wage type custom result attributes</param>
+    /// <param name="culture">The result culture</param>
     public void AddPayrunResult(string name, object value, ValueType? valueType = null, string source = null,
-        string slot = null, IEnumerable<string> tags = null, Dictionary<string, object> attributes = null) =>
-        AddPayrunResult(name, value, PeriodStart, PeriodEnd, valueType, source, slot, tags, attributes);
+        string slot = null, IEnumerable<string> tags = null, 
+        Dictionary<string, object> attributes = null, string culture = null) =>
+        AddPayrunResult(name, value, PeriodStart, PeriodEnd, valueType, source, slot, tags, attributes, culture);
 
     /// <summary>Add payrun result</summary>
     /// <param name="name">The result name</param>
@@ -160,9 +162,10 @@ public void AddPayrunResult(string name, object value, ValueType? valueType = nu
     /// <param name="slot">The result slot</param>
     /// <param name="tags">The result tags</param>
     /// <param name="attributes">The wage type custom result attributes</param>
+    /// <param name="culture">The result culture</param>
     public void AddPayrunResult(string name, object value, DateTime startDate, DateTime endDate,
         ValueType? valueType = null, string source = null, string slot = null,
-        IEnumerable<string> tags = null, Dictionary<string, object> attributes = null)
+        IEnumerable<string> tags = null, Dictionary<string, object> attributes = null, string culture = null)
     {
         if (string.IsNullOrWhiteSpace(name))
         {
@@ -176,7 +179,7 @@ public void AddPayrunResult(string name, object value, DateTime startDate, DateT
         source ??= GetType().Name;
         var json = JsonSerializer.Serialize(value);
         valueType ??= value.GetValueType();
-        Runtime.AddPayrunResult(source, name, json, (int)valueType.Value, startDate, endDate, slot, tags?.ToList(), attributes);
+        Runtime.AddPayrunResult(source, name, json, (int)valueType.Value, startDate, endDate, slot, tags?.ToList(), attributes, culture);
     }
 
     #endregion
@@ -188,19 +191,21 @@ public void AddPayrunResult(string name, object value, DateTime startDate, DateT
     /// <param name="tags">The result tags</param>
     /// <param name="attributes">The wage type custom result attributes</param>
     /// <param name="valueType">The result value type (numeric), default is the wage type value type</param>
+    /// <param name="culture">The result culture</param>
     public void AddCustomResult(string source, IEnumerable<string> tags = null,
-        Dictionary<string, object> attributes = null, ValueType? valueType = null) =>
-        AddCustomResult(source, PeriodStart, PeriodEnd, tags, attributes, valueType);
+        Dictionary<string, object> attributes = null, ValueType? valueType = null, string culture = null) =>
+        AddCustomResult(source, PeriodStart, PeriodEnd, tags, attributes, valueType, culture);
 
     /// <summary>Add wage type custom result from case field values, using the current period</summary>
     /// <param name="source">The value source</param>
     /// <param name="value">The period value</param>
     /// <param name="tags">The result tags</param>
     /// <param name="attributes">The wage type custom result attributes</param>
     /// <param name="valueType">The result value type (numeric), default is the wage type value type</param>
+    /// <param name="culture">The result culture</param>
     public void AddCustomResult(string source, decimal value, IEnumerable<string> tags = null,
-        Dictionary<string, object> attributes = null, ValueType? valueType = null) =>
-        AddCustomResult(source, value, PeriodStart, PeriodEnd, tags, attributes, valueType);
+        Dictionary<string, object> attributes = null, ValueType? valueType = null, string culture = null) =>
+        AddCustomResult(source, value, PeriodStart, PeriodEnd, tags, attributes, valueType, culture);
 
     /// <summary>Add wage type custom result from case field values</summary>
     /// <param name="source">The value source</param>
@@ -209,9 +214,10 @@ public void AddCustomResult(string source, decimal value, IEnumerable<string> ta
     /// <param name="tags">The result tags</param>
     /// <param name="attributes">The wage type custom result attributes</param>
     /// <param name="valueType">The result value type (numeric), default is the wage type value type</param>
+    /// <param name="culture">The result culture</param>
     public void AddCustomResult(string source, DateTime startDate, DateTime endDate,
         IEnumerable<string> tags = null, Dictionary<string, object> attributes = null,
-        ValueType? valueType = null)
+        ValueType? valueType = null, string culture = null)
     {
         var tagList = tags?.ToList();
         var caseValues = GetPeriodCaseValues(new DatePeriod(startDate, endDate), source);
@@ -222,7 +228,7 @@ public void AddCustomResult(string source, DateTime startDate, DateTime endDate,
                 if (periodValue.Value is decimal decimalValue)
                 {
                     var period = new DatePeriod(periodValue.Start, periodValue.End);
-                    AddCustomResult(source, decimalValue, period.Start, period.End, tagList, attributes, valueType);
+                    AddCustomResult(source, decimalValue, period.Start, period.End, tagList, attributes, valueType, culture);
                 }
             }
         }
@@ -236,10 +242,11 @@ public void AddCustomResult(string source, DateTime startDate, DateTime endDate,
     /// <param name="tags">The result tags</param>
     /// <param name="attributes">The wage type custom result attributes</param>
     /// <param name="valueType">The result value type (numeric), default is the wage type value type</param>
+    /// <param name="culture">The result culture</param>
     public void AddCustomResult(string source, decimal value, DateTime startDate,
         DateTime endDate, IEnumerable<string> tags = null, Dictionary<string, object> attributes = null,
-        ValueType? valueType = null) =>
-        Runtime.AddCustomResult(source, value, startDate, endDate, tags?.ToList(), attributes, (int?)valueType);
+        ValueType? valueType = null, string culture = null) =>
+        Runtime.AddCustomResult(source, value, startDate, endDate, tags?.ToList(), attributes, (int?)valueType, culture);
 
     #endregion
 
diff --git a/Client.Scripting/PayrollEngine.Client.Scripting.csproj b/Client.Scripting/PayrollEngine.Client.Scripting.csproj
@@ -182,7 +182,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
-		<PackageReference Include="PayrollEngine.Client.Core" Version="0.9.0-beta.9" />
+		<PackageReference Include="PayrollEngine.Client.Core" Version="0.9.0-beta.10" />
 	</ItemGroup>
 
 	<!-- include xml documention files and json schemas to the nuget package -->
diff --git a/Client.Scripting/PayrollEngine.Client.Scripting.xml b/Client.Scripting/PayrollEngine.Client.Scripting.xml
diff --git a/Client.Scripting/Runtime/ICollectorRuntime.cs b/Client.Scripting/Runtime/ICollectorRuntime.cs
diff --git a/Client.Scripting/Runtime/IWageTypeRuntime.cs b/Client.Scripting/Runtime/IWageTypeRuntime.cs
diff --git a/Directory.Build.props b/Directory.Build.props

Original file line number	Diff line number	Diff line change
`@@ -328,6 +328,7 @@ public interface IActionMethod`
`328`	`328`	`public interface IActionMethod<in T> : IActionMethod`
`329`	`329`	`{`
`330`	`330`	`/// <summary>Evaluate the value</summary>`
	`331`	`+ // ReSharper disable once UnusedMemberInSuper.Global`
`331`	`332`	`object EvaluateValue(T value);`
`332`	`333`	`}`
`333`	`334`
Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,12 @@ public void RemoveInfo(string name)`
`107`	`107`	`return;`
`108`	`108`	`}`
`109`	`109`	`var values = JsonSerializer.Deserialize<Dictionary<string, object>>(attribute);`
`110`		`- if (!values.ContainsKey(name))`
	`110`	`+ if (!values.Remove(name))`
`111`	`111`	`{`
`112`	`112`	`return;`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`// remove value`
`116`		`- values.Remove(name);`
`117`	`116`	`SetCaseAttribute(InputAttributes.EditInfo, values.Count > 0 ? JsonSerializer.Serialize(values) : null);`
`118`	`117`	`}`
`119`	`118`
Original file line number	Diff line number	Diff line change
`@@ -86,13 +86,12 @@ public void RemoveInfo(string name)`
`86`	`86`	`return;`
`87`	`87`	`}`
`88`	`88`	`var values = JsonSerializer.Deserialize<Dictionary<string, object>>(attribute);`
`89`		`- if (!values.ContainsKey(name))`
	`89`	`+ if (!values.Remove(name))`
`90`	`90`	`{`
`91`	`91`	`return;`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`// remove value`
`95`		`- values.Remove(name);`
`96`	`95`	`SetCaseAttribute(InputAttributes.EditInfo, values.Count > 0 ? JsonSerializer.Serialize(values) : null);`
`97`	`96`	`}`
`98`	`97`
Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ public DataTable ExecuteEmployeeTimeCaseValueQuery(string tableName, int payroll`
`617`	`617`	`{"TenantId", TenantId.ToString()},`
`618`	`618`	`{"PayrollId", payrollId.ToString()},`
`619`	`619`	`{"EmployeeId", employeeId.ToString()},`
`620`		`- {"CaseType", CaseType.Employee.ToString()},`
	`620`	`+ {"CaseType", nameof(CaseType.Employee)},`
`621`	`621`	`// fallback culture`
`622`	`622`	`{"Culture", culture ?? UserCulture},`
`623`	`623`	`{"CaseFieldNames", JsonSerializer.Serialize(columnNames)}`
`@@ -1100,13 +1100,12 @@ public void RemoveInfo(string name)`
`1100`	`1100`	`return;`
`1101`	`1101`	`}`
`1102`	`1102`	`var values = JsonSerializer.Deserialize<Dictionary<string, object>>(attribute);`
`1103`		`- if (!values.ContainsKey(name))`
	`1103`	`+ if (!values.Remove(name))`
`1104`	`1104`	`{`
`1105`	`1105`	`return;`
`1106`	`1106`	`}`
`1107`	`1107`
`1108`	`1108`	`// remove value`
`1109`		`- values.Remove(name);`
`1110`	`1109`	`SetReportAttribute(InputAttributes.EditInfo, values.Count > 0 ? JsonSerializer.Serialize(values) : null);`
`1111`	`1110`	`}`
`1112`	`1111`