Skip to content

Update claim hours#1888

Open
Kizr wants to merge 4 commits intomainfrom
ba/update-claim-hours
Open

Update claim hours#1888
Kizr wants to merge 4 commits intomainfrom
ba/update-claim-hours

Conversation

@Kizr
Copy link
Copy Markdown
Contributor

@Kizr Kizr commented Mar 12, 2026

Context

With the upcoming academic year the claim hours are changing, however we still need to be able to calculate claims for previous years, therefore we must add variable claim hours.

Changes proposed in this pull request

  • Abstracts the training hours into their own calss
  • Updates the training allowance class to utilise the new training hours logic
  • Updates the grant funding guidance to match the upcoming academic year
  • Updates user facing text to use dynamic data from the new training hours class

Link to Trello card

https://trello.com/c/8Ntbut3o/321-updating-logic-for-hours-you-can-claim-for-initial-and-refresher-training

@Kizr Kizr self-assigned this Mar 12, 2026
@Kizr Kizr requested review from a team as code owners March 12, 2026 16:10
@Kizr Kizr added the deploy A Review App will be created for PRs with this label label Mar 12, 2026
@Kizr Kizr requested a review from Copilot March 12, 2026 16:11
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR introduces configurable mentor training-hour caps by academic year (notably reducing the initial training cap), and updates user-facing copy/tests to reflect the new wording and limits.

Changes:

  • Adds Claims::TrainingHours to centralise initial/refresher hour caps by academic-year period (with model specs).
  • Updates Claims::TrainingAllowance to derive total hours from Claims::TrainingHours instead of hard-coded constants (and expands specs).
  • Updates wizard/view copy and locale strings to interpolate the initial-hours cap, plus updates grant conditions content and related specs.

Reviewed changes

Copilot reviewed 14 out of 14 changed files in this pull request and generated 7 comments.

Show a summary per file
File Description
spec/wizards/claims/add_claim_wizard/mentor_training_step_spec.rb Updates refresher hint text (“up to …”).
spec/system/claims/schools/claims/claims_user_creates_a_claim_for_a_mentor_with_a_previous_year_claim_spec.rb Updates system spec hint text to match copy change.
spec/models/claims/training_hours_spec.rb Adds tests for Claims::TrainingHours hour caps by period.
spec/models/claims/training_allowance_spec.rb Expands coverage for pre/post cutover initial/refresher allowances.
config/locales/en/wizards/claims/invalid_provider_wizard.yml Parameterises initial-hours cap and provider name in the warning copy.
config/locales/en/wizards/claims/add_claim_wizard.yml Parameterises initial-hours cap in refresher hint and “no mentors” copy.
config/locales/en/components/claims/add_claim_wizard/mentor_step/disclaimer_component.yml Parameterises initial-hours cap in disclaimer copy.
app/wizards/claims/add_claim_wizard/mentor_training_step.rb Supplies num_initial_hours when rendering refresher hint.
app/views/wizards/claims/invalid_provider_wizard/_unable_to_assign_provider_step.html.erb Supplies num_initial_hours to updated translation.
app/views/wizards/claims/add_claim_wizard/_no_mentors_step.html.erb Supplies num_initial_hours to updated translation.
app/views/claims/schools/_grant_conditions.html.erb Updates grant conditions copy to 2025/26 and 16-hour cap.
app/models/claims/training_hours.rb Adds new policy object for hour caps by academic-year period.
app/models/claims/training_allowance.rb Uses Claims::TrainingHours for totals instead of constants.
app/components/claims/add_claim_wizard/mentor_step/disclaimer_component.rb Supplies num_initial_hours to updated translation.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread app/wizards/claims/add_claim_wizard/mentor_training_step.rb Outdated
Comment thread app/views/wizards/claims/add_claim_wizard/_no_mentors_step.html.erb Outdated
Comment thread app/components/claims/add_claim_wizard/mentor_step/disclaimer_component.rb Outdated
Comment thread app/models/claims/training_hours.rb
Comment thread spec/models/claims/training_allowance_spec.rb Outdated
Comment thread spec/models/claims/training_hours_spec.rb
@github-actions
Copy link
Copy Markdown

Deployments

App URL
Track & Pay https://track-and-pay-pr-1888.test.teacherservices.cloud

@Kizr Kizr changed the title Ba/update claim hours Update claim hours Mar 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

deploy A Review App will be created for PRs with this label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants