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
@@ -297,12 +297,16 @@ class TeacherController extends BaseController
        $schoolYear = $forYear ?: ((string)($this->schoolYear ?? 'Not Set'));

        $teachers = $this->teacherModel->getTeachersAndTAs();
-        // Prefer class sections for the selected year, fallback to all if none
-        $classSections = $classSectionModel
-            ->where('school_year', $schoolYear)
-            ->orderBy('class_section_name', 'ASC')
-            ->findAll();
-        if (empty($classSections)) {
+        // Prefer class sections for the selected year if the column exists, otherwise fallback to all.
+        if ($this->db->fieldExists('school_year', 'classSection')) {
+            $classSections = $classSectionModel
+                ->where('school_year', $schoolYear)
+                ->orderBy('class_section_name', 'ASC')
+                ->findAll();
+            if (empty($classSections)) {
+                $classSections = $classSectionModel->orderBy('class_section_name', 'ASC')->findAll();
+            }
+        } else {
            $classSections = $classSectionModel->orderBy('class_section_name', 'ASC')->findAll();
        }