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
@@ -438,6 +438,7 @@ class ProjectController extends Controller
        // Step 1: Get student IDs from student_class table
        $studentClassRows = $studentClassModel
            ->select('student_id')
+            ->distinct()
            ->where('class_section_id', $classSectionId)
            ->where('school_year', $schoolYear)
            ->findAll();
@@ -494,10 +495,7 @@ class ProjectController extends Controller
        $studentModel = new StudentModel();
        $projectModel = new ProjectModel();

-        $studentClasses = $studentClassModel
-            ->active()
-            ->where('student_class.class_section_id', $classSectionId)
-            ->findAll();
+        $studentClasses = $studentClassModel->getClassStudents($classSectionId, $this->schoolYear, null);
        $students = [];

        foreach ($studentClasses as $sc) {