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

security fix and fix parent pages
API CI/CD / Validate (composer + pint) (push) Successful in 3m7s
Details
API CI/CD / Test (PHPUnit) (push) Failing after 5m46s
Details
API CI/CD / Build frontend assets (push) Successful in 1m2s
Details
API CI/CD / Security audit (push) Failing after 49s
Details
API CI/CD / Deploy to shared hosting (PHP) (push) Has been skipped
Details

Browse Source
This commit is contained in:
root
2026-07-06 02:14:16 -04:00
parent 39228168c8
commit 90f9857b06
43 changed files with 4323 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/ClassProgress/ClassProgressGroupCollection.php
+19 -2
View File
@@ -26,20 +26,37 @@ class ClassProgressGroupCollection extends ResourceCollection
$key = $sectionId.'|'.$weekStart;
if (! isset($groups[$key])) {
$reportId = (int) $report->id;
$groups[$key] = [
'id' => $reportId,
'report_id' => $reportId,
'view_url' => url('/api/v1/class-progress/'.$reportId),
'parent_view_url' => url('/api/v1/parents/progress/'.$reportId),
'week_start' => $weekStart,
'week_end' => $report->week_end?->format('Y-m-d'),
'class_section_id' => $sectionId,
'class_section_name' => $report->classSection?->class_section_name ?? '',
'reports' => [],
'weekly_reports' => [],
'reports_array' => [],
'report_list' => [],
'subjects' => [],
];
}
$groups[$key]['reports'][$report->subject] = (new ClassProgressReportResource($report))->toArray(request());
$reportArray = (new ClassProgressReportResource($report))->toArray(request());
$groups[$key]['reports'][$report->subject] = $reportArray;
$groups[$key]['weekly_reports'][] = $reportArray;
$groups[$key]['reports_array'][] = $reportArray;
$groups[$key]['report_list'][] = $reportArray;
$groups[$key]['subjects'][] = $report->subject;
}
$items = ProgressGroupResource::collection(collect(array_values($groups)));
return [
'items' => ProgressGroupResource::collection(collect(array_values($groups))),
'items' => $items,
'groups' => $items,
'pagination' => [
'current_page' => $paginator->currentPage(),
'per_page' => $paginator->perPage(),