Hotfix so uses correct end day and split switch into readable if statemet

[Paul Cooper (PaulCooperWorkJustice)]

🔗 Related Work

• Closes: #
• Related: #

---

📌 Summary

What does this PR do? Keep it short but clear.

---

🎯 Purpose / Motivation

Why does this change exist? What problem are we solving?

---

🧠 Approach

Key implementation details, trade-offs, or design decisions.
Mention anything reviewers should pay attention to.

---

🔄 Changes

• Added:
• Updated:
• Removed:

---

🧪 How to Test

Step-by-step instructions to verify this works.

Expected result:

What should happen if everything is correct?

---

📸 Screenshots / Output (if applicable)

UI changes, logs, API responses, etc.

---

⚠️ Risks & Impact

• Breaking change
• Database change
• Performance impact
• Security impact

Details:

Anything reviewers should be cautious about.

---

🙋 Notes for Reviewers

Anything specific you want feedback on.
e.g. "Unsure about approach in X", "Focus on Y logic"