Merge remote-tracking branch 'origin/veekija' into anu
Merge remote-tracking branch 'origin/veekija' into anu
install-database.sql :: fixed an issue with double enrollment of student 5 in subject schedule 6.
install-database.sql :: inserted sample data in student scorecard for reading subject.
install-database.sql :: inserted sample data for attendance tracking.
controller/UserController.java :: populateAttendance only if the from and to dates are defined.
student/attendance.xhtml :: moved the message layer towards the bottom of the page.
student/grades.xhtml :: moved the message layer towards the bottom of the page.
student/index.xhtml :: moved the message layer towards the bottom of the page.
teacher/attendance.xhtml :: moved the message layer towards the bottom of the page.
teacher/grades.xhtml :: moved the message layer towards the bottom of the page.
teacher/index.xhtml :: moved the message layer towards the bottom of the page.
controller/UserController.java :: updated the user controller to the use the new active column from schoolyear schedules entity.
Merge remote-tracking branch 'origin/anu' into veekija
Active status text is updated