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

fix tests

Browse Source
This commit is contained in:
root
2026-06-11 11:46:12 -04:00
parent c91fa2ce4d
commit 5ead80fdc7
1489 changed files with 11349 additions and 10305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Badges/BadgeFormDataService.php
+17 -18
View File
@@ -8,8 +8,7 @@ class BadgeFormDataService
protected BadgeUserLookupService $lookupService,
protected BadgeStudentLookupService $studentLookupService,
protected BadgeTextFormatter $formatter
) {
}
) {}
public function build(
?string $schoolYear,
@@ -24,7 +23,7 @@ class BadgeFormDataService
$students = $this->studentLookupService->fetchStudentList($schoolYear, $selectedStudentIds);
foreach ($users as &$u) {
if (!isset($u['user_id']) && isset($u['id'])) {
if (! isset($u['user_id']) && isset($u['id'])) {
$u['user_id'] = (int) $u['id'];
}
@@ -46,7 +45,7 @@ class BadgeFormDataService
$u['class_section_id'] = $u['class_section_id'] ?? null;
$u['class_section_name'] = $u['class_section_name'] ?? null;
$u['entity_type'] = 'user';
$u['row_id'] = 'user:' . (int) ($u['user_id'] ?? 0);
$u['row_id'] = 'user:'.(int) ($u['user_id'] ?? 0);
$u['role_group'] = $this->detectRoleGroup(
strtolower((string) ($u['roles_raw'] ?? ($u['role_name_raw'] ?? '')))
);
@@ -57,7 +56,7 @@ class BadgeFormDataService
$rolesDetect = strtolower((string) ($u['roles_raw'] ?? ($u['role_name_raw'] ?? '')));
$isTeacherish = str_contains($rolesDetect, 'teacher') || preg_match('/\bta\b/', $rolesDetect);
if ($isTeacherish && !empty($u['user_id'])) {
if ($isTeacherish && ! empty($u['user_id'])) {
$assign = $this->lookupService->getLatestClassForUser((int) $u['user_id'], $schoolYear);
if ($assign) {
$u['class_section_id'] = $assign['class_section_id'] ?? null;
@@ -69,7 +68,7 @@ class BadgeFormDataService
foreach ($students as &$student) {
$student['entity_type'] = 'student';
$student['row_id'] = 'student:' . (int) ($student['student_id'] ?? 0);
$student['row_id'] = 'student:'.(int) ($student['student_id'] ?? 0);
$student['role_group'] = 'student';
$student['class_section_id'] = null;
@@ -84,17 +83,17 @@ class BadgeFormDataService
$rows = array_merge($users, $students);
usort($rows, static function (array $a, array $b): int {
return strcasecmp(
trim((string) ($a['lastname'] ?? '')) . ' ' . trim((string) ($a['firstname'] ?? '')),
trim((string) ($b['lastname'] ?? '')) . ' ' . trim((string) ($b['firstname'] ?? ''))
trim((string) ($a['lastname'] ?? '')).' '.trim((string) ($a['firstname'] ?? '')),
trim((string) ($b['lastname'] ?? '')).' '.trim((string) ($b['firstname'] ?? ''))
);
});
$rolesTabs = [
'all' => 'All',
'all' => 'All',
'teacher' => 'Teachers',
'ta' => 'Teacher Assistants',
'admin' => 'Admins',
'staff' => 'Staff',
'ta' => 'Teacher Assistants',
'admin' => 'Admins',
'staff' => 'Staff',
'student' => 'Students',
];
@@ -103,13 +102,13 @@ class BadgeFormDataService
: 'all';
return [
'users' => $rows,
'schoolYears' => $this->lookupService->getAvailableSchoolYears(),
'selectedYear' => $schoolYear,
'selectedUserIds' => $selectedUserIds,
'users' => $rows,
'schoolYears' => $this->lookupService->getAvailableSchoolYears(),
'selectedYear' => $schoolYear,
'selectedUserIds' => $selectedUserIds,
'selectedStudentIds' => $selectedStudentIds,
'rolesTabs' => $rolesTabs,
'active_role' => $activeRole,
'rolesTabs' => $rolesTabs,
'active_role' => $activeRole,
];
}
app/Services/Badges/BadgePdfService.php
+61 -62
View File
@@ -33,14 +33,13 @@ class BadgePdfService
protected BadgeUserLookupService $userLookupService,
protected BadgePrintLogService $printLogService,
protected BadgeTextFormatter $formatter,
) {
}
) {}
/**
* Letter landscape PDF, 8 badges per page — students and/or staff (FPDF + QR PNG).
*
* @param int[] $studentIds Primary keys on `students.id`
* @param int[] $userIds Staff/admin/teacher keys on `users.id`
* @param int[] $userIds Staff/admin/teacher keys on `users.id`
*/
public function generate(
array $studentIds,
@@ -86,7 +85,7 @@ class BadgePdfService
try {
$qrPayload = (string) ($staffRow['user_id_for_qr'] ?? $staffRow['user_id'] ?? '');
if ($qrPayload === '' || !preg_match('/^[A-Za-z0-9_-]+$/', $qrPayload)) {
if ($qrPayload === '' || ! preg_match('/^[A-Za-z0-9_-]+$/', $qrPayload)) {
$qrPayload = (string) (int) ($staffRow['user_id'] ?? 0);
}
@@ -144,7 +143,7 @@ class BadgePdfService
): string {
$html = $this->buildHtmlDocument($rows, $schoolName, $motto, $footerBlock);
$options = new Options();
$options = new Options;
$options->set('isHtml5ParserEnabled', true);
$options->set('isRemoteEnabled', true);
$options->set('defaultFont', 'DejaVu Sans');
@@ -168,7 +167,7 @@ class BadgePdfService
$this->tempQrFiles = [];
try {
if (!class_exists('FPDF', false)) {
if (! class_exists('FPDF', false)) {
require_once base_path('app/ThirdParty/fpdf/fpdf.php');
}
@@ -200,7 +199,7 @@ class BadgePdfService
for ($gridCol = 0; $gridCol < 4; $gridCol++) {
$idx = ($gridRow * 4) + $gridCol;
$row = $slots[$idx];
if (!is_array($row)) {
if (! is_array($row)) {
continue;
}
@@ -262,7 +261,7 @@ class BadgePdfService
array $classesMap
): ?array {
$info = $this->userLookupService->getUserInfoById($userId, $schoolYear);
if (!$info || !is_array($info)) {
if (! $info || ! is_array($info)) {
return null;
}
@@ -276,7 +275,7 @@ class BadgePdfService
$roleResolved = $this->formatter->formatRole($roleResolved);
$info['role_resolved'] = $roleResolved;
if (!empty($classesMap[$resolvedId])) {
if (! empty($classesMap[$resolvedId])) {
$info['class_section_name'] = (string) $classesMap[$resolvedId];
}
@@ -291,11 +290,11 @@ class BadgePdfService
if ($isTeacherish && $class !== '') {
if (strtolower($class) === 'youth') {
$display = 'Youth ' . $roleResolved;
$display = 'Youth '.$roleResolved;
} elseif ($class === 'KG') {
$display = 'KG ' . $roleResolved;
$display = 'KG '.$roleResolved;
} else {
$display = 'Grade ' . $class . ' ' . $roleResolved;
$display = 'Grade '.$class.' '.$roleResolved;
}
} elseif ($roleResolved !== '') {
$display = $roleResolved;
@@ -309,7 +308,7 @@ class BadgePdfService
$year = $this->formatter->norm((string) ($info['school_year'] ?? ($schoolYear ?? '')));
$schoolId = trim((string) ($info['school_id'] ?? ''));
if ($schoolId === '' || !preg_match('/^[A-Za-z0-9_-]+$/', $schoolId)) {
if ($schoolId === '' || ! preg_match('/^[A-Za-z0-9_-]+$/', $schoolId)) {
return null;
}
@@ -364,10 +363,10 @@ class BadgePdfService
}
return '<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><title>Badges PDF</title><style>'
. $this->badgeCss()
. '</style></head><body>'
. $badgesHtml
. '</body></html>';
.$this->badgeCss()
.'</style></head><body>'
.$badgesHtml
.'</body></html>';
}
protected function buildBadgeHtml(
@@ -376,8 +375,7 @@ class BadgePdfService
string $motto,
string $footerBlock,
?string $logoDataUri
): string
{
): string {
$kind = (string) ($row['_badge_kind'] ?? 'student');
$idLabel = $kind === 'staff' ? 'User ID' : 'School ID';
$title = $this->escapeHtml((string) ($row['fullname'] ?? ''));
@@ -404,8 +402,8 @@ class BadgePdfService
<div class="info-row">
<span class="icon-badge">G</span>
<span class="info-copy">
<span class="label">' . $gradeLabel . '</span>
<span class="value">' . $grade . '</span>
<span class="label">'.$gradeLabel.'</span>
<span class="value">'.$grade.'</span>
</span>
</div>';
}
@@ -415,15 +413,15 @@ class BadgePdfService
<span class="icon-badge">Y</span>
<span class="info-copy">
<span class="label">Academic Year</span>
<span class="value">' . $year . '</span>
<span class="value">'.$year.'</span>
</span>
</div>
<div class="info-row">
<span class="icon-badge">ID</span>
<span class="info-copy">
<span class="label">' . $this->escapeHtml($idLabel) . '</span>
<span class="value">' . $schoolId . '</span>
<span class="label">'.$this->escapeHtml($idLabel).'</span>
<span class="value">'.$schoolId.'</span>
</span>
</div>';
@@ -432,18 +430,18 @@ class BadgePdfService
<div class="header-wrap">
<div class="header">
<div class="header-mark">'
. ($logoDataUri !== null
? '<img src="' . $logoDataUri . '" alt="School Logo">'
: '<span>AS</span>') .
.($logoDataUri !== null
? '<img src="'.$logoDataUri.'" alt="School Logo">'
: '<span>AS</span>').
'</div>
<div class="header-copy">
<div class="school-name">' . $this->escapeHtml($headerMainTitle) . '</div>
' . ($schoolLevel !== ''
? '<div class="sub-school">' . $this->escapeHtml($schoolLevel) . '</div>'
: '') . '
' . ($headerMotto !== ''
? '<div class="motto">' . $this->escapeHtml($headerMotto) . '</div>'
: '') . '
<div class="school-name">'.$this->escapeHtml($headerMainTitle).'</div>
'.($schoolLevel !== ''
? '<div class="sub-school">'.$this->escapeHtml($schoolLevel).'</div>'
: '').'
'.($headerMotto !== ''
? '<div class="motto">'.$this->escapeHtml($headerMotto).'</div>'
: '').'
</div>
</div>
<div class="header-accent"></div>
@@ -451,25 +449,25 @@ class BadgePdfService
</div>
<div class="body">
<div class="student-name">' . mb_strtoupper($title, 'UTF-8') . '</div>
<div class="student-name">'.mb_strtoupper($title, 'UTF-8').'</div>
<div class="name-divider">
<span class="divider-line"></span>
<span class="divider-dot"></span>
<span class="divider-line"></span>
</div>
<div class="role">' . mb_strtoupper($role, 'UTF-8') . '</div>
<div class="role">'.mb_strtoupper($role, 'UTF-8').'</div>
<table class="content">
<tr>
<td class="info">
' . $infoRows . '
'.$infoRows.'
</td>
<td class="qr-col">
<div class="qr-box">'
. ($qrSrc !== ''
? '<img src="' . $qrSrc . '" alt="QR Code">'
: '') .
.($qrSrc !== ''
? '<img src="'.$qrSrc.'" alt="QR Code">'
: '').
'</div>
<div class="scan-pill">Scan to verify</div>
</td>
@@ -477,18 +475,18 @@ class BadgePdfService
</table>
<div class="barcode-wrap">
<div class="barcode-bars">' . $this->buildBarcodeHtml($barcodeValue) . '</div>
<div class="barcode-text">' . $barcodeText . '</div>
<div class="barcode-bars">'.$this->buildBarcodeHtml($barcodeValue).'</div>
<div class="barcode-text">'.$barcodeText.'</div>
</div>
</div>
<div class="footer">
<span class="footer-mark">'
. ($logoDataUri !== null
? '<img src="' . $logoDataUri . '" alt="School Logo">'
: '<span>S</span>') .
.($logoDataUri !== null
? '<img src="'.$logoDataUri.'" alt="School Logo">'
: '<span>S</span>').
'</span>
<span class="footer-copy">' . $footer . '</span>
<span class="footer-copy">'.$footer.'</span>
</div>
</div>
';
@@ -899,7 +897,7 @@ CSS;
default => '4px',
};
$bars[] = '<span class="barcode-bar" style="width:' . $width . '"></span>';
$bars[] = '<span class="barcode-bar" style="width:'.$width.'"></span>';
$bars[] = '<span class="barcode-bar" style="width:1px"></span>';
}
@@ -917,7 +915,7 @@ CSS;
return null;
}
$tmpPath = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'badge_qr_' . bin2hex(random_bytes(8)) . '.png';
$tmpPath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'badge_qr_'.bin2hex(random_bytes(8)).'.png';
if (@file_put_contents($tmpPath, $png) === false) {
return null;
}
@@ -1002,11 +1000,11 @@ CSS;
{
return $this->formatter->firstExisting([
public_path($filename),
public_path('badges/' . $filename),
public_path('assets/images/' . $filename),
public_path('assets/images/badges/' . $filename),
storage_path('app/public/' . $filename),
storage_path('app/public/badges/' . $filename),
public_path('badges/'.$filename),
public_path('assets/images/'.$filename),
public_path('assets/images/badges/'.$filename),
storage_path('app/public/'.$filename),
storage_path('app/public/badges/'.$filename),
]);
}
@@ -1087,7 +1085,7 @@ CSS;
/**
* Shrink text until it fits in the available width. FPDF, bravely, does not do this for us.
*
* @param array{0:int,1:int,2:int} $rgb
* @param array{0:int,1:int,2:int} $rgb
*/
protected function fitCenteredText(
\FPDF $pdf,
@@ -1149,7 +1147,7 @@ CSS;
}
/**
* @param array{0:int,1:int,2:int} $rgb
* @param array{0:int,1:int,2:int} $rgb
*/
protected function fitLeftText(
\FPDF $pdf,
@@ -1447,6 +1445,7 @@ CSS;
foreach ($segments as [$type, $segmentWidth]) {
if ($type === 'gap') {
$cursor += $segmentWidth;
continue;
}
@@ -1510,7 +1509,7 @@ CSS;
protected function preparedLogoPath(): ?string
{
$path = $this->logoFilePath();
if ($path === null || !is_readable($path)) {
if ($path === null || ! is_readable($path)) {
return null;
}
@@ -1519,7 +1518,7 @@ CSS;
return $path;
}
$tmpPath = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'badge_logo_' . bin2hex(random_bytes(8)) . '.png';
$tmpPath = sys_get_temp_dir().DIRECTORY_SEPARATOR.'badge_logo_'.bin2hex(random_bytes(8)).'.png';
if (@file_put_contents($tmpPath, $png) === false) {
return $path;
}
@@ -1532,7 +1531,7 @@ CSS;
protected function logoDataUri(): ?string
{
$path = $this->logoFilePath();
if ($path === null || !is_readable($path)) {
if ($path === null || ! is_readable($path)) {
return null;
}
@@ -1544,10 +1543,9 @@ CSS;
return null;
}
return 'data:image/png;base64,' . base64_encode($bytes);
return 'data:image/png;base64,'.base64_encode($bytes);
}
protected function headerMainTitle(string $schoolName): string
{
$name = trim($schoolName) !== '' ? trim($schoolName) : 'Al Rahma Sunday School';
@@ -1579,7 +1577,7 @@ CSS;
{
$address = trim((string) config('badges.footer_address', ''));
if ($address !== '') {
return $schoolName . "\n" . $address;
return $schoolName."\n".$address;
}
return $schoolName;
@@ -1587,7 +1585,7 @@ CSS;
protected function makeCircularPngBytesFromPath(string $path): ?string
{
if (!function_exists('imagecreatetruecolor') || !function_exists('imagepng')) {
if (! function_exists('imagecreatetruecolor') || ! function_exists('imagepng')) {
return null;
}
@@ -1626,6 +1624,7 @@ CSS;
$circle = imagecreatetruecolor($size, $size);
if ($circle === false) {
imagedestroy($square);
return null;
}
app/Services/Badges/BadgePrintLogService.php
+3 -4
View File
@@ -10,8 +10,7 @@ class BadgePrintLogService
public function __construct(
protected BadgePrintLog $badgePrintLogModel,
protected BadgeTextFormatter $formatter
) {
}
) {}
public function getStatus(array $userIds, ?string $schoolYear): array
{
@@ -51,7 +50,7 @@ class BadgePrintLogService
try {
$this->log($userIds, $actorId, $schoolYear, $rolesMap, $classesMap, $copies);
} catch (\Throwable $e) {
Log::error('Failed to log badge prints: ' . $e->getMessage());
Log::error('Failed to log badge prints: '.$e->getMessage());
}
}
}
}
app/Services/Badges/BadgeService.php
+31 -31
View File
@@ -23,8 +23,7 @@ class BadgeService
protected TeacherClass $teacherClassModel,
protected ClassSection $classSectionModel,
protected BadgePrintLog $badgePrintLogModel
) {
}
) {}
public function generateBadgePdf(
array $userIds,
@@ -55,7 +54,7 @@ class BadgeService
foreach ($userIds as $uid) {
$info = $this->getUserInfoById($uid, $schoolYear);
if (!$info || !is_array($info)) {
if (! $info || ! is_array($info)) {
continue;
}
@@ -70,13 +69,13 @@ class BadgeService
$roleResolved = $this->formatRole($roleResolved);
$info['role_resolved'] = $roleResolved;
if (!empty($classesMap[$userId])) {
if (! empty($classesMap[$userId])) {
$info['class_section_name'] = (string) $classesMap[$userId];
}
$class = $this->norm($info['class_section_name'] ?? '');
$badgeKey = strtolower(trim($userId . '|' . $name . '|' . $roleResolved . '|' . $class));
$badgeKey = strtolower(trim($userId.'|'.$name.'|'.$roleResolved.'|'.$class));
if (isset($seen[$badgeKey])) {
continue;
}
@@ -117,7 +116,7 @@ class BadgeService
1
);
} catch (\Throwable $e) {
Log::error('Failed to log badge prints: ' . $e->getMessage());
Log::error('Failed to log badge prints: '.$e->getMessage());
}
return response($pdfString, 200, [
@@ -159,7 +158,7 @@ class BadgeService
$users = $this->fetchStaffList($schoolYear, $selectedUserIds);
foreach ($users as &$u) {
if (!isset($u['user_id'])) {
if (! isset($u['user_id'])) {
if (isset($u['id'])) {
$u['user_id'] = (int) $u['id'];
}
@@ -190,7 +189,7 @@ class BadgeService
$rolesDetect = strtolower($u['roles_raw'] ?? ($u['role_name_raw'] ?? ''));
$isTeacherish = str_contains($rolesDetect, 'teacher') || preg_match('/\bta\b/', $rolesDetect);
if ($isTeacherish && !empty($u['user_id'])) {
if ($isTeacherish && ! empty($u['user_id'])) {
$assign = $this->getLatestClassForUser((int) $u['user_id'], $schoolYear);
if ($assign) {
$u['class_section_id'] = $assign['class_section_id'] ?? null;
@@ -234,11 +233,11 @@ class BadgeService
])
->groupBy('users.id', 'users.firstname', 'users.lastname');
if (!empty($selectedUserIds)) {
if (! empty($selectedUserIds)) {
$query->whereIn('users.id', $selectedUserIds);
}
if (!empty($schoolYear) && Schema::hasColumn('user_roles', 'school_year')) {
if (! empty($schoolYear) && Schema::hasColumn('user_roles', 'school_year')) {
$query->where('user_roles.school_year', $schoolYear);
}
@@ -255,7 +254,7 @@ class BadgeService
])
->where('tc.teacher_id', $userId);
if (!empty($schoolYear)) {
if (! empty($schoolYear)) {
$query->where('tc.school_year', $schoolYear);
}
@@ -265,7 +264,7 @@ class BadgeService
->orderByDesc('tc.id')
->first();
if (!$row || empty($row->class_section_id)) {
if (! $row || empty($row->class_section_id)) {
return null;
}
@@ -282,12 +281,12 @@ class BadgeService
->where('id', $id)
->first();
if (!$u) {
if (! $u) {
return null;
}
$userId = (int) $u->user_id;
$fullname = trim(($u->firstname ?? '') . ' ' . ($u->lastname ?? ''));
$fullname = trim(($u->firstname ?? '').' '.($u->lastname ?? ''));
$rolesRows = DB::table('user_roles as ur')
->join('roles as r', 'r.id', '=', 'ur.role_id')
@@ -310,7 +309,7 @@ class BadgeService
->select(['class_section_id', 'updated_at', 'id', 'position', 'school_year'])
->where('teacher_id', $userId);
if (!empty($schoolYear)) {
if (! empty($schoolYear)) {
$tcQuery->where('school_year', $schoolYear);
}
@@ -322,7 +321,7 @@ class BadgeService
$position = strtolower(trim((string) ($assignment->position ?? '')));
$className = null;
if (!empty($classId)) {
if (! empty($classId)) {
$className = $this->resolveClassName((int) $classId);
}
@@ -330,7 +329,7 @@ class BadgeService
$roleLabel = 'Teacher Assistant';
} elseif ($position === 'teacher' || $position === 'main') {
$roleLabel = 'Teacher';
} elseif (!empty($allRoles)) {
} elseif (! empty($allRoles)) {
$roleLabel = $allRoles[0];
} else {
$roleLabel = 'Staff';
@@ -347,11 +346,11 @@ class BadgeService
]);
$jobTitle = '';
if (!empty($roleLabel) && !empty($className)) {
if (! empty($roleLabel) && ! empty($className)) {
$jobTitle = "{$roleLabel} - {$className}";
} elseif (!empty($roleLabel)) {
} elseif (! empty($roleLabel)) {
$jobTitle = $roleLabel;
} elseif (!empty($className)) {
} elseif (! empty($className)) {
$jobTitle = $className;
}
@@ -379,10 +378,10 @@ class BadgeService
$pdf->Rect($x, $y, $w, $h);
$logoSize = 6;
if (!empty($data['school_logo']) && file_exists($data['school_logo'])) {
if (! empty($data['school_logo']) && file_exists($data['school_logo'])) {
$pdf->Image($data['school_logo'], $x + $w - 6 - $logoSize, $y + 4, $logoSize + 3, $logoSize - 1);
}
if (!empty($data['isgl_logo']) && file_exists($data['isgl_logo'])) {
if (! empty($data['isgl_logo']) && file_exists($data['isgl_logo'])) {
$pdf->Image($data['isgl_logo'], $x + 4, $y + 4, $logoSize + 3, $logoSize - 1);
}
@@ -418,11 +417,11 @@ class BadgeService
if ($isTeacherish && $class !== '') {
if (strtolower($class) === 'youth') {
$display = 'Youth ' . $roleResolved;
$display = 'Youth '.$roleResolved;
} elseif ($class === 'KG') {
$display = 'KG ' . $roleResolved;
$display = 'KG '.$roleResolved;
} else {
$display = 'Grade ' . $class . ' ' . $roleResolved;
$display = 'Grade '.$class.' '.$roleResolved;
}
} elseif ($roleResolved !== '') {
$display = $roleResolved;
@@ -461,7 +460,7 @@ class BadgeService
'role',
'active_role',
'role_name',
fn ($r) => !empty($r['roles'])
fn ($r) => ! empty($r['roles'])
? (array_filter(array_map('trim', explode(',', (string) $r['roles'])))[0] ?? '')
: '',
'job_title',
@@ -479,7 +478,7 @@ class BadgeService
return $this->norm($v);
}
} else {
if (!empty($info[$key])) {
if (! empty($info[$key])) {
$v = $this->norm((string) $info[$key]);
if ($v !== '') {
return $v;
@@ -579,6 +578,7 @@ class BadgeService
if ($start === false) {
$out[] = ucfirst(mb_strtolower($tok, 'UTF-8'));
continue;
}
@@ -594,12 +594,12 @@ class BadgeService
$coreFmt = preg_replace_callback(
'/\p{L}+/u',
static fn ($m) => mb_strtoupper(mb_substr($m[0], 0, 1, 'UTF-8'), 'UTF-8')
. mb_strtolower(mb_substr($m[0], 1, null, 'UTF-8'), 'UTF-8'),
.mb_strtolower(mb_substr($m[0], 1, null, 'UTF-8'), 'UTF-8'),
mb_strtolower($core, 'UTF-8')
);
}
$out[] = $pre . $coreFmt . $suf;
$out[] = $pre.$coreFmt.$suf;
}
return implode(' ', $out);
@@ -640,7 +640,7 @@ class BadgeService
protected function firstExisting(array $paths): ?string
{
foreach ($paths as $path) {
if (!empty($path) && file_exists($path)) {
if (! empty($path) && file_exists($path)) {
return $path;
}
}
@@ -697,4 +697,4 @@ class BadgeService
return $schoolYears;
}
}
}
app/Services/Badges/BadgeStudentLookupService.php
+6 -7
View File
@@ -12,8 +12,7 @@ class BadgeStudentLookupService
{
public function __construct(
protected BadgeTextFormatter $formatter
) {
}
) {}
/**
* Active student roster for the badge picker.
@@ -29,7 +28,7 @@ class BadgeStudentLookupService
->leftJoin('student_class as sc', function ($join) use ($schoolYear) {
$join->on('sc.student_id', '=', 'students.id');
if (!empty($schoolYear)) {
if (! empty($schoolYear)) {
$join->where('sc.school_year', '=', $schoolYear);
}
})
@@ -55,9 +54,9 @@ class BadgeStudentLookupService
->orderBy('students.lastname')
->orderBy('students.firstname');
if (!empty($selectedStudentIds)) {
if (! empty($selectedStudentIds)) {
$query->whereIn('students.id', $selectedStudentIds);
} elseif (!empty($schoolYear)) {
} elseif (! empty($schoolYear)) {
$query->where(function ($q) use ($schoolYear) {
$q->where('students.school_year', $schoolYear)
->orWhereNotNull('sc.student_id');
@@ -74,7 +73,7 @@ class BadgeStudentLookupService
}
$schoolId = trim((string) ($row['school_id'] ?? ''));
if ($schoolId === '' || !preg_match('/^[A-Za-z0-9_-]+$/', $schoolId)) {
if ($schoolId === '' || ! preg_match('/^[A-Za-z0-9_-]+$/', $schoolId)) {
continue;
}
@@ -117,7 +116,7 @@ class BadgeStudentLookupService
$out = [];
foreach ($rows as $student) {
$schoolId = trim((string) ($student->school_id ?? ''));
if ($schoolId === '' || !preg_match('/^[A-Za-z0-9_-]+$/', $schoolId)) {
if ($schoolId === '' || ! preg_match('/^[A-Za-z0-9_-]+$/', $schoolId)) {
continue;
}
app/Services/Badges/BadgeTextFormatter.php
+7 -6
View File
@@ -78,7 +78,7 @@ class BadgeTextFormatter
}
$special = [
'of' => 'of',
'of' => 'of',
'head' => 'Head',
];
@@ -95,6 +95,7 @@ class BadgeTextFormatter
if ($start === false) {
$out[] = ucfirst(mb_strtolower($tok, 'UTF-8'));
continue;
}
@@ -110,12 +111,12 @@ class BadgeTextFormatter
$coreFmt = preg_replace_callback(
'/\p{L}+/u',
static fn ($m) => mb_strtoupper(mb_substr($m[0], 0, 1, 'UTF-8'), 'UTF-8')
. mb_strtolower(mb_substr($m[0], 1, null, 'UTF-8'), 'UTF-8'),
.mb_strtolower(mb_substr($m[0], 1, null, 'UTF-8'), 'UTF-8'),
mb_strtolower($core, 'UTF-8')
);
}
$out[] = $pre . $coreFmt . $suf;
$out[] = $pre.$coreFmt.$suf;
}
return implode(' ', $out);
@@ -163,7 +164,7 @@ class BadgeTextFormatter
'role',
'active_role',
'role_name',
fn ($r) => !empty($r['roles'])
fn ($r) => ! empty($r['roles'])
? (array_values(array_filter(array_map('trim', explode(',', (string) $r['roles']))))[0] ?? '')
: '',
'job_title',
@@ -181,7 +182,7 @@ class BadgeTextFormatter
return $this->norm($v);
}
} else {
if (!empty($info[$key])) {
if (! empty($info[$key])) {
$v = $this->norm((string) $info[$key]);
if ($v !== '') {
return $v;
@@ -196,7 +197,7 @@ class BadgeTextFormatter
public function firstExisting(array $paths): ?string
{
foreach ($paths as $path) {
if (!empty($path) && file_exists($path)) {
if (! empty($path) && file_exists($path)) {
return $path;
}
}
app/Services/Badges/BadgeUserLookupService.php
+25 -26
View File
@@ -9,8 +9,7 @@ class BadgeUserLookupService
{
public function __construct(
protected BadgeTextFormatter $formatter
) {
}
) {}
public function fetchStaffList(?string $schoolYear, array $selectedUserIds = []): array
{
@@ -25,7 +24,7 @@ class BadgeUserLookupService
])
->groupBy('users.id', 'users.firstname', 'users.lastname');
if (!empty($selectedUserIds)) {
if (! empty($selectedUserIds)) {
$query->whereIn('users.id', $selectedUserIds);
}
@@ -65,7 +64,7 @@ class BadgeUserLookupService
])
->where('tc.teacher_id', $userId);
if (!empty($schoolYear)) {
if (! empty($schoolYear)) {
$query->where('tc.school_year', $schoolYear);
}
@@ -75,12 +74,12 @@ class BadgeUserLookupService
->orderByDesc('tc.id')
->first();
if (!$row || empty($row->class_section_id)) {
if (! $row || empty($row->class_section_id)) {
return null;
}
return [
'class_section_id' => (int) $row->class_section_id,
'class_section_id' => (int) $row->class_section_id,
'class_section_name' => $row->class_section_name ?? null,
];
}
@@ -92,12 +91,12 @@ class BadgeUserLookupService
->where('id', $id)
->first();
if (!$u) {
if (! $u) {
return null;
}
$userId = (int) $u->user_id;
$fullname = trim(($u->firstname ?? '') . ' ' . ($u->lastname ?? ''));
$fullname = trim(($u->firstname ?? '').' '.($u->lastname ?? ''));
$schoolId = trim((string) ($u->school_id ?? ''));
if ($schoolId === '') {
$schoolId = trim((string) ($u->account_id ?? ''));
@@ -124,7 +123,7 @@ class BadgeUserLookupService
->select(['class_section_id', 'updated_at', 'id', 'position', 'school_year'])
->where('teacher_id', $userId);
if (!empty($schoolYear)) {
if (! empty($schoolYear)) {
$tcQuery->where('school_year', $schoolYear);
}
@@ -136,7 +135,7 @@ class BadgeUserLookupService
$position = strtolower(trim((string) ($assignment->position ?? '')));
$className = null;
if (!empty($classId)) {
if (! empty($classId)) {
$className = $this->resolveClassName((int) $classId);
}
@@ -144,7 +143,7 @@ class BadgeUserLookupService
$roleLabel = 'Teacher Assistant';
} elseif ($position === 'teacher' || $position === 'main') {
$roleLabel = 'Teacher';
} elseif (!empty($allRoles)) {
} elseif (! empty($allRoles)) {
$roleLabel = $allRoles[0];
} else {
$roleLabel = 'Staff';
@@ -161,27 +160,27 @@ class BadgeUserLookupService
]);
$jobTitle = '';
if (!empty($roleLabel) && !empty($className)) {
if (! empty($roleLabel) && ! empty($className)) {
$jobTitle = "{$roleLabel} - {$className}";
} elseif (!empty($roleLabel)) {
} elseif (! empty($roleLabel)) {
$jobTitle = $roleLabel;
} elseif (!empty($className)) {
} elseif (! empty($className)) {
$jobTitle = $className;
}
return [
'user_id' => $userId,
'name' => $fullname !== '' ? $fullname : 'STAFF',
'role' => $roleLabel,
'roles' => $rolesCsv,
'class_section_id' => $classId ? (int) $classId : null,
'class_section_name' => $className,
'job_title' => $jobTitle,
'school_name' => 'Al Rahma Sunday School',
'school_id' => $schoolId,
'school_logo' => $schoolLogo,
'isgl_logo' => $isglLogo,
'school_year' => $assignment->school_year ?? $schoolYear,
'user_id' => $userId,
'name' => $fullname !== '' ? $fullname : 'STAFF',
'role' => $roleLabel,
'roles' => $rolesCsv,
'class_section_id' => $classId ? (int) $classId : null,
'class_section_name' => $className,
'job_title' => $jobTitle,
'school_name' => 'Al Rahma Sunday School',
'school_id' => $schoolId,
'school_logo' => $schoolLogo,
'isgl_logo' => $isglLogo,
'school_year' => $assignment->school_year ?? $schoolYear,
];
}