Improve class table to calculate current week