Skip to content

C
Clubphp
Commit 76b4b3e5 authored by Mahmoud Aglan's avatar Mahmoud Aglan
Browse files
Options

Fix references to non-existent 'disciplines' table — use 'sport_disciplines' 

All JOIN and SELECT queries referencing 'disciplines' updated to use
the actual table name 'sport_disciplines' in Tournaments and PlayerAffairs modules.
Co-Authored-By: 's avatarClaude Opus 4.6 <noreply@anthropic.com>
parent 2d872870
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
app/Modules/PlayerAffairs/Controllers/EvaluationController.php
View file @ 76b4b3e5
......@@ -36,7 +36,7 @@ class EvaluationController extends Controller
// Load disciplines for filter dropdown
$db = App::getInstance()->db();
$disciplines = $db->select("SELECT id, name_ar FROM disciplines WHERE is_active = 1 ORDER BY name_ar ASC", []);
$disciplines = $db->select("SELECT id, name_ar FROM sport_disciplines WHERE is_active = 1 ORDER BY name_ar ASC", []);
return $this->view('PlayerAffairs.Views.evaluations', [
'evaluations' => $result['data'],
......@@ -66,13 +66,13 @@ class EvaluationController extends Controller
$discipline = null;
$criteria = [];
if ($disciplineId > 0) {
$discipline = $db->selectOne("SELECT id, name_ar FROM disciplines WHERE id = ?", [$disciplineId]);
$discipline = $db->selectOne("SELECT id, name_ar FROM sport_disciplines WHERE id = ?", [$disciplineId]);
$criteria = EvaluationCriterion::getForDiscipline($disciplineId);
}
// Load players and disciplines for dropdowns
$players = $db->select("SELECT id, full_name_ar FROM players WHERE is_archived = 0 ORDER BY full_name_ar ASC", []);
$disciplines = $db->select("SELECT id, name_ar FROM disciplines WHERE is_active = 1 ORDER BY name_ar ASC", []);
$disciplines = $db->select("SELECT id, name_ar FROM sport_disciplines WHERE is_active = 1 ORDER BY name_ar ASC", []);
$coaches = $db->select("SELECT id, full_name_ar FROM coaches WHERE is_active = 1 ORDER BY full_name_ar ASC", []);
return $this->view('PlayerAffairs.Views.evaluation_create', [
......@@ -146,7 +146,7 @@ class EvaluationController extends Controller
approver.full_name_ar AS approver_name
FROM player_evaluations pe
LEFT JOIN players p ON p.id = pe.player_id
LEFT JOIN disciplines d ON d.id = pe.discipline_id
LEFT JOIN sport_disciplines d ON d.id = pe.discipline_id
LEFT JOIN coaches c ON c.id = pe.evaluator_coach_id
LEFT JOIN employees approver ON approver.id = pe.approved_by
WHERE pe.id = ?",
......
app/Modules/PlayerAffairs/Models/EvaluationCriterion.php
View file @ 76b4b3e5
......@@ -48,7 +48,7 @@ class EvaluationCriterion extends Model
return $db->select(
"SELECT ec.*, d.name_ar AS discipline_name
FROM evaluation_criteria ec
LEFT JOIN disciplines d ON d.id = ec.discipline_id
LEFT JOIN sport_disciplines d ON d.id = ec.discipline_id
WHERE ec.is_active = 1
ORDER BY ec.discipline_id ASC, ec.sort_order ASC, ec.id ASC",
[]
......
app/Modules/PlayerAffairs/Models/PlayerEvaluation.php
View file @ 76b4b3e5
......@@ -43,7 +43,7 @@ class PlayerEvaluation extends Model
return $db->select(
"SELECT pe.*, d.name_ar AS discipline_name, c.full_name_ar AS coach_name
FROM player_evaluations pe
LEFT JOIN disciplines d ON d.id = pe.discipline_id
LEFT JOIN sport_disciplines d ON d.id = pe.discipline_id
LEFT JOIN coaches c ON c.id = pe.evaluator_coach_id
WHERE pe.player_id = ?
ORDER BY pe.evaluation_date DESC, pe.id DESC",
......@@ -61,7 +61,7 @@ class PlayerEvaluation extends Model
"SELECT pe.*, p.full_name_ar AS player_name, d.name_ar AS discipline_name
FROM player_evaluations pe
LEFT JOIN players p ON p.id = pe.player_id
LEFT JOIN disciplines d ON d.id = pe.discipline_id
LEFT JOIN sport_disciplines d ON d.id = pe.discipline_id
WHERE pe.evaluator_coach_id = ?
ORDER BY pe.evaluation_date DESC, pe.id DESC",
[$coachId]
......@@ -189,7 +189,7 @@ class PlayerEvaluation extends Model
c.full_name_ar AS coach_name
FROM player_evaluations pe
LEFT JOIN players p ON p.id = pe.player_id
LEFT JOIN disciplines d ON d.id = pe.discipline_id
LEFT JOIN sport_disciplines d ON d.id = pe.discipline_id
LEFT JOIN coaches c ON c.id = pe.evaluator_coach_id
WHERE {$whereClause}
ORDER BY pe.evaluation_date DESC, pe.id DESC
......
app/Modules/Tournaments/Controllers/TournamentController.php
View file @ 76b4b3e5
......@@ -33,7 +33,7 @@ class TournamentController extends Controller
$result = Tournament::search($filters, 25, $page);
$db = App::getInstance()->db();
$disciplines = $db->select("SELECT id, name_ar FROM disciplines WHERE is_active = 1 ORDER BY name_ar ASC", []);
$disciplines = $db->select("SELECT id, name_ar FROM sport_disciplines WHERE is_active = 1 ORDER BY name_ar ASC", []);
return $this->view('Tournaments.Views.index', [
'tournaments' => $result['data'],
......@@ -51,7 +51,7 @@ class TournamentController extends Controller
$this->authorize('tournament.manage');
$db = App::getInstance()->db();
$disciplines = $db->select("SELECT id, name_ar FROM disciplines WHERE is_active = 1 ORDER BY name_ar ASC", []);
$disciplines = $db->select("SELECT id, name_ar FROM sport_disciplines WHERE is_active = 1 ORDER BY name_ar ASC", []);
$facilities = $db->select("SELECT id, name_ar FROM facilities WHERE is_active = 1 ORDER BY name_ar ASC", []);
return $this->view('Tournaments.Views.create', [
......@@ -114,7 +114,7 @@ class TournamentController extends Controller
$tournament = $db->selectOne(
"SELECT t.*, d.name_ar AS discipline_name, f.name_ar AS facility_name
FROM tournaments t
LEFT JOIN disciplines d ON d.id = t.discipline_id
LEFT JOIN sport_disciplines d ON d.id = t.discipline_id
LEFT JOIN facilities f ON f.id = t.facility_id
WHERE t.id = ?",
[$id]
......@@ -148,7 +148,7 @@ class TournamentController extends Controller
$tournament = Tournament::findOrFail($id);
$db = App::getInstance()->db();
$disciplines = $db->select("SELECT id, name_ar FROM disciplines WHERE is_active = 1 ORDER BY name_ar ASC", []);
$disciplines = $db->select("SELECT id, name_ar FROM sport_disciplines WHERE is_active = 1 ORDER BY name_ar ASC", []);
$facilities = $db->select("SELECT id, name_ar FROM facilities WHERE is_active = 1 ORDER BY name_ar ASC", []);
return $this->view('Tournaments.Views.create', [
......
app/Modules/Tournaments/Models/Tournament.php
View file @ 76b4b3e5
......@@ -149,7 +149,7 @@ class Tournament extends Model
$sql = "SELECT t.*, d.name_ar AS discipline_name
FROM tournaments t
LEFT JOIN disciplines d ON d.id = t.discipline_id
LEFT JOIN sport_disciplines d ON d.id = t.discipline_id
WHERE {$whereClause}
ORDER BY t.start_date DESC, t.id DESC
LIMIT {$perPage} OFFSET {$offset}";
......@@ -176,7 +176,7 @@ class Tournament extends Model
return $db->select(
"SELECT t.*, d.name_ar AS discipline_name
FROM tournaments t
LEFT JOIN disciplines d ON d.id = t.discipline_id
LEFT JOIN sport_disciplines d ON d.id = t.discipline_id
WHERE t.status = 'in_progress'
ORDER BY t.start_date ASC",
[]
......@@ -192,7 +192,7 @@ class Tournament extends Model
return $db->select(
"SELECT t.*, d.name_ar AS discipline_name
FROM tournaments t
LEFT JOIN disciplines d ON d.id = t.discipline_id
LEFT JOIN sport_disciplines d ON d.id = t.discipline_id
WHERE t.status IN ('registration_open', 'registration_closed')
AND t.start_date >= CURDATE()
ORDER BY t.start_date ASC",
......
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