Substitute selector shows H1/H2 for lesson even if candidate doesn't have H1/H2

[nemvince]

Also, we should differentiate between H1 and H2, sorting H1 first.

[coderabbitai]

Coding Plan

Summary

• Replace the single hasLessonBeforeOrAfter boolean with two distinct flags (hasH1, hasH2) in the backend schema to properly identify substitution duty subjects
• Update the candidate computation to check subject shortcodes rather than just period occupancy, filtering for "H1" and "H2" subjects specifically
• Implement tiered sorting (H1 > H2 > neither) on both backend and frontend to prioritize H1 duty candidates
• Add differentiated translation keys to display the correct tag based on which duty type(s) a candidate has

Implementation Steps

Phase 1: Backend Schema and Candidate Logic Updates

Update the backend to check for H1/H2 subject shortcodes specifically when determining nearby substitution duty, and return separate flags for each duty type to enable proper sorting and labeling.

Task 1: Update Candidate Schema Definition

Replace the single boolean flag with two distinct flags to differentiate between H1 and H2 duty types.

• Modify substitutionCandidateSchema in apps/chronos/src/routes/timetable/lesson.ts to replace hasLessonBeforeOrAfter: z.boolean() with two fields: hasH1: z.boolean() and hasH2: z.boolean()
• hasH1 indicates the candidate has an H1 subject lesson in an adjacent period (immediately before or after)
• hasH2 indicates the candidate has an H2 subject lesson in an adjacent period (immediately before or after)

Task 2: Update Candidate Computation Logic

Modify the getSubstitutionCandidates handler to check subject shortcodes when evaluating adjacent lessons.

• In the candidate computation loop, retrieve subject information for lessons in adjacent periods (minPeriod - 1 and maxPeriod + 1)
• For each adjacent lesson, check if subject.short === "H1" or subject.short === "H2"
• Set hasH1: true only if an adjacent lesson has subject shortcode "H1"
• Set hasH2: true only if an adjacent lesson has subject shortcode "H2"
• Both flags may be true if the candidate has both duty types in adjacent periods
• This requires fetching subject data alongside the existing lesson/period queries for candidate teachers

Task 3: Update Backend Sorting Logic

Adjust the sorting to prioritize H1 candidates over H2 candidates, then alphabetical.

• Update the candidate sorting comparator in the return statement
• Sort order: hasH1 === true first, then hasH2 === true, then neither, with alphabetical (lastName firstName) as tiebreaker
• A candidate with both H1 and H2 should sort before one with only H1, which sorts before one with only H2

🤖 Prompt for AI agents

Update the backend candidate schema and computation logic in
`apps/chronos/src/routes/timetable/lesson.ts` to replace the single
`hasLessonBeforeOrAfter` boolean with two distinct flags (`hasH1`, `hasH2`) and
implement tiered sorting.

- In `substitutionCandidateSchema`, remove `hasLessonBeforeOrAfter: z.boolean()`
and add `hasH1: z.boolean()` and `hasH2: z.boolean()`
- In the `getSubstitutionCandidates` handler's candidate computation loop:
- Fetch subject data for lessons in adjacent periods (`minPeriod - 1` and
`maxPeriod + 1`) alongside existing lesson/period queries
- For each adjacent lesson, check `subject.short === "H1"` and `subject.short
=== "H2"`
  - Set `hasH1: true` only when an adjacent lesson's subject shortcode is `"H1"`
  - Set `hasH2: true` only when an adjacent lesson's subject shortcode is `"H2"`
- Both flags may be `true` simultaneously if the candidate has both duty types
in adjacent periods
- Update the candidate sorting comparator in the return statement:
- Sort candidates with `hasH1 === true` (including those also having `hasH2`)
first
  - Then candidates with only `hasH2 === true`
  - Then candidates with neither flag
  - Use alphabetical (`lastName firstName`) as a tiebreaker within each group

Phase 2: Frontend Label and Sort Updates

Update the frontend component to consume the new schema fields and display appropriate labels with correct sorting.

Task 1: Update Substitute Options Mapping

Modify how candidate options are mapped to display the correct H1/H2 label based on the new flags.

• In apps/iris/src/components/admin/substitution-dialog.tsx, update the candidate mapping logic
• Replace the single hasLessonBeforeOrAfter check with logic that evaluates both hasH1 and hasH2
• Display "H1" label if only hasH1 is true
• Display "H2" label if only hasH2 is true
• Display "H1/H2" label if both are true
• Display no tag if neither is true

Task 2: Update Frontend Sorting Logic

Align frontend sorting with the new backend sort order for consistency.

• Update sortedSubstituteOptions comparator to sort by H1 first, then H2, then neither
• Replace the single isNearby flag with hasH1 and hasH2 flags in the mapped option object
• Sort order: candidates with hasH1 first, then those with only hasH2, then others, with alphabetical tiebreaker

Task 3: Update Translation Keys

Add separate translation keys for H1 and H2 labels to support the differentiated display.

• In apps/iris/public/locales/en/translation.json and apps/iris/public/locales/hu/translation.json, add new keys under the substitution namespace
• Add substitution.h1Tag with value "H1"
• Add substitution.h2Tag with value "H2"
• Keep existing substitution.nearbyTeacherTag ("H1 / H2") for cases where both flags are true
• Update the frontend label logic to use the appropriate key based on which flags are set

🤖 Prompt for AI agents

Update the frontend substitution dialog and translation files in `apps/iris` to
consume the new `hasH1`/`hasH2` flags and display differentiated labels with
correct sorting.

In `apps/iris/src/components/admin/substitution-dialog.tsx`:
- In the candidate mapping logic, replace the single `hasLessonBeforeOrAfter`
check with evaluation of both `hasH1` and `hasH2`
- Replace the single `isNearby` flag in the mapped option object with `hasH1`
and `hasH2` fields
- Apply the following label logic:
- Both `hasH1` and `hasH2` true → use `substitution.nearbyTeacherTag` ("H1 /
H2")
  - Only `hasH1` true → use `substitution.h1Tag` ("H1")
  - Only `hasH2` true → use `substitution.h2Tag` ("H2")
  - Neither true → display no tag
- Update `sortedSubstituteOptions` comparator:
  - Candidates with `hasH1` (including those also having `hasH2`) sort first
  - Then candidates with only `hasH2`
  - Then candidates with neither flag
  - Use alphabetical order as a tiebreaker

In `apps/iris/public/locales/en/translation.json` and
`apps/iris/public/locales/hu/translation.json`:
- Add `substitution.h1Tag` with value `"H1"`
- Add `substitution.h2Tag` with value `"H2"`
- Keep the existing `substitution.nearbyTeacherTag` key unchanged

Research

This is a monorepo with a Hono backend (apps/chronos) and React/TanStack frontend (apps/iris). The substitute selector feature consists of a backend endpoint getSubstitutionCandidates in apps/chronos/src/routes/timetable/lesson.ts that computes eligible substitute teachers, and a frontend dialog component apps/iris/src/components/admin/substitution-dialog.tsx that renders the selector. The current implementation flags candidates with hasLessonBeforeOrAfter: boolean based purely on adjacent period occupancy, without checking the subject type. The timetable XML defines H1 ("Helyettesítés 1.") and H2 ("Helyettesítés 2.") as special substitution duty subjects that should drive this logic.

---

🚀 Next Steps

🤖 All AI agent prompts combined

Task: 1

Update the backend candidate schema and computation logic in
`apps/chronos/src/routes/timetable/lesson.ts` to replace the single
`hasLessonBeforeOrAfter` boolean with two distinct flags (`hasH1`, `hasH2`) and
implement tiered sorting.

- In `substitutionCandidateSchema`, remove `hasLessonBeforeOrAfter: z.boolean()`
and add `hasH1: z.boolean()` and `hasH2: z.boolean()`
- In the `getSubstitutionCandidates` handler's candidate computation loop:
- Fetch subject data for lessons in adjacent periods (`minPeriod - 1` and
`maxPeriod + 1`) alongside existing lesson/period queries
- For each adjacent lesson, check `subject.short === "H1"` and `subject.short
=== "H2"`
  - Set `hasH1: true` only when an adjacent lesson's subject shortcode is `"H1"`
  - Set `hasH2: true` only when an adjacent lesson's subject shortcode is `"H2"`
- Both flags may be `true` simultaneously if the candidate has both duty types
in adjacent periods
- Update the candidate sorting comparator in the return statement:
- Sort candidates with `hasH1 === true` (including those also having `hasH2`)
first
  - Then candidates with only `hasH2 === true`
  - Then candidates with neither flag
  - Use alphabetical (`lastName firstName`) as a tiebreaker within each group
===============================================================================

Task: 2

Update the frontend substitution dialog and translation files in `apps/iris` to
consume the new `hasH1`/`hasH2` flags and display differentiated labels with
correct sorting.

In `apps/iris/src/components/admin/substitution-dialog.tsx`:
- In the candidate mapping logic, replace the single `hasLessonBeforeOrAfter`
check with evaluation of both `hasH1` and `hasH2`
- Replace the single `isNearby` flag in the mapped option object with `hasH1`
and `hasH2` fields
- Apply the following label logic:
- Both `hasH1` and `hasH2` true → use `substitution.nearbyTeacherTag` ("H1 /
H2")
  - Only `hasH1` true → use `substitution.h1Tag` ("H1")
  - Only `hasH2` true → use `substitution.h2Tag` ("H2")
  - Neither true → display no tag
- Update `sortedSubstituteOptions` comparator:
  - Candidates with `hasH1` (including those also having `hasH2`) sort first
  - Then candidates with only `hasH2`
  - Then candidates with neither flag
  - Use alphabetical order as a tiebreaker

In `apps/iris/public/locales/en/translation.json` and
`apps/iris/public/locales/hu/translation.json`:
- Add `substitution.h1Tag` with value `"H1"`
- Add `substitution.h2Tag` with value `"H2"`
- Keep the existing `substitution.nearbyTeacherTag` key unchanged

💡 Iterate on the plan with: `@coderabbitai` <feedback>

Example Feedback
- `@coderabbitai` You can skip phase 3. Add a simple unit test case for phase 2.
- `@coderabbitai` For design choice 1 go ahead with option 3 and replan.

---

💬 Have feedback or questions? Drop into our discord!

[coderabbitai]

⚠️ Possible Duplicate Issue(s)

• Filter H1/H2 from being able to be substituted #209

---

📝 Issue Planner

_{Check the box below or use the @coderabbitai plan command to generate an implementation plan and prompts that you can use with your favorite coding assistant.}

• Create Plan

---

🧪 Issue enrichment is currently in open beta.

To disable automatic issue enrichment, add the following to your .coderabbit.yaml:

issue_enrichment:
  auto_enrich:
    enabled: false

💬 Have feedback or questions? Drop into our discord!