PR from feature/schedule to develop

Ahmad Ghulam Ilhamrequested to merge
feature/schedule into develop

fix: false schedule UI

Merge request reports