added calculation for week,month,year