finish report except pie chart
Merge branch '0530-1'
Merge branch 'master' of https://github.com/ludwiksh/Marksimos