fix two bug: time controller on teacher final report && html syntax error
merge conflict