Fix some issues with WeeklyWorkLoad
Merge pull request #585 from andre-nunes/ticket/#414710

Fix some issues with WeeklyWorkLoad