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

fix all issues before deploy
Deploy to Shared Hosting / Shared hosting deploy (push) Failing after 47s
Details
Tests / PHPUnit (push) Failing after 1m18s
Details

Browse Source
This commit is contained in:
root
2026-08-25 03:10:44 -04:00
parent 5f5afe97ad
commit 9899af7b37
11 changed files with 515 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Controllers/View/EnrollmentAdminController.php
+9 -6
View File
@@ -484,12 +484,13 @@ class EnrollmentAdminController extends BaseController
if (is_numeric($assignedTo) && (int) $assignedTo > 0) {
$builder->where('ef.assigned_to', (int) $assignedTo);
}
$builder->where('ef.flag_type !=', 'CLASS_CAPACITY_EXCEPTION_REQUIRED');
$ignoredFlagTypes = ['CLASS_CAPACITY_EXCEPTION_REQUIRED', 'CLASS_REASSIGNMENT_REQUIRED'];
$builder->whereNotIn('ef.flag_type', $ignoredFlagTypes);
$rows = $builder->get()->getResultArray();
$rows = array_values(array_filter(
$rows,
static fn (array $row): bool => (string) ($row['flag_type'] ?? '') !== 'CLASS_CAPACITY_EXCEPTION_REQUIRED'
static fn (array $row): bool => ! in_array((string) ($row['flag_type'] ?? ''), $ignoredFlagTypes, true)
));
foreach ($rows as &$row) {
$row['student_name'] = trim((string) ($row['firstname'] ?? '') . ' ' . (string) ($row['lastname'] ?? '')) ?: 'Student #' . (int) ($row['student_id'] ?? 0);
@@ -663,7 +664,6 @@ class EnrollmentAdminController extends BaseController
$followupTypes = [
'PENDING_MAKE_UP_EXAM_PROMOTION' => 'temporary_same_grade',
'CLASS_REASSIGNMENT_REQUIRED' => 'manual_class_required',
'COMPLETION_OR_EXIT_PROCESS_REQUIRED' => 'exit_required',
];
@@ -1251,7 +1251,7 @@ class EnrollmentAdminController extends BaseController
$builder = $this->db->table('enrollment_flags')
->where('status', 'open')
->where('flag_type !=', 'CLASS_CAPACITY_EXCEPTION_REQUIRED');
->whereNotIn('flag_type', ['CLASS_CAPACITY_EXCEPTION_REQUIRED', 'CLASS_REASSIGNMENT_REQUIRED']);
if ($schoolYear !== '') {
$builder->where('school_year', $schoolYear);
}
@@ -1268,7 +1268,7 @@ class EnrollmentAdminController extends BaseController
$types = array_column(
$this->db->table('enrollment_flags')
->select('flag_type')
->where('flag_type !=', 'CLASS_CAPACITY_EXCEPTION_REQUIRED')
->whereNotIn('flag_type', ['CLASS_CAPACITY_EXCEPTION_REQUIRED', 'CLASS_REASSIGNMENT_REQUIRED'])
->distinct()
->orderBy('flag_type')
->get()
@@ -1276,7 +1276,10 @@ class EnrollmentAdminController extends BaseController
'flag_type'
);
return array_values(array_filter($types, static fn ($type): bool => (string) $type !== 'CLASS_CAPACITY_EXCEPTION_REQUIRED'));
return array_values(array_filter(
$types,
static fn ($type): bool => ! in_array((string) $type, ['CLASS_CAPACITY_EXCEPTION_REQUIRED', 'CLASS_REASSIGNMENT_REQUIRED'], true)
));
}
private function schoolYears(): array