refactor Task Model
modify the time caculation method