From 1cda1026589b47b0815831ec21da18602151d5d9 Mon Sep 17 00:00:00 2001 From: Jani Giannoudis Date: Tue, 25 Jul 2023 19:35:38 +0200 Subject: [PATCH] updated --- Commands/Release.Version.cmd | 2 +- Examples/ActionPayroll/ActionPayroll.csproj | 4 +-- .../ExtendedPayroll/ExtendedPayroll.csproj | 4 +-- Examples/README.md | 26 ++++++++------ Examples/ReportPayroll/ReportPayroll.csproj | 4 +-- Examples/StartPayroll/1 Basic.Setup.cmd | 4 +-- Examples/StartPayroll/2 Insurance.Setup.cmd | 3 +- Examples/StartPayroll/3 Company.Setup.cmd | 1 - Examples/StartPayroll/4 Report.Setup.cmd | 3 +- Examples/StartPayroll/Report.German.frx | 14 ++++---- Examples/StartPayroll/Setup.cmd | 1 + Tests/README.md | 35 ++++++++++--------- 12 files changed, 52 insertions(+), 49 deletions(-) diff --git a/Commands/Release.Version.cmd b/Commands/Release.Version.cmd index 0346127..da720a3 100644 --- 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.2 +set version=0.5.0-beta.4 rem --- confirmation --- :confirmation diff --git a/Examples/ActionPayroll/ActionPayroll.csproj b/Examples/ActionPayroll/ActionPayroll.csproj index 3a5df8d..95e8ee4 100644 --- a/Examples/ActionPayroll/ActionPayroll.csproj +++ b/Examples/ActionPayroll/ActionPayroll.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/Examples/ExtendedPayroll/ExtendedPayroll.csproj b/Examples/ExtendedPayroll/ExtendedPayroll.csproj index 23bbdb7..b5ff98c 100644 --- a/Examples/ExtendedPayroll/ExtendedPayroll.csproj +++ b/Examples/ExtendedPayroll/ExtendedPayroll.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/Examples/README.md b/Examples/README.md index bd96e3f..0e90547 100644 --- a/Examples/README.md +++ b/Examples/README.md @@ -6,34 +6,40 @@ - `/Setup.cmd` - setup example - `/Delete.cmd` - delete example -## `Action Payroll` +## Web Application Login +In the web application, `Luci` has the `Supervisor` rights for all examples: + - Name: `lucy.smith@foo.com` + - Passwort: `@ayroll3ngine` + +## Examples + +### `Action Payroll` > TODO -## `Case definition` - CaseDefPayroll +### `Case definition` - CaseDefPayroll - Case value types - Case time types - Case Relations - Case Slots - Case Actions -## `Derived Payroll` +### `Derived Payroll` > TODO -## `Derived Payroll` +### `Derived Payroll` > TODO -## `Extended Payroll` +### `Extended Payroll` > TODO -## `Report Payroll` +### `Report Payroll` > TODO -## `Simple Payroll` +### `Simple Payroll` > TODO -## `Start Payroll` +### `Start Payroll` > TODO -## `Week Simple Payroll` +### `Week Simple Payroll` > TODO - diff --git a/Examples/ReportPayroll/ReportPayroll.csproj b/Examples/ReportPayroll/ReportPayroll.csproj index baeed73..02d1ebf 100644 --- a/Examples/ReportPayroll/ReportPayroll.csproj +++ b/Examples/ReportPayroll/ReportPayroll.csproj @@ -49,8 +49,8 @@ - - + + diff --git a/Examples/StartPayroll/1 Basic.Setup.cmd b/Examples/StartPayroll/1 Basic.Setup.cmd index d3040e4..f127e39 100644 --- a/Examples/StartPayroll/1 Basic.Setup.cmd +++ b/Examples/StartPayroll/1 Basic.Setup.cmd @@ -5,6 +5,4 @@ set console=PayrollConsole if not "%PayrollConsole%" == "" set console=%PayrollConsole% call %console% TenantDelete tenant:StartTenant /trydelete -call %console% PayrollImport Basic.json -call %console% PayrunEmployeeTest Basic.Test.et.json /showall /wait - +call %console% PayrollImport Basic.json /wait diff --git a/Examples/StartPayroll/2 Insurance.Setup.cmd b/Examples/StartPayroll/2 Insurance.Setup.cmd index 8b6ef19..b45f3a6 100644 --- a/Examples/StartPayroll/2 Insurance.Setup.cmd +++ b/Examples/StartPayroll/2 Insurance.Setup.cmd @@ -6,5 +6,4 @@ if not "%PayrollConsole%" == "" set console=%PayrollConsole% call %console% TenantDelete StartTenant /trydelete call %console% PayrollImport Basic.json -call %console% PayrollImport Insurance.json -call %console% PayrunEmployeeTest Insurance.Test.et.json /showall /wait +call %console% PayrollImport Insurance.json /wait diff --git a/Examples/StartPayroll/3 Company.Setup.cmd b/Examples/StartPayroll/3 Company.Setup.cmd index db274c3..bba411f 100644 --- a/Examples/StartPayroll/3 Company.Setup.cmd +++ b/Examples/StartPayroll/3 Company.Setup.cmd @@ -8,4 +8,3 @@ call %console% TenantDelete StartTenant /trydelete call %console% PayrollImport Basic.json call %console% PayrollImport Insurance.json call %console% PayrollImport Company.json -call %console% PayrunEmployeeTest Company.Test.et.json /showall /wait diff --git a/Examples/StartPayroll/4 Report.Setup.cmd b/Examples/StartPayroll/4 Report.Setup.cmd index 7ff73ab..37dae28 100644 --- a/Examples/StartPayroll/4 Report.Setup.cmd +++ b/Examples/StartPayroll/4 Report.Setup.cmd @@ -9,6 +9,5 @@ call %console% PayrollImport Basic.json call %console% PayrollImport Insurance.json call %console% PayrollImport Company.json call %console% PayrollImport Report.json -rem build payroll results +rem build payroll results for the report call %console% PayrunEmployeeTest Company.Test.et.json -call %console% Report tenant:StartTenant user:lucy.smith@foo.com regulation:StartRegulation report:StartReport parameterFile:Report.Parameters.json culture:en /pdf /shellopen diff --git a/Examples/StartPayroll/Report.German.frx b/Examples/StartPayroll/Report.German.frx index 3a5ff70..4a2549d 100644 --- a/Examples/StartPayroll/Report.German.frx +++ b/Examples/StartPayroll/Report.German.frx @@ -1,5 +1,5 @@  - + @@ -30,12 +30,12 @@ - + - - + + - + @@ -45,7 +45,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/Examples/StartPayroll/Setup.cmd b/Examples/StartPayroll/Setup.cmd index 2cfd39c..e633c1b 100644 --- a/Examples/StartPayroll/Setup.cmd +++ b/Examples/StartPayroll/Setup.cmd @@ -6,6 +6,7 @@ if not "%PayrollConsole%" == "" set console=%PayrollConsole% call %console% TenantDelete StartTenant /trydelete call %console% PayrollImport Basic.json +rem --- web application login --- call %console% ChangePassword StartTenant lucy.smith@foo.com @ayroll3ngine call %console% PayrollImport Insurance.json call %console% PayrollImport Company.json diff --git a/Tests/README.md b/Tests/README.md index 46ac6dd..1c12530 100644 --- a/Tests/README.md +++ b/Tests/README.md @@ -4,55 +4,56 @@ - `Test.All.cmd` - run all tests - `/Test.cmd` - run test -## `Aggregation Test` +## Tests +### `Aggregation Test` - Case field period aggregation types > TODO -## `Calendar Test` +### `Calendar Test` - Payroll calendar time maps > TODO -## `Cancellation Test` +### `Cancellation Test` > TODO -## `Derived Payroll Test` +### `Derived Payroll Test` > TODO -## `Forecast Payroll Test` +### `Forecast Payroll Test` > TODO -## `Incremental Payroll Test` +### `Incremental Payroll Test` > TODO -## `Lunisoral Payroll Test` +### `Lunisoral Payroll Test` > TODO -## `Payrun Test` +### `Payrun Test` > TODO -## `Payrun Employee Test` +### `Payrun Employee Test` > TODO -## `Report Test` +### `Report Test` > TODO -## `Retro Manual Test` +### `Retro Manual Test` > TODO -## `Retro Payroll Test` +### `Retro Payroll Test` > TODO -## `Time Tracking Test` +### `Time Tracking Test` > TODO -## `Version Payroll Test` +### `Version Payroll Test` > TODO -## `Wage Type Restart Test` +### `Wage Type Restart Test` > TODO -## `Calendar Test` +### `Calendar Test` > TODO -## `Week Calendar Test` +### `Week Calendar Test` > TODO