sampanna/score_and_win
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

country + status added and other changes

Browse Source
This commit is contained in:
sampanna
2026-06-10 18:02:17 +05:45
parent 5a085148b4
commit a551ca538e
16 changed files with 1386 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/HomeController.php
+45 -24
View File
@@ -2,26 +2,28 @@
namespace App\Http\Controllers;
use App\Models\Country;
use App\Models\Registration;
use Carbon\Carbon;
use Illuminate\Http\Request;
class HomeController extends Controller
{
public function index()
public function index(Request $request)
{
$user = auth()->user();
return match ($user->role) {
'admin' => $this->adminDashboard(),
'counselor' => $this->counselorDashboard(),
'admin' => $this->adminDashboard($request),
'counselor' => $this->counselorDashboard($request),
default => abort(403, 'Unauthorized action.'),
};
}
public function adminDashboard()
public function adminDashboard(Request $request)
{
$today = Carbon::today();
$today = Carbon::today();
$search = trim($request->input('search', ''));
$query = Registration::with([
'sessions' => function ($q) use ($today) {
@@ -30,16 +32,21 @@ class HomeController extends Controller
])
->whereHas('sessions', function ($q) use ($today) {
$q->whereDate('play_date', $today);
})
->orderBy('created_at', 'desc')
->paginate(10);
});
if ($search) {
$query->where(function ($q) use ($search) {
$q->where('name', 'like', "%{$search}%")
->orWhere('phone', 'like', "%{$search}%")
->orWhere('email', 'like', "%{$search}%");
});
}
$query = $query->orderBy('created_at', 'desc')->paginate(10)->withQueryString();
$registrations = $query->getCollection()->map(function ($student) {
$todaySession = $student->sessions->first();
$todayGoals = null;
$todayGoals = null;
if ($todaySession) {
$todayGoals = $todaySession->shots
->sortBy('shot_number')
@@ -47,7 +54,6 @@ class HomeController extends Controller
->values()
->toArray();
}
return [
'id' => $student->id,
'name' => $student->name,
@@ -56,41 +62,51 @@ class HomeController extends Controller
'today_goals' => $todayGoals,
'total_score' => $student->total_score,
'session_id' => $todaySession?->id,
'country_id' => $student->country_id,
];
});
$query->setCollection($registrations);
$data['registrations'] = $query;
$data['search'] = $search;
$data['total'] = Registration::count();
$data['played'] = $registrations->filter(fn($r) => !empty($r['today_goals']) && count($r['today_goals']) >= 3)->count();
$data['topScore'] = $registrations->max('total_score') ?? 0;
$data['countries'] = Country::where('status', 1)->orderBy('title')->get(['id','title','country_flag']);
return view('dashboard.admin', $data);
}
public function counselorDashboard()
public function counselorDashboard(Request $request)
{
$today = Carbon::today();
$today = Carbon::today();
$search = trim($request->input('search', ''));
$query = Registration::with([
'sessions' => function ($q) use ($today) {
$q->whereDate('play_date', $today)->with('shots');
},
'comments'
'comments',
'country'
])
->whereHas('sessions', function ($q) use ($today) {
$q->whereDate('play_date', $today);
})
->orderBy('created_at', 'desc')
->paginate(10);
});
if ($search) {
$query->where(function ($q) use ($search) {
$q->where('name', 'like', "%{$search}%")
->orWhere('phone', 'like', "%{$search}%")
->orWhere('email', 'like', "%{$search}%");
});
}
$query = $query->orderBy('created_at', 'desc')->paginate(10)->withQueryString();
$registrations = $query->getCollection()->map(function ($student) {
$todaySession = $student->sessions->first();
$todayGoals = null;
$todayGoals = null;
if ($todaySession) {
$todayGoals = $todaySession->shots
->sortBy('shot_number')
@@ -98,7 +114,6 @@ class HomeController extends Controller
->values()
->toArray();
}
return [
'id' => $student->id,
'name' => $student->name,
@@ -107,6 +122,10 @@ class HomeController extends Controller
'today_goals' => $todayGoals,
'total_score' => $student->total_score,
'session_id' => $todaySession?->id,
'country_id' => $student->country_id,
'country_title' => $student->country?->title ?? '', // add
'country_flag' => $student->country?->country_flag ?? '', // add
'status' => $student->status ?? 'warm', // add if not there
'comment_count' => $student->comments->count(),
];
});
@@ -114,9 +133,11 @@ class HomeController extends Controller
$query->setCollection($registrations);
$data['registrations'] = $query;
$data['search'] = $search;
$data['total'] = Registration::count();
$data['played'] = $registrations->filter(fn($r) => !empty($r['today_goals']) && count($r['today_goals']) >= 3)->count();
$data['topScore'] = $registrations->max('total_score') ?? 0;
$data['countries'] = Country::where('status', 1)->orderBy('title')->get(['id','title','country_flag']);
return view('dashboard.counselor', $data);
}