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

apply the school year concept
Tests / PHPUnit (push) Failing after 1m19s
Details

Browse Source
This commit is contained in:
root
2026-07-14 00:59:00 -04:00
parent 504c3bc9f9
commit feb1b29a32
73 changed files with 4288 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Controllers/View/UserController.php
+9 -3
View File
@@ -961,12 +961,18 @@ class UserController extends BaseController
$perPage = max(1, min($perPage, 200));
$page = max(1, $page);
$totalActivities = (int) $this->loginActivityModel->countAll();
$activities = $this->loginActivityModel
$schoolYear = (string) ((new \App\Models\ConfigurationModel())->getConfig('school_year') ?? '');
$activityModel = $this->loginActivityModel;
if ($schoolYear !== '' && db_connect()->fieldExists('school_year', 'login_activity')) {
$activityModel->where('school_year', $schoolYear);
}
$totalActivities = (int) $activityModel->countAllResults(false);
$activities = $activityModel
->orderBy('login_time', 'DESC')
->paginate($perPage, 'loginActivity', $page) ?? [];
$pager = $this->loginActivityModel->pager;
$pager = $activityModel->pager;
$currentPage = $pager ? (int) $pager->getCurrentPage('loginActivity') : $page;
$pageCount = $pager ? (int) $pager->getPageCount('loginActivity') : (int) max(1, ceil($totalActivities / $perPage));