[CLC-1133] Implementing fix for events beyond 'due next week', with fun refactoring
Merge pull request #606 from yuhunglin/CLC-1133

[CLC-1133] Implementing fix for events beyond 'due next week', with fun refactoring