Implement bug fix for counting weeks & days

Bug fix for https://trello.com/c/upgO39t3/83-completed-cohort-keeps-counting-weeks-and-days