merge prod to main

2026-05-16 13:44:12 -04:00
parent 663c0cdbda
commit b32fb853f6
901 changed files with 11241 additions and 1340 deletions
@@ -482,6 +482,7 @@ class HomeworkController extends Controller
        // Step 1: Get student IDs from student_class table
        $studentClassRows = $this->studentClassModel
            ->select('student_id')
+            ->distinct()
            ->where('class_section_id', $classSectionId)
            ->where('school_year', $schoolYear)
            ->findAll();
@@ -534,10 +535,7 @@ class HomeworkController extends Controller
    private function getStudentsWithHomeworkScores($classSectionId, $homeworkHeaders, $semester, $schoolYear)
    {
        $semVariants = $this->getSemesterVariants($semester);
-        $studentClasses = $this->studentClassModel
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
+        $studentClasses = $this->studentClassModel->getClassStudents($classSectionId, $schoolYear, null);
        $students = [];

        foreach ($studentClasses as $sc) {