Merge pull request #7114 from neilLasrado/reports

Fixes for Student Batch-Wise Attendance report