client setup: added json schema folder

Jani Giannoudis · Jani Giannoudis · commit 57fa6752e825 · 2025-03-14T17:41:33.000+01:00
worksheet example: added json export and some tweaks
updated verion to 0.9.0-beta.5
diff --git a/Commands/Release.Binaries.cmd b/Commands/Release.Binaries.cmd
@@ -96,6 +96,9 @@ echo compressing admin tool...
 rem payroll console
 echo compressing payroll console...
 7z a -ssw -r -tzip -y %clientSetup% %~dp0..\Bin\Console > nul
+rem schemas
+echo compressing schemas...
+7z a -ssw -r -tzip -y %clientSetup% %~dp0..\Schemas > nul
 rem tests
 echo compressing tests...
 7z a -ssw -r -tzip -y %clientSetup% %~dp0..\Tests > nul
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.9.0-beta.4
+set version=0.9.0-beta.5
 
 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.9.0-beta.4" />
-		<PackageReference Include="PayrollEngine.Serilog" Version="0.9.0-beta.4" />
+		<PackageReference Include="PayrollEngine.Client.Services" Version="0.9.0-beta.5" />
+		<PackageReference Include="PayrollEngine.Serilog" Version="0.9.0-beta.5" />
 	</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.9.0-beta.4" />
-		<PackageReference Include="PayrollEngine.Serilog" Version="0.9.0-beta.4" />
+		<PackageReference Include="PayrollEngine.Client.Services" Version="0.9.0-beta.5" />
+		<PackageReference Include="PayrollEngine.Serilog" Version="0.9.0-beta.5" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Examples/ReportPayroll/ReportPayroll.csproj b/Examples/ReportPayroll/ReportPayroll.csproj
@@ -9,8 +9,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="PayrollEngine.Client.Services" Version="0.9.0-beta.4" />
-	  <PackageReference Include="PayrollEngine.Serilog" Version="0.9.0-beta.4" />
+	  <PackageReference Include="PayrollEngine.Client.Services" Version="0.9.0-beta.5" />
+	  <PackageReference Include="PayrollEngine.Serilog" Version="0.9.0-beta.5" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/Examples/WorksheetPayroll/Company.Cases.json b/Examples/WorksheetPayroll/Company.Cases.json
@@ -18,7 +18,6 @@
               "buildExpression": "this.BuildWorksheet()",
               "validateExpression": "this.ValidateWorksheet()",
               "attributes": {
-                "input.variant": "Filled",
                 "input.fieldLayout": "Value",
                 "input.format": "0.#"
               },
diff --git a/Examples/WorksheetPayroll/Payroll.json b/Examples/WorksheetPayroll/Payroll.json
@@ -4,8 +4,7 @@
   "tenants": [
     {
       "identifier": "WorksheetTenant",
-      "culture": "de-CH",
-      "cultureOrig": "en-US",
+      "culture": "en-US",
       "calendar": "WorksheetCalendar",
       "calendars": [
         {
diff --git a/Examples/WorksheetPayroll/README.md b/Examples/WorksheetPayroll/README.md
@@ -2,6 +2,7 @@
 This example shows how to create a payroll solution to record daily working hours.
 
 There are different daily phases with their own wage factors:
+
 | Phase                  | Description                              | Rate                           |
 |:--|:--|:--|
 | Early Morning          | Time from midnight to regular start      | Factor of regular/casual rate  |
diff --git a/Examples/WorksheetPayroll/Report/Wage/Report.Json.pecmd b/Examples/WorksheetPayroll/Report/Wage/Report.Json.pecmd
@@ -0,0 +1 @@
+Report tenant:WorksheetTenant user:lucy.smith@foo.com regulation:WorksheetRegulation report:Wage culture:en-US /json /shellopen
diff --git a/Examples/WorksheetPayroll/Report/WorkTime/Report.Json.pecmd b/Examples/WorksheetPayroll/Report/WorkTime/Report.Json.pecmd
@@ -0,0 +1 @@
+Report tenant:WorksheetTenant user:lucy.smith@foo.com regulation:WorksheetRegulation report:WorkTime culture:en-US /json /shellopen
diff --git a/Examples/WorksheetPayroll/Script/WorkdayBuild.cs b/Examples/WorksheetPayroll/Script/WorkdayBuild.cs
@@ -26,7 +26,7 @@ public static bool BuildWorkday(this CaseBuildFunction function)
         if (!function.IsWorkDay(function.GetDerivedCalendar(), workday))
         {
             valid = false;
-            function.AddInfo("Day off", $"{workday:d}");
+            function.AddInfo("Day off", $"{workday:dddd}");
         }
 
         // work period
diff --git a/Examples/WorksheetPayroll/Script/WorkdayValidate.cs b/Examples/WorksheetPayroll/Script/WorkdayValidate.cs
@@ -19,7 +19,7 @@ public static bool ValidateWorkday(this CaseValidateFunction function)
         // calendar work day
         if (!function.IsWorkDay(function.GetDerivedCalendar(), workday))
         {
-            return function.AddIssue($"{workday:d} is not a working day.");
+            return function.AddIssue($"{workday:dddd} is not a working day.");
         }
 
         // working hours
diff --git a/Examples/WorksheetPayroll/WorksheetPayroll.csproj b/Examples/WorksheetPayroll/WorksheetPayroll.csproj
@@ -9,8 +9,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="PayrollEngine.Client.Services" Version="0.9.0-beta.4" />
-		<PackageReference Include="PayrollEngine.Serilog" Version="0.9.0-beta.4" />
+		<PackageReference Include="PayrollEngine.Client.Services" Version="0.9.0-beta.5" />
+		<PackageReference Include="PayrollEngine.Serilog" Version="0.9.0-beta.5" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/docs/swagger.json b/docs/swagger.json
@@ -2,7 +2,7 @@
   "openapi": "3.0.1",
   "info": {
     "title": "Payroll Engine Backend API v1",
-    "description": "Payroll Engine API v0.9.0-beta.4",
+    "description": "Payroll Engine API v0.9.0-beta.5",
     "version": "1"
   },
   "paths": {
@@ -425,7 +425,7 @@
         }
       }
     },
-    "/api/tenants/{tenantId}/calendars/periods": {
+    "/api/tenants/{tenantId}/calendars/period": {
       "get": {
         "tags": [
           "Calendars"
@@ -509,7 +509,7 @@
         }
       }
     },
-    "/api/tenants/{tenantId}/calendars/cycles": {
+    "/api/tenants/{tenantId}/calendars/cycle": {
       "get": {
         "tags": [
           "Calendars"
@@ -593,7 +593,7 @@
         }
       }
     },
-    "/api/tenants/{tenantId}/calendars/values": {
+    "/api/tenants/{tenantId}/calendars/value": {
       "get": {
         "tags": [
           "Calendars"

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`	`"tenants": [`
`5`	`5`	`{`
`6`	`6`	`"identifier": "WorksheetTenant",`
`7`		`- "culture": "de-CH",`
`8`		`- "cultureOrig": "en-US",`
	`7`	`+ "culture": "en-US",`
`9`	`8`	`"calendar": "WorksheetCalendar",`
`10`	`9`	`"calendars": [`
`11`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Report tenant:WorksheetTenant user:lucy.smith@foo.com regulation:WorksheetRegulation report:Wage culture:en-US /json /shellopen`