-
Notifications
You must be signed in to change notification settings - Fork 120
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6743 from alphagov/revert-6741-revert-6716-part-3…
…-holiday-entitlement-calculator-change Part 3 holiday entitlement calculator change: update calculator to reflect post-April policy change
- Loading branch information
Showing
17 changed files
with
316 additions
and
495 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
...tlement_flow/outcomes/_april2024_announcement_for_irregular_hours_or_part_of_the_year.erb
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
app/flows/calculate_your_holiday_entitlement_flow/outcomes/_guidance_on_calculations.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
[Read detailed guidance on how holiday entitlement is calculated](/government/publications/holiday-entitlement-calculator-temporary-replacement). | ||
[Read detailed guidance on how holiday entitlement is calculated](/holiday-entitlement-rights). |
1 change: 1 addition & 0 deletions
1
...ulate_your_holiday_entitlement_flow/outcomes/_irregular_hours_leave_before_april_2024.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
There are no rules on how to convert the entitlement into days or hours for employees who work irregular hours or for part of the year. You can [use the calculator again](https://www.gov.uk/calculate-your-holiday-entitlement/y) and calculate the average days or hours worked each week based on a representative reference period. |
8 changes: 3 additions & 5 deletions
8
...utcomes/irregular_and_annualised_done.erb → ...tlement_flow/outcomes/annualised_done.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 5 additions & 3 deletions
8
app/flows/calculate_your_holiday_entitlement_flow/outcomes/compressed_hours_done.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,15 @@ | ||
<% govspeak_for :body do %> | ||
$!The statutory holiday entitlement is <%= "#{calculator.holiday_entitlement_hours} #{'hour'.pluralize(calculator.holiday_entitlement_hours)}" %> and <%= "#{calculator.holiday_entitlement_minutes} #{'minute'.pluralize(calculator.holiday_entitlement_minutes)}" %> holiday for the year. Rather than taking a day’s holiday it’s <%= "#{calculator.hours_daily} #{'hour'.pluralize(calculator.hours_daily)}" %> and <%= "#{calculator.minutes_daily} #{'minute'.pluralize(calculator.minutes_daily)}" %> holiday for each day otherwise worked.$! | ||
|
||
<% if calculator.regular_or_irregular_hours == "irregular-hours-and-part-year" && calculator.leave_year_start_date < (Date.new(2024, 4, 1)) %> | ||
<%= render partial: "irregular_hours_leave_before_april_2024" %> | ||
<% end %> | ||
<%= render partial: 'your_employer_with_rounding' %> | ||
<% if calculator.holiday_period == "starting" %> | ||
<%= render partial: "the_user_should_be_aware" %> | ||
<% end %> | ||
<%= render partial: "guidance_on_calculations" %> | ||
<%= render partial: "april2024_announcement_for_irregular_hours_or_part_of_the_year" %> | ||
<% end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
...s/calculate_your_holiday_entitlement_flow/outcomes/irregular_hours_and_part_year_done.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<% govspeak_for :body do %> | ||
The statutory entitlement for this pay period is <%= "#{calculator.irregular_hours_entitlement} #{'hour'.pluralize(calculator.irregular_hours_entitlement)}."%> | ||
|
||
Employees cannot accrue more than 28 days (5.6 weeks) over the leave year. | ||
|
||
The employer: | ||
|
||
- can include bank and public holidays as part of the statutory entitlement | ||
- must round up to the nearest hour if the entitlement is 0.5 of an hour or more (for example, 3.6 hours is 4 hours’ entitlement) | ||
- can include an amount for holiday pay in the hourly rate (‘rolled-up holiday pay’) for irregular hours and part-year workers | ||
- can provide more paid holiday - this will be in the employment contract and is called ‘contractual leave entitlement’ | ||
<% end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
app/flows/calculate_your_holiday_entitlement_flow/questions/hours_in_pay_period.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
<% text_for :title do %> | ||
How many hours has the employee worked in the pay period? | ||
<% end %> | ||
<% text_for :error_no_hours_worked do %> | ||
You need to enter a number greater than 0. Do not enter fractions. If you work half-hours, enter .5 for half. For example 4.5 | ||
<% end %> |
12 changes: 12 additions & 0 deletions
12
app/flows/calculate_your_holiday_entitlement_flow/questions/regular_or_irregular_hours.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<% text_for :title do %> | ||
Does the employee work irregular hours or for part of the year? | ||
<% end %> | ||
<% options( | ||
"irregular-hours-and-part-year": "Yes", | ||
"regular": "No", | ||
) %> | ||
<% text_for :hint do %> | ||
‘Irregular hours’ means the number of hours an employee works in a pay period often or always changes. ‘Part of the year’ means there are periods of at least a week in a leave year where the employee does not need to work and is not paid. | ||
<% end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.