fix parent, teacher and admin pages
This commit is contained in:
@@ -53,6 +53,8 @@ class TeacherAttendanceSubmissionService
|
||||
}
|
||||
|
||||
$classSectionId = (int)$sectionRow->class_section_id;
|
||||
$classSectionPk = (int)($sectionRow->id ?? 0);
|
||||
$alsoSectionId = ($classSectionPk > 0 && $classSectionPk !== $classSectionId) ? $classSectionPk : null;
|
||||
$classId = (int)$sectionRow->class_id;
|
||||
$attendanceData = $data['attendance'] ?? [];
|
||||
$teachersData = $data['teachers'] ?? [];
|
||||
@@ -108,7 +110,22 @@ class TeacherAttendanceSubmissionService
|
||||
}
|
||||
|
||||
$allowedStatuses = ['present', 'absent', 'late'];
|
||||
$assignedTeachers = $this->teacherClass->assignedForSectionTerm($classSectionId, $semester, $schoolYear);
|
||||
$assignedTeachers = $this->teacherClass->assignedForSectionTerm(
|
||||
$classSectionId,
|
||||
$semester,
|
||||
$schoolYear,
|
||||
$alsoSectionId,
|
||||
true,
|
||||
);
|
||||
if ($assignedTeachers === []) {
|
||||
$assignedTeachers = $this->teacherClass->assignedForSectionTerm(
|
||||
$classSectionId,
|
||||
$semester,
|
||||
$schoolYear,
|
||||
$alsoSectionId,
|
||||
false,
|
||||
);
|
||||
}
|
||||
|
||||
foreach ($assignedTeachers as $teacher) {
|
||||
$teacherId = (int)$teacher['teacher_id'];
|
||||
|
||||
Reference in New Issue
Block a user