Fix general report

Fix general report to check the type of report and add the new report of
change grades