test and examples: added tenant culture

updated version to 0.6.0-beta.10
Payroll-Engine · Oct 10, 2023 · 82e2019 · 82e2019
1 parent cb70faf
commit 82e2019
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 17 deletions.
diff --git a/Commands/Release.Version.cmd b/Commands/Release.Version.cmd
@@ -4,7 +4,7 @@ echo Set Payroll Set Release Version
 
 rem --- version setup ---
 :version
-set version=0.5.0-beta.9
+set version=0.6.0-beta.10
 
 rem --- confirmation ---
 :confirmation

diff --git a/Examples/ActionPayroll/ActionPayroll.csproj b/Examples/ActionPayroll/ActionPayroll.csproj
@@ -8,8 +8,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="PayrollEngine.Client.Services" Version="0.6.0-beta.9" />
-		<PackageReference Include="PayrollEngine.Serilog" Version="0.6.0-beta.9" />
+		<PackageReference Include="PayrollEngine.Client.Services" Version="0.6.0-beta.10" />
+		<PackageReference Include="PayrollEngine.Serilog" Version="0.6.0-beta.10" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Examples/ExtendedPayroll/ExtendedPayroll.csproj b/Examples/ExtendedPayroll/ExtendedPayroll.csproj
@@ -16,8 +16,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="PayrollEngine.Client.Services" Version="0.6.0-beta.9" />
-		<PackageReference Include="PayrollEngine.Serilog" Version="0.6.0-beta.9" />
+		<PackageReference Include="PayrollEngine.Client.Services" Version="0.6.0-beta.10" />
+		<PackageReference Include="PayrollEngine.Serilog" Version="0.6.0-beta.10" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Examples/ReportPayroll/ReportPayroll.csproj b/Examples/ReportPayroll/ReportPayroll.csproj
@@ -49,8 +49,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="PayrollEngine.Client.Services" Version="0.6.0-beta.9" />
-	  <PackageReference Include="PayrollEngine.Serilog" Version="0.6.0-beta.9" />
+	  <PackageReference Include="PayrollEngine.Client.Services" Version="0.6.0-beta.10" />
+	  <PackageReference Include="PayrollEngine.Serilog" Version="0.6.0-beta.10" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/Examples/WeekSimplePayroll/Payroll.json b/Examples/WeekSimplePayroll/Payroll.json
@@ -76,7 +76,7 @@
               ]
             },
             {
-              "name": "BeschäftigungEmploymentLevelsgrad",
+              "name": "EmploymentLevel",
               "caseType": "Employee",
               "fields": [
                 {

diff --git a/Tests/Aggregation.Test/Payroll.pt.json b/Tests/Aggregation.Test/Payroll.pt.json
@@ -4,6 +4,7 @@
   "tenants": [
     {
       "identifier": "Aggregation.Test",
+      "culture": "de-CH",
       "users": [
         {
           "identifier": "peter.schmid@foo.com",
@@ -13,8 +14,7 @@
       ],
       "divisions": [
         {
-          "name": "Aggregation.Division",
-          "culture": "de-CH"
+          "name": "Aggregation.Division"
         }
       ],
       "regulations": [

diff --git a/Tests/Cancellation.Test/Payroll.pt.json b/Tests/Cancellation.Test/Payroll.pt.json
@@ -4,6 +4,7 @@
   "tenants": [
     {
       "identifier": "Cancellation.Test",
+      "culture": "de-CH",
       "users": [
         {
           "identifier": "peter.schmid@foo.com",
@@ -13,8 +14,7 @@
       ],
       "divisions": [
         {
-          "name": "TestDivision",
-          "culture": "de-CH"
+          "name": "TestDivision"
         }
       ],
       "regulations": [

diff --git a/Tests/CountryPayroll.Test/Test.pt.json b/Tests/CountryPayroll.Test/Test.pt.json
@@ -4,6 +4,7 @@
     {
       "identifier": "CountryPayroll.Test",
       "created": "2019-01-01T00:00:00.0Z",
+      "culture": "de-CH",
       "users": [
         {
           "identifier": "peter.schmid@foo.com",
@@ -15,7 +16,6 @@
       "divisions": [
         {
           "name": "TestDivision",
-          "culture": "de-CH",
           "created": "2019-01-01T00:00:00.0Z"
         }
       ],

diff --git a/Tests/Payrun.Test/Test.pt.json b/Tests/Payrun.Test/Test.pt.json
@@ -112,6 +112,7 @@
     {
       "identifier": "Payroll.Test",
       "created": "2019-01-01T00:00:00.0Z",
+      "culture": "de-CH",
       "users": [
         {
           "identifier": "peter.schmid@foo.com",
@@ -123,7 +124,6 @@
       "divisions": [
         {
           "name": "TestDivision",
-          "culture": "de-CH",
           "created": "2019-01-01T00:00:00.0Z"
         }
       ],

diff --git a/Tests/PayrunEmployee.Test/Payroll.json b/Tests/PayrunEmployee.Test/Payroll.json
@@ -4,6 +4,7 @@
     {
       "identifier": "Employee.Test",
       "created": "2019-01-01T00:00:00.0Z",
+      "culture": "de-CH",
       "users": [
         {
           "identifier": "peter.schmid@foo.com",
@@ -15,7 +16,6 @@
       "divisions": [
         {
           "name": "TestDivision",
-          "culture": "de-CH",
           "created": "2019-01-01T00:00:00.0Z"
         }
       ],
@@ -331,7 +331,7 @@
             {
               "wageTypeNumber": 199,
               "name": "WageCoverage",
-              "valueExpression": "var results = GetPeriodWageTypeResults(101, new PeriodResultQuery(1, PayrunJobStatus.Legal)); return results.Any() ? (results[0] < 3000 ? 3000-results[0] : 0) : 0",
+              "valueExpression": "var results = GetPeriodWageTypeResults(new WageTypePeriodResultQuery(101, 1, PayrunJobStatus.Legal)); return results.Any() ? (results[0] < 3000 ? 3000-results[0] : 0) : 0",
               "created": "2019-01-01T00:00:00.0Z"
             },
             {

diff --git a/Tests/PayrunEmployee.Test/Test.et.json b/Tests/PayrunEmployee.Test/Test.et.json
@@ -3,9 +3,11 @@
   "tenants": [
     {
       "identifier": "Employee.Test",
+      "updateMode": "NoUpdate",
       "payrolls": [
         {
           "name": "Employee.Test",
+          "updateMode": "NoUpdate",
           "cases": [
             {
               "userIdentifier": "peter.schmid@foo.com",

diff --git a/Tests/RetroManualPayroll.Test/Payroll.pt.json b/Tests/RetroManualPayroll.Test/Payroll.pt.json
@@ -4,6 +4,7 @@
     {
       "identifier": "RetroManualPayroll",
       "created": "2018-01-01T00:00:00.0Z",
+      "culture": "de-CH",
       "users": [
         {
           "identifier": "peter.schmid@foo.com",
@@ -15,7 +16,6 @@
       "divisions": [
         {
           "name": "RetroManualDivision",
-          "culture": "de-CH",
           "created": "2018-01-01T00:00:00.0Z"
         }
       ],