Skip to content

C
Clubphp
Commit 772a86ba authored by Fares's avatar Fares
Browse files
Options

fix(sa): fix group auto-creation and old() array conversion errors 

- Remove non-existent facility_unit_id from sa_groups insert in
  enrollByCoach, add required code column with auto-generated value
- Guard schedule copy when no source group exists
- Fix old() helper usage for array fields (additional_coaches) by
  reading directly from session _old_input instead of old() which
  only returns strings
Co-Authored-By: 's avatarClaude Opus 4.6 <noreply@anthropic.com>
parent 140ee3da
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
app/Modules/SportsActivity/Services/EnrollmentService.php
View file @ 772a86ba
...@@ -455,37 +455,33 @@ final class EnrollmentService ...@@ -455,37 +455,33 @@ final class EnrollmentService
} }
// No available group — auto-create one // No available group — auto-create one
$coach = $db->selectOne("SELECT full_name_ar FROM sa_coaches WHERE id = ?", [$coachId]);
$coachName = $coach['full_name_ar'] ?? 'مدرب';
$newName = $program['name_ar'] . ' - ' . $coachName;
$newCode = 'GRP-' . strtoupper(substr(uniqid(), -6));
$sourceGroup = $db->selectOne( $sourceGroup = $db->selectOne(
"SELECT * FROM sa_groups WHERE program_id = ? AND is_archived = 0 ORDER BY id DESC LIMIT 1", "SELECT * FROM sa_groups WHERE program_id = ? AND is_archived = 0 ORDER BY id DESC LIMIT 1",
[$programId] [$programId]
); );
if (!$sourceGroup) {
return ['success' => false, 'error' => 'لا توجد مجموعات مرجعية لإنشاء مجموعة جديدة'];
}
$coach = $db->selectOne("SELECT full_name_ar FROM sa_coaches WHERE id = ?", [$coachId]);
$coachName = $coach['full_name_ar'] ?? 'مدرب';
$newName = $program['name_ar'] . ' - ' . $coachName;
$employeeId = (int) (App::getInstance()->session()->get('employee_id') ?? 0); $employeeId = (int) (App::getInstance()->session()->get('employee_id') ?? 0);
$db->beginTransaction(); $db->beginTransaction();
try { try {
$newGroupId = $db->insert('sa_groups', [ $newGroupId = $db->insert('sa_groups', [
'code' => $newCode,
'name_ar' => $newName, 'name_ar' => $newName,
'program_id' => $programId, 'program_id' => $programId,
'facility_unit_id' => $sourceGroup['facility_unit_id'],
'coach_id' => $coachId, 'coach_id' => $coachId,
'monthly_fee_member' => 0, 'monthly_fee_member' => 0,
'monthly_fee_nonmember' => 0, 'monthly_fee_nonmember' => 0,
'min_age' => $sourceGroup['min_age'], 'min_age' => $sourceGroup['min_age'] ?? null,
'max_age' => $sourceGroup['max_age'], 'max_age' => $sourceGroup['max_age'] ?? null,
'max_capacity' => (int) ($program['max_capacity'] ?? 20), 'max_capacity' => (int) ($program['max_capacity'] ?? 20),
'current_count' => 0, 'current_count' => 0,
'is_full' => 0, 'is_full' => 0,
'status' => 'active', 'status' => 'active',
'branch_id' => $sourceGroup['branch_id'] ?? null,
'created_by' => $employeeId, 'created_by' => $employeeId,
'created_at' => date('Y-m-d H:i:s'), 'created_at' => date('Y-m-d H:i:s'),
'updated_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s'),
...@@ -499,22 +495,24 @@ final class EnrollmentService ...@@ -499,22 +495,24 @@ final class EnrollmentService
'created_at' => date('Y-m-d H:i:s'), 'created_at' => date('Y-m-d H:i:s'),
]); ]);
// Copy schedule from source // Copy schedule from source if available
$schedules = $db->select( if ($sourceGroup) {
"SELECT * FROM sa_group_schedule WHERE group_id = ? AND is_active = 1", $schedules = $db->select(
[(int) $sourceGroup['id']] "SELECT * FROM sa_group_schedule WHERE group_id = ? AND is_active = 1",
); [(int) $sourceGroup['id']]
foreach ($schedules as $sch) { );
$db->insert('sa_group_schedule', [ foreach ($schedules as $sch) {
'group_id' => $newGroupId, $db->insert('sa_group_schedule', [
'facility_unit_id' => $sch['facility_unit_id'], 'group_id' => $newGroupId,
'day_of_week' => $sch['day_of_week'], 'facility_unit_id' => $sch['facility_unit_id'],
'start_time' => $sch['start_time'], 'day_of_week' => $sch['day_of_week'],
'end_time' => $sch['end_time'], 'start_time' => $sch['start_time'],
'is_active' => 1, 'end_time' => $sch['end_time'],
'created_at' => date('Y-m-d H:i:s'), 'is_active' => 1,
'updated_at' => date('Y-m-d H:i:s'), 'created_at' => date('Y-m-d H:i:s'),
]); 'updated_at' => date('Y-m-d H:i:s'),
]);
}
} }
$db->commit(); $db->commit();
......
app/Modules/SportsActivity/Views/groups/create.php
View file @ 772a86ba
...@@ -66,7 +66,8 @@ ...@@ -66,7 +66,8 @@
<label class="form-label">مدربين إضافيين</label> <label class="form-label">مدربين إضافيين</label>
<div id="additional-coaches" style="display:flex;flex-wrap:wrap;gap:8px;margin-top:6px;"> <div id="additional-coaches" style="display:flex;flex-wrap:wrap;gap:8px;margin-top:6px;">
<?php <?php
$oldAdditional = old('additional_coaches', []); $oldInput = \App\Core\App::getInstance()->session()->get('_old_input', []);
$oldAdditional = $oldInput['additional_coaches'] ?? [];
if (!is_array($oldAdditional)) $oldAdditional = []; if (!is_array($oldAdditional)) $oldAdditional = [];
?> ?>
<?php foreach ($coaches as $c): ?> <?php foreach ($coaches as $c): ?>
......
app/Modules/SportsActivity/Views/groups/edit.php
View file @ 772a86ba
...@@ -66,7 +66,8 @@ ...@@ -66,7 +66,8 @@
<label class="form-label">مدربين إضافيين</label> <label class="form-label">مدربين إضافيين</label>
<div id="additional-coaches" style="display:flex;flex-wrap:wrap;gap:8px;margin-top:6px;"> <div id="additional-coaches" style="display:flex;flex-wrap:wrap;gap:8px;margin-top:6px;">
<?php <?php
$oldAdditional = old('additional_coaches', $groupCoachIds ?? []); $oldInput = \App\Core\App::getInstance()->session()->get('_old_input', []);
$oldAdditional = $oldInput['additional_coaches'] ?? ($groupCoachIds ?? []);
if (!is_array($oldAdditional)) $oldAdditional = []; if (!is_array($oldAdditional)) $oldAdditional = [];
?> ?>
<?php foreach ($coaches as $c): ?> <?php foreach ($coaches as $c): ?>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment