Skip to content

Commit 8cf195d

Browse files
renemadsenclaude
renemadsen
and
claude
committed
feat: add validity period to all overenskomst preset names
Append year ranges to distinguish agreement periods: - GLS-A / 3F presets: " 2024-2026" - KA / Krifa presets: " 2025-2028" Updated in: TypeScript presets, backend LockedPresetNames HashSet, C# fixture helpers, and E2E test assertions. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 56623bc commit 8cf195d

File tree

2 files changed

+38
-38
lines changed

2 files changed

+38
-38
lines changed

‎eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/PayRuleSetService/PayRuleSetService.cs‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,25 @@ public class PayRuleSetService : IPayRuleSetService
2424
{
2525
private static readonly HashSet<string> LockedPresetNames = new HashSet<string>
2626
{
27-
"GLS-A / 3F - Jordbrug Standard",
28-
"GLS-A / 3F - Jordbrug Dyrehold",
29-
"GLS-A / 3F - Jordbrug Elev u18",
30-
"GLS-A / 3F - Jordbrug Elev o18",
31-
"GLS-A / 3F - Jordbrug Elev u18 Dyrehold",
32-
"GLS-A / 3F - Gartneri Standard",
33-
"GLS-A / 3F - Gartneri Elev u18",
34-
"GLS-A / 3F - Gartneri Elev o18",
35-
"GLS-A / 3F - Skovbrug Standard",
36-
"GLS-A / 3F - Skovbrug Elev u18",
37-
"GLS-A / 3F - Skovbrug Elev o18",
38-
"KA / Krifa - Landbrug Svine/Kvaeg Standard",
39-
"KA / Krifa - Landbrug Svine/Kvaeg Elev",
40-
"KA / Krifa - Landbrug Plantebrug Standard",
41-
"KA / Krifa - Landbrug Plantebrug Elev",
42-
"KA / Krifa - Landbrug Maskinstation Standard",
43-
"KA / Krifa - Landbrug Maskinstation Elev",
44-
"KA / Krifa - Gron Standard",
45-
"KA / Krifa - Gron Elev"
27+
"GLS-A / 3F - Jordbrug Standard 2024-2026",
28+
"GLS-A / 3F - Jordbrug Dyrehold 2024-2026",
29+
"GLS-A / 3F - Jordbrug Elev u18 2024-2026",
30+
"GLS-A / 3F - Jordbrug Elev o18 2024-2026",
31+
"GLS-A / 3F - Jordbrug Elev u18 Dyrehold 2024-2026",
32+
"GLS-A / 3F - Gartneri Standard 2024-2026",
33+
"GLS-A / 3F - Gartneri Elev u18 2024-2026",
34+
"GLS-A / 3F - Gartneri Elev o18 2024-2026",
35+
"GLS-A / 3F - Skovbrug Standard 2024-2026",
36+
"GLS-A / 3F - Skovbrug Elev u18 2024-2026",
37+
"GLS-A / 3F - Skovbrug Elev o18 2024-2026",
38+
"KA / Krifa - Landbrug Svine/Kvaeg Standard 2025-2028",
39+
"KA / Krifa - Landbrug Svine/Kvaeg Elev 2025-2028",
40+
"KA / Krifa - Landbrug Plantebrug Standard 2025-2028",
41+
"KA / Krifa - Landbrug Plantebrug Elev 2025-2028",
42+
"KA / Krifa - Landbrug Maskinstation Standard 2025-2028",
43+
"KA / Krifa - Landbrug Maskinstation Elev 2025-2028",
44+
"KA / Krifa - Gron Standard 2025-2028",
45+
"KA / Krifa - Gron Elev 2025-2028"
4646
};
4747

4848
private readonly TimePlanningPnDbContext _dbContext;

‎eform-client/src/app/plugins/modules/time-planning-pn/models/pay-rule-sets/pay-rule-set-presets.ts‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
6464
key: 'glsa-jordbrug-standard',
6565
group: 'GLS-A / 3F',
6666
label: 'Jordbrug - Standard',
67-
name: 'GLS-A / 3F - Jordbrug Standard',
67+
name: 'GLS-A / 3F - Jordbrug Standard 2024-2026',
6868
locked: true,
6969
payDayRules: [
7070
{
@@ -114,7 +114,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
114114
key: 'glsa-jordbrug-dyrehold',
115115
group: 'GLS-A / 3F',
116116
label: 'Jordbrug - Dyrehold',
117-
name: 'GLS-A / 3F - Jordbrug Dyrehold',
117+
name: 'GLS-A / 3F - Jordbrug Dyrehold 2024-2026',
118118
locked: true,
119119
payDayRules: [
120120
{
@@ -180,7 +180,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
180180
key: 'glsa-jordbrug-elev-u18',
181181
group: 'GLS-A / 3F',
182182
label: 'Jordbrug - Elev (under 18)',
183-
name: 'GLS-A / 3F - Jordbrug Elev u18',
183+
name: 'GLS-A / 3F - Jordbrug Elev u18 2024-2026',
184184
locked: true,
185185
payDayRules: [
186186
{
@@ -224,7 +224,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
224224
key: 'glsa-jordbrug-elev-o18',
225225
group: 'GLS-A / 3F',
226226
label: 'Jordbrug - Elev (over 18)',
227-
name: 'GLS-A / 3F - Jordbrug Elev o18',
227+
name: 'GLS-A / 3F - Jordbrug Elev o18 2024-2026',
228228
locked: true,
229229
payDayRules: [
230230
{
@@ -269,7 +269,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
269269
key: 'glsa-jordbrug-elev-u18-dyrehold',
270270
group: 'GLS-A / 3F',
271271
label: 'Jordbrug - Elev u18 Dyrehold',
272-
name: 'GLS-A / 3F - Jordbrug Elev u18 Dyrehold',
272+
name: 'GLS-A / 3F - Jordbrug Elev u18 Dyrehold 2024-2026',
273273
locked: true,
274274
payDayRules: [
275275
{
@@ -313,7 +313,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
313313
key: 'glsa-gartneri-standard',
314314
group: 'GLS-A / 3F',
315315
label: 'Gartneri - Standard',
316-
name: 'GLS-A / 3F - Gartneri Standard',
316+
name: 'GLS-A / 3F - Gartneri Standard 2024-2026',
317317
locked: true,
318318
payDayRules: [
319319
{
@@ -363,7 +363,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
363363
key: 'glsa-gartneri-elev-u18',
364364
group: 'GLS-A / 3F',
365365
label: 'Gartneri - Elev (under 18)',
366-
name: 'GLS-A / 3F - Gartneri Elev u18',
366+
name: 'GLS-A / 3F - Gartneri Elev u18 2024-2026',
367367
locked: true,
368368
payDayRules: [
369369
{
@@ -407,7 +407,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
407407
key: 'glsa-gartneri-elev-o18',
408408
group: 'GLS-A / 3F',
409409
label: 'Gartneri - Elev (over 18)',
410-
name: 'GLS-A / 3F - Gartneri Elev o18',
410+
name: 'GLS-A / 3F - Gartneri Elev o18 2024-2026',
411411
locked: true,
412412
payDayRules: [
413413
{
@@ -452,7 +452,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
452452
key: 'glsa-skovbrug-standard',
453453
group: 'GLS-A / 3F',
454454
label: 'Skovbrug - Standard',
455-
name: 'GLS-A / 3F - Skovbrug Standard',
455+
name: 'GLS-A / 3F - Skovbrug Standard 2024-2026',
456456
locked: true,
457457
payDayRules: [
458458
{
@@ -502,7 +502,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
502502
key: 'glsa-skovbrug-elev-u18',
503503
group: 'GLS-A / 3F',
504504
label: 'Skovbrug - Elev (under 18)',
505-
name: 'GLS-A / 3F - Skovbrug Elev u18',
505+
name: 'GLS-A / 3F - Skovbrug Elev u18 2024-2026',
506506
locked: true,
507507
payDayRules: [
508508
{
@@ -546,7 +546,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
546546
key: 'glsa-skovbrug-elev-o18',
547547
group: 'GLS-A / 3F',
548548
label: 'Skovbrug - Elev (over 18)',
549-
name: 'GLS-A / 3F - Skovbrug Elev o18',
549+
name: 'GLS-A / 3F - Skovbrug Elev o18 2024-2026',
550550
locked: true,
551551
payDayRules: [
552552
{
@@ -591,7 +591,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
591591
key: 'ka-landbrug-svine-standard',
592592
group: 'KA / Krifa',
593593
label: 'Landbrug Svine/Kvaeg - Standard',
594-
name: 'KA / Krifa - Landbrug Svine/Kvaeg Standard',
594+
name: 'KA / Krifa - Landbrug Svine/Kvaeg Standard 2025-2028',
595595
locked: true,
596596
payDayRules: [
597597
{
@@ -629,7 +629,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
629629
key: 'ka-landbrug-svine-elev',
630630
group: 'KA / Krifa',
631631
label: 'Landbrug Svine/Kvaeg - Elev',
632-
name: 'KA / Krifa - Landbrug Svine/Kvaeg Elev',
632+
name: 'KA / Krifa - Landbrug Svine/Kvaeg Elev 2025-2028',
633633
locked: true,
634634
payDayRules: [
635635
{
@@ -673,7 +673,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
673673
key: 'ka-landbrug-plante-standard',
674674
group: 'KA / Krifa',
675675
label: 'Landbrug Plantebrug - Standard',
676-
name: 'KA / Krifa - Landbrug Plantebrug Standard',
676+
name: 'KA / Krifa - Landbrug Plantebrug Standard 2025-2028',
677677
locked: true,
678678
payDayRules: [
679679
{
@@ -711,7 +711,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
711711
key: 'ka-landbrug-plante-elev',
712712
group: 'KA / Krifa',
713713
label: 'Landbrug Plantebrug - Elev',
714-
name: 'KA / Krifa - Landbrug Plantebrug Elev',
714+
name: 'KA / Krifa - Landbrug Plantebrug Elev 2025-2028',
715715
locked: true,
716716
payDayRules: [
717717
{
@@ -755,7 +755,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
755755
key: 'ka-landbrug-maskin-standard',
756756
group: 'KA / Krifa',
757757
label: 'Landbrug Maskinstation - Standard',
758-
name: 'KA / Krifa - Landbrug Maskinstation Standard',
758+
name: 'KA / Krifa - Landbrug Maskinstation Standard 2025-2028',
759759
locked: true,
760760
payDayRules: [
761761
{
@@ -793,7 +793,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
793793
key: 'ka-landbrug-maskin-elev',
794794
group: 'KA / Krifa',
795795
label: 'Landbrug Maskinstation - Elev',
796-
name: 'KA / Krifa - Landbrug Maskinstation Elev',
796+
name: 'KA / Krifa - Landbrug Maskinstation Elev 2025-2028',
797797
locked: true,
798798
payDayRules: [
799799
{
@@ -837,7 +837,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
837837
key: 'ka-gron-standard',
838838
group: 'KA / Krifa',
839839
label: 'Gron - Standard',
840-
name: 'KA / Krifa - Gron Standard',
840+
name: 'KA / Krifa - Gron Standard 2025-2028',
841841
locked: true,
842842
payDayRules: [
843843
{
@@ -903,7 +903,7 @@ export const PAY_RULE_SET_PRESETS: PayRuleSetPreset[] = [
903903
key: 'ka-gron-elev',
904904
group: 'KA / Krifa',
905905
label: 'Gron - Elev',
906-
name: 'KA / Krifa - Gron Elev',
906+
name: 'KA / Krifa - Gron Elev 2025-2028',
907907
locked: true,
908908
payDayRules: [
909909
{

0 commit comments

Comments
 (0)