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

fix gitlab tests

Browse Source
This commit is contained in:
root
2026-06-09 02:32:58 -04:00
parent 20a0b6c4e5
commit 6def9993da
1489 changed files with 10449 additions and 11356 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Api/Attendance/AdminAttendanceApiController.php
+3 -3
View File
@@ -23,8 +23,8 @@ class AdminAttendanceApiController extends Controller
{
return new DailyAttendanceResource(
$this->queryService->buildDailyAttendanceData(
(string) $request->query('semester', $this->attendanceService->currentSemester()),
(string) $request->query('school_year', $this->attendanceService->currentSchoolYear())
(string)$request->query('semester', $this->attendanceService->currentSemester()),
(string)$request->query('school_year', $this->attendanceService->currentSchoolYear())
)
);
}
@@ -60,4 +60,4 @@ class AdminAttendanceApiController extends Controller
return response()->json(['message' => $e->getMessage()], 422);
}
}
}
}
app/Http/Controllers/Api/Attendance/AttendanceCommentTemplateController.php
+3 -2
View File
@@ -14,7 +14,8 @@ class AttendanceCommentTemplateController extends Controller
public function __construct(
protected AttendanceCommentTemplateService $service,
protected ApplicationUrlService $urls,
) {}
) {
}
public function bootstrapUrls(): JsonResponse
{
@@ -74,7 +75,7 @@ class AttendanceCommentTemplateController extends Controller
}
$data = $validator->validated();
if (! array_key_exists('is_active', $data)) {
if (!array_key_exists('is_active', $data)) {
$data['is_active'] = true;
}
app/Http/Controllers/Api/Attendance/EarlyDismissalsController.php
+42 -41
View File
@@ -9,6 +9,7 @@ use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Validator;
use Symfony\Component\HttpFoundation\Response;
@@ -26,7 +27,7 @@ class EarlyDismissalsController extends BaseApiController
public function index(Request $request): JsonResponse
{
$schoolYear = $request->query('school_year');
$semester = $request->query('semester');
$semester = $request->query('semester');
$query = DB::table('parent_attendance_reports as par')
->select([
@@ -61,15 +62,15 @@ class EarlyDismissalsController extends BaseApiController
foreach ($rows as $row) {
$date = $row->report_date ?? 'Unknown';
$groups[$date][] = [
'id' => $row->id,
'firstname' => $row->firstname,
'lastname' => $row->lastname,
'id' => $row->id,
'firstname' => $row->firstname,
'lastname' => $row->lastname,
'class_section_name' => $row->class_section_name,
'dismiss_time' => $row->dismiss_time,
'reason' => $row->reason,
'status' => $row->status,
'school_year' => $row->school_year,
'semester' => $row->semester,
'dismiss_time' => $row->dismiss_time,
'reason' => $row->reason,
'status' => $row->status,
'school_year' => $row->school_year,
'semester' => $row->semester,
];
}
@@ -81,13 +82,13 @@ class EarlyDismissalsController extends BaseApiController
$signatureByDate = [];
foreach ($signatures as $sig) {
$signatureByDate[(string) $sig->report_date] = [
'filename' => $sig->filename,
'filename' => $sig->filename,
'original_name' => $sig->original_name,
];
}
return $this->success([
'groups' => $groups,
'groups' => $groups,
'signatureByDate' => $signatureByDate,
]);
}
@@ -107,7 +108,7 @@ class EarlyDismissalsController extends BaseApiController
])
->leftJoin('student_class as sc', function ($j) {
$j->on('sc.student_id', '=', 's.id')
->where('sc.school_year', '=', Configuration::getConfigValueByKey('school_year'));
->where('sc.school_year', '=', Configuration::getConfigValueByKey('school_year'));
})
->leftJoin('classSection as cs', 'cs.class_section_id', '=', 'sc.class_section_id')
->where('s.is_active', 1)
@@ -124,10 +125,10 @@ class EarlyDismissalsController extends BaseApiController
public function store(Request $request): JsonResponse
{
$validator = Validator::make($request->all(), [
'student_id' => ['required', 'integer', 'min:1', 'exists:students,id'],
'date' => ['required', 'date_format:Y-m-d'],
'student_id' => ['required', 'integer', 'min:1', 'exists:students,id'],
'date' => ['required', 'date_format:Y-m-d'],
'dismiss_time' => ['required', 'date_format:H:i'],
'reason' => ['nullable', 'string', 'max:2000'],
'reason' => ['nullable', 'string', 'max:2000'],
]);
if ($validator->fails()) {
@@ -137,7 +138,7 @@ class EarlyDismissalsController extends BaseApiController
$data = $validator->validated();
$schoolYear = (string) Configuration::getConfigValueByKey('school_year');
$semester = (string) Configuration::getConfigValueByKey('semester');
$semester = (string) Configuration::getConfigValueByKey('semester');
$sc = DB::table('student_class')
->where('student_id', $data['student_id'])
@@ -152,18 +153,18 @@ class EarlyDismissalsController extends BaseApiController
->value('parent_id') ?? Auth::id();
DB::table('parent_attendance_reports')->insert([
'parent_id' => $parentId ?? Auth::id(),
'student_id' => $data['student_id'],
'parent_id' => $parentId ?? Auth::id(),
'student_id' => $data['student_id'],
'class_section_id' => $classSectionId,
'report_date' => $data['date'],
'type' => 'early_dismissal',
'dismiss_time' => $data['dismiss_time'],
'reason' => $data['reason'] ?? null,
'semester' => $semester,
'school_year' => $schoolYear,
'status' => 'new',
'created_at' => now(),
'updated_at' => now(),
'report_date' => $data['date'],
'type' => 'early_dismissal',
'dismiss_time' => $data['dismiss_time'],
'reason' => $data['reason'] ?? null,
'semester' => $semester,
'school_year' => $schoolYear,
'status' => 'new',
'created_at' => now(),
'updated_at' => now(),
]);
return $this->success([], 'Early dismissal saved.', Response::HTTP_CREATED);
@@ -176,9 +177,9 @@ class EarlyDismissalsController extends BaseApiController
public function uploadSignature(Request $request): JsonResponse
{
$validator = Validator::make($request->all(), [
'report_date' => ['required', 'date_format:Y-m-d'],
'school_year' => ['nullable', 'string', 'max:16'],
'semester' => ['nullable', 'string', 'max:32'],
'report_date' => ['required', 'date_format:Y-m-d'],
'school_year' => ['nullable', 'string', 'max:16'],
'semester' => ['nullable', 'string', 'max:32'],
'signature_file' => ['required', 'file', 'mimes:jpg,jpeg,png,webp,gif,pdf', 'max:5120'],
]);
@@ -186,13 +187,13 @@ class EarlyDismissalsController extends BaseApiController
return $this->respondValidationError($validator->errors()->toArray());
}
$file = $request->file('signature_file');
$file = $request->file('signature_file');
$reportDate = $request->input('report_date');
$schoolYear = $request->input('school_year') ?: (string) Configuration::getConfigValueByKey('school_year');
$semester = $request->input('semester') ?: (string) Configuration::getConfigValueByKey('semester');
$semester = $request->input('semester') ?: (string) Configuration::getConfigValueByKey('semester');
$dir = storage_path('uploads/early_dismissal_signatures');
if (! is_dir($dir)) {
$dir = storage_path('uploads/early_dismissal_signatures');
if (!is_dir($dir)) {
mkdir($dir, 0755, true);
}
@@ -202,21 +203,21 @@ class EarlyDismissalsController extends BaseApiController
->where('semester', $semester)
->first();
if ($existing?->filename && file_exists($dir.'/'.$existing->filename)) {
unlink($dir.'/'.$existing->filename);
if ($existing?->filename && file_exists($dir . '/' . $existing->filename)) {
unlink($dir . '/' . $existing->filename);
}
$filename = uniqid('sig_', true).'.'.$file->getClientOriginalExtension();
$filename = uniqid('sig_', true) . '.' . $file->getClientOriginalExtension();
$file->move($dir, $filename);
EarlyDismissalSignature::updateOrCreate(
['report_date' => $reportDate, 'school_year' => $schoolYear, 'semester' => $semester],
[
'filename' => $filename,
'filename' => $filename,
'original_name' => $file->getClientOriginalName(),
'mime_type' => $file->getClientMimeType(),
'file_size' => $file->getSize(),
'uploaded_by' => Auth::id(),
'mime_type' => $file->getClientMimeType(),
'file_size' => $file->getSize(),
'uploaded_by' => Auth::id(),
]
);
app/Http/Controllers/Api/Attendance/LateSlipLogsController.php
+4 -5
View File
@@ -42,7 +42,7 @@ class LateSlipLogsController extends BaseApiController
public function show(int $id): JsonResponse
{
$log = $this->queryService->find($id);
if (! $log) {
if (!$log) {
return $this->error('Late slip log not found.', Response::HTTP_NOT_FOUND);
}
@@ -56,7 +56,7 @@ class LateSlipLogsController extends BaseApiController
public function destroy(int $id): JsonResponse
{
$log = $this->queryService->find($id);
if (! $log) {
if (!$log) {
return $this->error('Late slip log not found.', Response::HTTP_NOT_FOUND);
}
@@ -65,12 +65,11 @@ class LateSlipLogsController extends BaseApiController
try {
$deleted = $this->commandService->delete($log);
} catch (\Throwable $e) {
Log::error('Late slip log delete failed: '.$e->getMessage());
Log::error('Late slip log delete failed: ' . $e->getMessage());
return $this->error('Unable to delete late slip log.', Response::HTTP_INTERNAL_SERVER_ERROR);
}
if (! $deleted) {
if (!$deleted) {
return $this->error('Unable to delete late slip log.', Response::HTTP_INTERNAL_SERVER_ERROR);
}
app/Http/Controllers/Api/Attendance/StaffAttendanceApiController.php
+9 -9
View File
@@ -23,8 +23,8 @@ class StaffAttendanceApiController extends Controller
{
return new StaffMonthResource(
$this->staffAttendanceService->monthData(
(string) $request->query('semester'),
(string) $request->query('school_year')
(string)$request->query('semester'),
(string)$request->query('school_year')
)
);
}
@@ -33,9 +33,9 @@ class StaffAttendanceApiController extends Controller
{
return new AdminAttendanceResource(
$this->staffAttendanceService->adminsAttendanceData(
(string) $request->query('date'),
(string) $request->query('semester'),
(string) $request->query('school_year')
(string)$request->query('date'),
(string)$request->query('semester'),
(string)$request->query('school_year')
)
);
}
@@ -75,9 +75,9 @@ class StaffAttendanceApiController extends Controller
public function monthCsv(Request $request): StreamedResponse
{
return $this->staffAttendanceService->monthCsv(
(string) $request->query('semester'),
(string) $request->query('school_year'),
(string) $request->query('scope')
(string)$request->query('semester'),
(string)$request->query('school_year'),
(string)$request->query('scope')
);
}
}
}
app/Http/Controllers/Api/Attendance/TeacherAttendanceApiController.php
+9 -6
View File
@@ -21,10 +21,10 @@ class TeacherAttendanceApiController extends Controller
public function grid(Request $request): TeacherGridResource
{
$semester = (string) ($request->query('semester') ?: $this->attendanceService->currentSemester());
$schoolYear = (string) ($request->query('school_year') ?: $this->attendanceService->currentSchoolYear());
$date = (string) ($request->query('date') ?: now()->toDateString());
$sectionCode = (int) $request->query('class_section_id', 0);
$semester = (string)($request->query('semester') ?: $this->attendanceService->currentSemester());
$schoolYear = (string)($request->query('school_year') ?: $this->attendanceService->currentSchoolYear());
$date = (string)($request->query('date') ?: now()->toDateString());
$sectionCode = (int)$request->query('class_section_id', 0);
return new TeacherGridResource(
$this->queryService->teacherGrid($semester, $schoolYear, $date, $sectionCode)
@@ -42,7 +42,7 @@ class TeacherAttendanceApiController extends Controller
return new TeacherAttendanceFormResource(
$this->queryService->teacherAttendanceFormData(
$guard,
(int) $request->query('class_section_id', 0)
(int)$request->query('class_section_id', 0)
)
);
} catch (Throwable $e) {
@@ -66,6 +66,9 @@ class TeacherAttendanceApiController extends Controller
}
}
/**
* @return int|JsonResponse
*/
private function authenticatedUserIdOrUnauthorized(): int|JsonResponse
{
$userId = (int) (auth()->id() ?? 0);
@@ -75,4 +78,4 @@ class TeacherAttendanceApiController extends Controller
return $userId;
}
}
}