This commit is contained in:
@@ -11,6 +11,7 @@ use App\Models\StudentClassModel;
|
||||
use App\Models\ClassSectionModel;
|
||||
use App\Models\AttendanceDataModel;
|
||||
use App\Models\AttendanceRecordModel;
|
||||
use App\Exceptions\SchoolYear\SchoolYearWriteConflictException;
|
||||
use App\Services\SemesterRangeService;
|
||||
|
||||
class ParentAttendanceReportController extends BaseController
|
||||
@@ -58,7 +59,8 @@ class ParentAttendanceReportController extends BaseController
|
||||
[$sundays, $defaultDate] = $this->computeSundays();
|
||||
|
||||
// Load upcoming reports for preview/edit (today and forward within this school year)
|
||||
$schoolYear = $this->currentSchoolYearName((string) ($this->configModel->getConfig('school_year') ?? ''));
|
||||
$schoolYearContext = $this->resolveSchoolYearContext();
|
||||
$schoolYear = $schoolYearContext->yearName();
|
||||
$todayYmd = local_date(utc_now(), 'Y-m-d');
|
||||
$previewRows = $this->reportModel->builder()
|
||||
->select('parent_attendance_reports.*, s.firstname, s.lastname')
|
||||
@@ -80,6 +82,8 @@ class ParentAttendanceReportController extends BaseController
|
||||
'defaultDate' => $defaultDate, // preselected date (upcoming Sunday)
|
||||
'myReports' => $previewRows,
|
||||
'cutoffThreshold' => $cutoffThreshold,
|
||||
'selectedYear' => $schoolYear,
|
||||
'isEditable' => ! $schoolYearContext->isReadonly(),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -91,6 +95,13 @@ class ParentAttendanceReportController extends BaseController
|
||||
return redirect()->to('/login');
|
||||
}
|
||||
|
||||
$schoolYearContext = $this->resolveSchoolYearContext();
|
||||
try {
|
||||
$this->assertSchoolYearWritable($schoolYearContext);
|
||||
} catch (SchoolYearWriteConflictException $e) {
|
||||
return redirect()->back()->withInput()->with('error', $e->getMessage());
|
||||
}
|
||||
|
||||
$post = $this->request->getPost();
|
||||
|
||||
$rules = [
|
||||
@@ -141,7 +152,7 @@ class ParentAttendanceReportController extends BaseController
|
||||
$dismissTime = $post['dismiss_time'] ?? null;
|
||||
$reasonRaw = $post['reason'] ?? null;
|
||||
$reason = is_string($reasonRaw) ? trim($reasonRaw) : null;
|
||||
$schoolYear = $this->currentSchoolYearName((string) ($this->configModel->getConfig('school_year') ?? ''));
|
||||
$schoolYear = $schoolYearContext->yearName();
|
||||
|
||||
// Enforce Sunday-only and future-or-today selection
|
||||
$todayCheck = new \DateTime('today');
|
||||
@@ -1508,6 +1519,13 @@ class ParentAttendanceReportController extends BaseController
|
||||
return redirect()->to('/login');
|
||||
}
|
||||
|
||||
$schoolYearContext = $this->resolveSchoolYearContext();
|
||||
try {
|
||||
$this->assertSchoolYearWritable($schoolYearContext);
|
||||
} catch (SchoolYearWriteConflictException $e) {
|
||||
return redirect()->back()->with('error', $e->getMessage());
|
||||
}
|
||||
|
||||
$id = (int) ($this->request->getPost('id') ?? 0);
|
||||
if ($id <= 0) {
|
||||
return redirect()->back()->with('error', 'Invalid report.');
|
||||
@@ -1517,6 +1535,9 @@ class ParentAttendanceReportController extends BaseController
|
||||
if (!$row || (int)($row['parent_id'] ?? 0) !== (int)$parentId) {
|
||||
return redirect()->back()->with('error', 'Report not found.');
|
||||
}
|
||||
if ((string) ($row['school_year'] ?? '') !== $schoolYearContext->yearName()) {
|
||||
return redirect()->back()->with('error', 'Report not found for the selected school year.');
|
||||
}
|
||||
|
||||
// Only allow editing for 'new' status entries
|
||||
$status = (string) ($row['status'] ?? '');
|
||||
|
||||
@@ -1064,6 +1064,10 @@ class ParentController extends BaseController
|
||||
|
||||
$schoolIdService = new SchoolIdService();
|
||||
$parentId = session()->get('user_id');
|
||||
$schoolYearContext = $this->resolveSchoolYearContext();
|
||||
$this->assertSchoolYearWritable($schoolYearContext);
|
||||
$selectedSchoolYear = $schoolYearContext->yearName();
|
||||
$this->schoolYear = $selectedSchoolYear;
|
||||
|
||||
if (!$this->lastDayOfRegistration || !strtotime($this->lastDayOfRegistration)) {
|
||||
throw new \Exception('Invalid enrollment deadline date.');
|
||||
@@ -1270,7 +1274,9 @@ class ParentController extends BaseController
|
||||
|
||||
private function getRegistrationData(int $parentId): array
|
||||
{
|
||||
$enrollments = $this->getEnrollmentsByParent($parentId, $this->schoolYear);
|
||||
$schoolYearContext = $this->resolveSchoolYearContext();
|
||||
$selectedSchoolYear = $schoolYearContext->yearName();
|
||||
$enrollments = $this->getEnrollmentsByParent($parentId, $selectedSchoolYear);
|
||||
|
||||
$enrollmentMap = [];
|
||||
if (!empty($enrollments)) {
|
||||
@@ -1306,6 +1312,8 @@ class ParentController extends BaseController
|
||||
'maxChilds' => $this->maxChilds,
|
||||
'maxEmergency' => $this->maxEmergency,
|
||||
'enrollments' => $enrollments,
|
||||
'selectedYear' => $selectedSchoolYear,
|
||||
'isEditable' => ! $schoolYearContext->isReadonly(),
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1636,6 +1644,9 @@ $existing = $this->studentModel
|
||||
|
||||
public function editEmergencyContact($id = null)
|
||||
{
|
||||
$schoolYearContext = $this->resolveSchoolYearContext();
|
||||
$this->assertSchoolYearWritable($schoolYearContext);
|
||||
|
||||
if ($id === null) {
|
||||
$parentId = session()->get('user_id');
|
||||
$contacts = $this->emergencyContactModel->where('parent_id', $parentId)->findAll();
|
||||
@@ -1681,8 +1692,8 @@ $existing = $this->studentModel
|
||||
}
|
||||
|
||||
$parentId = session()->get('user_id');
|
||||
$semester = session()->get('active_semester');
|
||||
$schoolYear = session()->get('active_school_year');
|
||||
$semester = $this->semester;
|
||||
$schoolYear = $schoolYearContext->yearName();
|
||||
|
||||
$this->saveEmergencyContact($parentId, $semester, $schoolYear, [
|
||||
'first_name' => $this->request->getPost('emergency_first_name'),
|
||||
@@ -1699,6 +1710,9 @@ $existing = $this->studentModel
|
||||
|
||||
public function editStudent($id)
|
||||
{
|
||||
$schoolYearContext = $this->resolveSchoolYearContext();
|
||||
$this->assertSchoolYearWritable($schoolYearContext);
|
||||
$this->schoolYear = $schoolYearContext->yearName();
|
||||
$schoolIdService = new \App\Services\SchoolIdService();
|
||||
|
||||
if (strtolower($this->request->getMethod()) !== 'post') {
|
||||
@@ -1752,6 +1766,8 @@ $existing = $this->studentModel
|
||||
|
||||
public function deleteStudent($id)
|
||||
{
|
||||
$this->assertSchoolYearWritable($this->resolveSchoolYearContext());
|
||||
|
||||
if (strtolower($this->request->getMethod()) !== 'post') {
|
||||
return redirect()->back()->with('error', 'Invalid request method.');
|
||||
}
|
||||
|
||||
@@ -60,6 +60,8 @@ final class SchoolYearSelectionController extends BaseController
|
||||
return $fallback;
|
||||
}
|
||||
|
||||
$path = $this->normalizeSchoolYearReturnPath($path);
|
||||
|
||||
$query = [];
|
||||
if (! empty($parts['query'])) {
|
||||
parse_str((string) $parts['query'], $query);
|
||||
@@ -73,6 +75,15 @@ final class SchoolYearSelectionController extends BaseController
|
||||
return $path . ($cleanQuery !== '' ? '?' . $cleanQuery : '');
|
||||
}
|
||||
|
||||
private function normalizeSchoolYearReturnPath(string $path): string
|
||||
{
|
||||
if (preg_match('#^/(parent|teacher|admin)/progress/view/\d+$#', $path, $matches) === 1) {
|
||||
return '/' . $matches[1] . '/progress';
|
||||
}
|
||||
|
||||
return $path;
|
||||
}
|
||||
|
||||
private function dashboardRoute(): string
|
||||
{
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user