add week events and refactoring
Merge pull request #1 from Aliev-N/add-week

add week events and refactoring