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

fix widthraw spelling
Deploy to Shared Hosting / Shared hosting deploy (push) Failing after 47s
Details
Tests / PHPUnit (push) Failing after 1m16s
Details

Browse Source
This commit is contained in:
root
2026-08-20 16:07:34 -04:00
parent bfa343b69f
commit 246def8ca9
7 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Controllers/View/AdministratorController.php
+4 -12
View File
@@ -2833,25 +2833,17 @@ class AdministratorController extends BaseController
$hasRemovalCondition = false;
if ($hasIsWithdrawn) {
$builder->where('is_withdrawn', 1);
$builder->orWhere('is_withdrawn', 1);
$hasRemovalCondition = true;
}
if ($hasEnrollmentStatus) {
if ($hasRemovalCondition) {
$builder->orWhereIn('enrollment_status', ['withdrawn', 'widthran', 'denied']);
} else {
$builder->whereIn('enrollment_status', ['withdrawn', 'widthran', 'denied']);
}
$builder->orWhereIn('enrollment_status', ['withdrawn', 'denied']);
$hasRemovalCondition = true;
}
if ($hasAdmissionStatus) {
if ($hasRemovalCondition) {
$builder->orWhere('admission_status', 'denied');
} else {
$builder->where('admission_status', 'denied');
}
$builder->orWhere('admission_status', 'denied');
$hasRemovalCondition = true;
}
@@ -2901,7 +2893,7 @@ class AdministratorController extends BaseController
return 'denied';
}
if (in_array($enrollmentStatus, ['withdrawn', 'widthran'], true) || (int)($row['is_withdrawn'] ?? 0) === 1) {
if ($enrollmentStatus === 'withdrawn' || (int)($row['is_withdrawn'] ?? 0) === 1) {
return 'withdrawn';
}
app/Controllers/View/GradingController.php
+9 -9
View File
@@ -1007,7 +1007,7 @@ class GradingController extends BaseController
->join('classes c', 'c.id = cs.class_id', 'left')
->groupStart()
->where('s.is_active', 1)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','widthran','widthrawan','withdrawan','waitlist')", null, false)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','waitlist')", null, false)
->orWhere('e.is_withdrawn', 1)
->groupEnd()
->orderBy('s.lastname', 'ASC')
@@ -1049,7 +1049,7 @@ class GradingController extends BaseController
->whereIn('ps.batch_id', $batchIds)
->groupStart()
->where('s.is_active', 1)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','widthran','widthrawan','withdrawan','waitlist')", null, false)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','waitlist')", null, false)
->orWhere('e.is_withdrawn', 1)
->groupEnd()
->orderBy('ps.batch_id', 'ASC')
@@ -1688,7 +1688,7 @@ public function belowSixty()
->where('sc.school_year', $schoolYear)
->groupStart()
->where('s.is_active', 1)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','widthran','widthrawan','withdrawan','waitlist')", null, false)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','waitlist')", null, false)
->orWhere('e.is_withdrawn', 1)
->groupEnd();
@@ -1888,7 +1888,7 @@ public function belowSixty()
->join('classSection cs', 'cs.class_section_id = ss.class_section_id', 'left')
->groupStart()
->where('s.is_active', 1)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','widthran','widthrawan','withdrawan','waitlist')", null, false)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','waitlist')", null, false)
->orWhere('e.is_withdrawn', 1)
->groupEnd()
->where('ss.school_year', $schoolYear)
@@ -1940,7 +1940,7 @@ public function belowSixty()
->join('classSection cs', 'cs.class_section_id = ss.class_section_id', 'left')
->groupStart()
->where('s.is_active', 1)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','widthran','widthrawan','withdrawan','waitlist')", null, false)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','waitlist')", null, false)
->orWhere('e.is_withdrawn', 1)
->groupEnd()
->where('ss.school_year', $schoolYear)
@@ -2060,7 +2060,7 @@ public function belowSixty()
->where('ss.student_id', $studentId)
->groupStart()
->where('s.is_active', 1)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','widthran','widthrawan','withdrawan','waitlist')", null, false)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','waitlist')", null, false)
->orWhere('e.is_withdrawn', 1)
->groupEnd()
->where("LOWER(TRIM(ss.semester))", $semesterKey)
@@ -2411,7 +2411,7 @@ public function belowSixty()
->join('classSection cs', 'cs.class_section_id = ss.class_section_id', 'left')
->groupStart()
->where('s.is_active', 1)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','widthran','widthrawan','withdrawan','waitlist')", null, false)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','waitlist')", null, false)
->orWhere('e.is_withdrawn', 1)
->groupEnd()
->where('ss.school_year', $schoolYear)
@@ -3472,7 +3472,7 @@ public function allDecisions()
->join('classes c', 'c.id = cs.class_id', 'left')
->groupStart()
->where('s.is_active', 1)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','widthran','widthrawan','withdrawan','waitlist')", null, false)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','waitlist')", null, false)
->orWhere('e.is_withdrawn', 1)
->groupEnd()
->where('ss.school_year', $schoolYear)
@@ -3692,7 +3692,7 @@ public function generateAllDecisions()
->join('classSection cs', 'cs.class_section_id = ss.class_section_id', 'left')
->groupStart()
->where('s.is_active', 1)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','widthran','widthrawan','withdrawan','waitlist')", null, false)
->orWhere("LOWER(TRIM(e.enrollment_status)) IN ('denied','withdrawn','waitlist')", null, false)
->orWhere('e.is_withdrawn', 1)
->groupEnd()
->where('ss.school_year', $schoolYear)