melabidi/alrahma_sunday_school
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix teacher pages and adopt the school year
Tests / PHPUnit (push) Successful in 1m14s
Details

Browse Source
This commit is contained in:
root
2026-07-17 00:38:59 -04:00
parent 539d0eb220
commit 0d0a771dd1
7 changed files with 97 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Controllers/ClassProgressController.php
+3 -3
View File
@@ -289,7 +289,7 @@ class ClassProgressController extends BaseController
}
$row['status_label'] = self::STATUS_OPTIONS[$row['status']] ?? 'Unknown';
$weeklyReports = $this->reportModel
$weeklyReportsQuery = $this->reportModel
->select('class_progress_reports.*, cs.class_section_name, CONCAT(IFNULL(u.firstname, ""), " ", IFNULL(u.lastname, "")) AS teacher_name')
->join('classSection cs', 'cs.class_section_id = class_progress_reports.class_section_id', 'left')
->join('users u', 'u.id = class_progress_reports.teacher_id', 'left')
@@ -346,7 +346,7 @@ class ClassProgressController extends BaseController
throw new PageNotFoundException('Progress report not found.');
}
$weeklyReports = $this->reportModel
$weeklyReportsQuery = $this->reportModel
->select('class_progress_reports.*')
->whereIn('teacher_id', $allowedTeacherIds)
->where('class_section_id', $row['class_section_id'])
@@ -513,7 +513,7 @@ class ClassProgressController extends BaseController
}
}
$weeklyReports = $this->reportModel
$weeklyReportsQuery = $this->reportModel
->select('class_progress_reports.*')
->whereIn('teacher_id', $allowedTeacherIds)
->where('class_section_id', $classSectionId)