refactor fitness-calendar and training's controller
refactor fitness-calendar and training's controller