fixed bugs with calculate week