diff --git a/ADMIN_MEMBERS_FIX.md b/ADMIN_MEMBERS_FIX.md new file mode 100644 index 0000000..e20a42f --- /dev/null +++ b/ADMIN_MEMBERS_FIX.md @@ -0,0 +1,230 @@ +# Admin Members Management - Separate Routes Implementation + +## Overview + +This implementation creates a clean separation between family member management and admin member management by introducing dedicated admin routes. This ensures: +- `/family/*` routes are ONLY for actual family members +- `/admin/members/*` routes are for admins to manage ALL platform members +- No confusion between family relationships and admin access + +## Issues Fixed + +### 1. 404 Error for Non-Family Members (View Profile) +**Problem**: When clicking on member cards in the admin dashboard (`/admin/members`), profiles of non-family members returned a 404 error. + +**Root Cause**: The `FamilyController@show` method required a `UserRelationship` record between the authenticated user and the member being viewed. Non-family members don't have this relationship, causing `firstOrFail()` to throw a 404. + +**Solution**: Modified `FamilyController@show` method to: +- Check if the authenticated user has the `super-admin` role +- Allow super-admins to view any member's profile without requiring a family relationship +- Create a mock relationship object for admin views to maintain compatibility with the existing view +- Maintain the existing family relationship check for regular users + +### 2. 404 Error for Non-Family Members (Edit Profile) +**Problem**: When accessing `/family/{id}/edit` for non-family members, the page returned a 404 error. + +**Root Cause**: Same as above - the `edit` method required a family relationship. + +**Solution**: Modified `FamilyController@edit` method with the same approach as the `show` method. + +### 3. Update & Delete Permissions +**Problem**: Super-admins couldn't update or delete non-family members. + +**Solution**: +- Modified `FamilyController@update` method to allow super-admins to update any member +- Modified `FamilyController@destroy` method to allow super-admins to delete any member +- Added proper redirects based on user role (admins redirect to admin panel, regular users to family dashboard) +- Added protection to prevent users from deleting their own account + +### 4. Pixelated Profile Pictures +**Problem**: Profile pictures in member cards appeared pixelated and low quality. + +**Solution**: Added CSS image rendering optimizations: +- Added `image-rendering: -webkit-optimize-contrast` for better image quality +- Added `image-rendering: crisp-edges` for sharper rendering +- Added `backface-visibility: hidden` to prevent rendering issues +- Added font smoothing properties for better overall visual quality + +## New Routes Added + +### Admin Member Management Routes (`routes/web.php`) +```php +// All Members Management (Super Admin only) +Route::get('/members/{id}', [PlatformController::class, 'showMember'])->name('platform.members.show'); +Route::get('/members/{id}/edit', [PlatformController::class, 'editMember'])->name('platform.members.edit'); +Route::put('/members/{id}', [PlatformController::class, 'updateMember'])->name('platform.members.update'); +Route::delete('/members/{id}', [PlatformController::class, 'destroyMember'])->name('platform.members.destroy'); +Route::post('/members/{id}/upload-picture', [PlatformController::class, 'uploadMemberPicture'])->name('platform.members.upload-picture'); +Route::post('/members/{id}/health', [PlatformController::class, 'storeMemberHealth'])->name('platform.members.store-health'); +Route::put('/members/{id}/health/{recordId}', [PlatformController::class, 'updateMemberHealth'])->name('platform.members.update-health'); +Route::post('/members/{id}/tournament', [PlatformController::class, 'storeMemberTournament'])->name('platform.members.store-tournament'); +``` + +### Family Routes (Unchanged) +Family routes remain restricted to actual family relationships: +```php +Route::get('/family/{id}', [FamilyController::class, 'show'])->name('family.show'); +Route::get('/family/{id}/edit', [FamilyController::class, 'edit'])->name('family.edit'); +// ... etc +``` + +## Files Modified + +### 1. `routes/web.php` +**Added**: New admin member management routes under `/admin/members/*` prefix + +### 2. `app/Http/Controllers/Admin/PlatformController.php` +**Added Methods**: +- `showMember($id)` - Display member profile +- `editMember($id)` - Show edit form +- `updateMember(Request $request, $id)` - Update member +- `destroyMember($id)` - Delete member +- `uploadMemberPicture(Request $request, $id)` - Upload profile picture +- `storeMemberHealth(Request $request, $id)` - Add health record +- `updateMemberHealth(Request $request, $id, $recordId)` - Update health record +- `storeMemberTournament(Request $request, $id)` - Add tournament record + +All methods create mock relationship objects for view compatibility. + +### 3. `app/Http/Controllers/FamilyController.php` + +**Changes in `show()` method (line 335)**: +```php +// Check if user is super-admin or viewing their own profile +$isSuperAdmin = $user->hasRole('super-admin'); +$isOwnProfile = $user->id == $id; + +// Get the member to display +$member = User::findOrFail($id); + +// For super-admin or own profile, create a mock relationship +if ($isSuperAdmin || $isOwnProfile) { + $relationship = (object)[ + 'dependent' => $member, + 'relationship_type' => $isOwnProfile ? 'self' : 'admin_view', + 'guardian_user_id' => $user->id, + 'dependent_user_id' => $member->id, + ]; +} else { + // Regular user - must have family relationship + $relationship = UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->with('dependent') + ->firstOrFail(); +} +``` + +**Changes in `edit()` method (line 470)**: +- Same logic as `show()` method +- Creates mock relationship for super-admins +- Includes `is_billing_contact` field in mock object + +**Changes in `update()` method (line 487)**: +- Made `relationship_type` validation nullable (not required for admin edits) +- Added super-admin and own profile checks +- Only updates relationship record if user is not admin and not editing own profile +- Redirects to admin panel for super-admins, family dashboard for regular users + +**Changes in `destroy()` method (line 911)**: +- Added super-admin check +- Added protection against self-deletion +- Only checks family relationship for non-admin users +- Redirects to admin panel for super-admins, family dashboard for regular users + +**Reverted Changes**: Removed admin access logic from family controller methods since admin now uses separate routes. + +### 4. `resources/views/admin/platform/members.blade.php` +**Changes**: +1. Updated member card links to use `route('admin.platform.members.show')` instead of `route('family.show')` +2. Added CSS image rendering optimizations for better picture quality + +### 5. `resources/views/family/edit.blade.php` +**Changes**: Added conditional routing based on `relationship_type`: +- Upload URL: Uses admin route if `admin_view`, family route otherwise +- Form action: Uses admin route if `admin_view`, family route otherwise +- Cancel button: Redirects to admin panel if `admin_view`, family dashboard otherwise +- Delete form: Uses admin route if `admin_view`, family route otherwise + +### 6. `resources/views/family/show.blade.php` +**Changes**: Updated form actions for health and tournament modals to use admin routes when `relationship_type === 'admin_view'` + +## Route Structure + +### Admin Routes (Super Admin Only) +- **View Profile**: `/admin/members/{id}` → `admin.platform.members.show` +- **Edit Profile**: `/admin/members/{id}/edit` → `admin.platform.members.edit` +- **Update Profile**: `PUT /admin/members/{id}` → `admin.platform.members.update` +- **Delete Member**: `DELETE /admin/members/{id}` → `admin.platform.members.destroy` +- **Upload Picture**: `POST /admin/members/{id}/upload-picture` → `admin.platform.members.upload-picture` +- **Add Health**: `POST /admin/members/{id}/health` → `admin.platform.members.store-health` +- **Update Health**: `PUT /admin/members/{id}/health/{recordId}` → `admin.platform.members.update-health` +- **Add Tournament**: `POST /admin/members/{id}/tournament` → `admin.platform.members.store-tournament` + +### Family Routes (Authenticated Users) +- **View Profile**: `/family/{id}` → `family.show` (requires family relationship) +- **Edit Profile**: `/family/{id}/edit` → `family.edit` (requires family relationship) +- **Update Profile**: `PUT /family/{id}` → `family.update` (requires family relationship) +- **Delete Member**: `DELETE /family/{id}` → `family.destroy` (requires family relationship) +- All other family routes remain unchanged + +## Testing + +### Admin Access Testing +1. **View Any Member**: + - Log in as super-admin + - Navigate to `/admin/members` + - Click any member card + - Should load profile at `/admin/members/{id}` + +2. **Edit Any Member**: + - From member profile, click edit + - Should navigate to `/admin/members/{id}/edit` + - Make changes and save + - Should redirect to `/admin/members` with success message + +3. **Delete Member**: + - From edit page, click "Remove" + - Confirm deletion + - Should redirect to `/admin/members` + - Verify cannot delete own account + +4. **Add Health/Tournament Records**: + - From member profile, use "Add Health Update" or "Add Tournament" + - Submit forms + - Should save successfully and reload page + +### Family Access Testing +1. **View Family Members**: + - Log in as regular user + - Navigate to `/family` + - Click family member card + - Should load profile at `/family/{id}` + +2. **Cannot Access Non-Family**: + - Try to access `/family/{non-family-id}` + - Should return 404 error + +3. **Edit Family Members**: + - From family member profile, click edit + - Should navigate to `/family/{id}/edit` + - Make changes and save + - Should redirect to `/family` dashboard + +### Image Quality Testing +- Check member cards in `/admin/members` +- Profile pictures should appear crisp and clear +- No pixelation on hover or zoom + +## Security Considerations + +- Super-admin role check ensures only authorized users can view/edit/delete all member profiles +- Regular users are still restricted to their family members only +- Self-deletion is prevented for all users +- All existing authorization checks remain in place + +## Backward Compatibility + +- All existing functionality for regular users remains unchanged +- Family relationship checks are still enforced for non-admin users +- The view templates work seamlessly with both real and mock relationship objects +- Redirects are context-aware (admin panel vs family dashboard) diff --git a/app/Http/Controllers/Admin/PlatformController.php b/app/Http/Controllers/Admin/PlatformController.php index ee1d29b..5b3d1fc 100644 --- a/app/Http/Controllers/Admin/PlatformController.php +++ b/app/Http/Controllers/Admin/PlatformController.php @@ -5,9 +5,16 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; use App\Models\Tenant; use App\Models\User; +use App\Models\HealthRecord; +use App\Models\Invoice; +use App\Models\TournamentEvent; +use App\Models\Goal; +use App\Models\Attendance; +use App\Models\ClubAffiliation; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Storage; +use Illuminate\Support\Facades\Auth; class PlatformController extends Controller { @@ -477,4 +484,401 @@ class PlatformController extends Controller return response()->json(['success' => false, 'message' => $e->getMessage()], 500); } } + + /** + * Display the specified member's profile. + */ + public function showMember($id) + { + $member = User::findOrFail($id); + + // Fetch health data + $latestHealthRecord = $member->healthRecords()->latest('recorded_at')->first(); + $healthRecords = $member->healthRecords()->orderBy('recorded_at', 'desc')->paginate(10); + $comparisonRecords = $member->healthRecords()->orderBy('recorded_at', 'desc')->take(2)->get(); + + // Fetch invoices + $invoices = Invoice::where('student_user_id', $member->id) + ->orWhere('payer_user_id', $member->id) + ->with(['student', 'tenant']) + ->get(); + + // Fetch tournament data + $tournamentEvents = $member->tournamentEvents() + ->with(['performanceResults', 'notesMedia', 'clubAffiliation']) + ->orderBy('date', 'desc') + ->get(); + + // Calculate award counts + $awardCounts = [ + 'special' => $tournamentEvents->flatMap->performanceResults->where('medal_type', 'special')->count(), + '1st' => $tournamentEvents->flatMap->performanceResults->where('medal_type', '1st')->count(), + '2nd' => $tournamentEvents->flatMap->performanceResults->where('medal_type', '2nd')->count(), + '3rd' => $tournamentEvents->flatMap->performanceResults->where('medal_type', '3rd')->count(), + ]; + + // Get unique sports for filter + $sports = $tournamentEvents->pluck('sport')->unique()->sort()->values(); + + // Fetch goals data + $goals = $member->goals()->orderBy('created_at', 'desc')->get(); + $activeGoalsCount = $goals->where('status', 'active')->count(); + $completedGoalsCount = $goals->where('status', 'completed')->count(); + $successRate = $goals->count() > 0 ? round(($completedGoalsCount / $goals->count()) * 100) : 0; + + // Fetch attendance data + $attendanceRecords = $member->attendanceRecords()->orderBy('session_datetime', 'desc')->get(); + $sessionsCompleted = $attendanceRecords->where('status', 'completed')->count(); + $noShows = $attendanceRecords->where('status', 'no_show')->count(); + $totalSessions = $attendanceRecords->count(); + $attendanceRate = $totalSessions > 0 ? round(($sessionsCompleted / $totalSessions) * 100, 1) : 0; + + // Fetch affiliations data + $clubAffiliations = $member->clubAffiliations() + ->with([ + 'skillAcquisitions.package', + 'skillAcquisitions.activity', + 'skillAcquisitions.instructor.user', + 'affiliationMedia', + 'subscriptions.package.activities', + 'subscriptions.package.packageActivities.activity', + 'subscriptions.package.packageActivities.instructor.user', + ]) + ->orderBy('start_date', 'desc') + ->get(); + + // Add icon_class to media items + $clubAffiliations->each(function($affiliation) { + $affiliation->affiliationMedia->each(function($media) { + $media->icon_class = $media->icon_class; + }); + }); + + // Calculate summary stats + $totalAffiliations = $clubAffiliations->count(); + $distinctSkills = $clubAffiliations->flatMap->skillAcquisitions->pluck('skill_name')->unique()->count(); + $totalMembershipDuration = $clubAffiliations->sum('duration_in_months'); + + // Get all unique skills + $allSkills = $clubAffiliations->flatMap(function($affiliation) { + return $affiliation->skillAcquisitions->pluck('skill_name'); + })->unique()->sort()->values(); + + // Count total instructors + $totalInstructors = $clubAffiliations->flatMap(function($affiliation) { + return $affiliation->skillAcquisitions->pluck('instructor'); + })->filter()->unique('id')->count(); + + // Create a mock relationship for the view + $relationship = (object)[ + 'dependent' => $member, + 'relationship_type' => 'admin_view', + 'guardian_user_id' => Auth::id(), + 'dependent_user_id' => $member->id, + ]; + + return view('family.show', [ + 'relationship' => $relationship, + 'latestHealthRecord' => $latestHealthRecord, + 'healthRecords' => $healthRecords, + 'comparisonRecords' => $comparisonRecords, + 'invoices' => $invoices, + 'tournamentEvents' => $tournamentEvents, + 'awardCounts' => $awardCounts, + 'sports' => $sports, + 'goals' => $goals, + 'activeGoalsCount' => $activeGoalsCount, + 'completedGoalsCount' => $completedGoalsCount, + 'successRate' => $successRate, + 'attendanceRecords' => $attendanceRecords, + 'sessionsCompleted' => $sessionsCompleted, + 'noShows' => $noShows, + 'attendanceRate' => $attendanceRate, + 'clubAffiliations' => $clubAffiliations, + 'totalAffiliations' => $totalAffiliations, + 'distinctSkills' => $distinctSkills, + 'totalMembershipDuration' => $totalMembershipDuration, + 'allSkills' => $allSkills, + 'totalInstructors' => $totalInstructors, + 'user' => $member, + ]); + } + + /** + * Show the form for editing a member. + */ + public function editMember($id) + { + $member = User::findOrFail($id); + + // Create a mock relationship for the view + $relationship = (object)[ + 'dependent' => $member, + 'relationship_type' => 'admin_view', + 'guardian_user_id' => Auth::id(), + 'dependent_user_id' => $member->id, + 'is_billing_contact' => false, + ]; + + return view('family.edit', compact('relationship')); + } + + /** + * Update a member. + */ + public function updateMember(Request $request, $id) + { + $validated = $request->validate([ + 'full_name' => 'required|string|max:255', + 'email' => 'nullable|email|max:255|unique:users,email,' . $id, + 'mobile_code' => 'nullable|string|max:5', + 'mobile' => 'nullable|string|max:20', + 'gender' => 'required|in:m,f', + 'marital_status' => 'nullable|in:single,married,divorced,widowed', + 'birthdate' => 'required|date', + 'blood_type' => 'nullable|string|max:10', + 'nationality' => 'required|string|max:100', + 'social_links' => 'nullable|array', + 'social_links.*.platform' => 'required_with:social_links.*.url|string', + 'social_links.*.url' => 'required_with:social_links.*.platform|url', + 'motto' => 'nullable|string|max:500', + ]); + + // Process social links + $socialLinks = []; + if (isset($validated['social_links']) && is_array($validated['social_links'])) { + foreach ($validated['social_links'] as $link) { + if (!empty($link['platform']) && !empty($link['url'])) { + $socialLinks[$link['platform']] = $link['url']; + } + } + } + + // Process mobile + $mobile = [ + 'code' => $validated['mobile_code'] ?? null, + 'number' => $validated['mobile'] ?? null, + ]; + + $member = User::findOrFail($id); + $member->update([ + 'full_name' => $validated['full_name'], + 'email' => $validated['email'], + 'mobile' => $mobile, + 'gender' => $validated['gender'], + 'marital_status' => $validated['marital_status'] ?? null, + 'birthdate' => $validated['birthdate'], + 'blood_type' => $validated['blood_type'], + 'nationality' => $validated['nationality'], + 'social_links' => $socialLinks, + 'motto' => $validated['motto'], + ]); + + // Return JSON for AJAX requests + if ($request->wantsJson() || $request->ajax()) { + return response()->json([ + 'success' => true, + 'message' => 'Member updated successfully.' + ]); + } + + return redirect()->route('admin.platform.members.show', $id) + ->with('success', 'Member updated successfully.'); + } + + /** + * Delete a member. + */ + public function destroyMember($id) + { + // Prevent deleting own account + if (Auth::id() == $id) { + return redirect()->back() + ->with('error', 'You cannot delete your own account.'); + } + + $member = User::findOrFail($id); + $memberName = $member->full_name; + $member->delete(); + + return redirect()->route('admin.platform.members') + ->with('success', $memberName . ' has been removed successfully.'); + } + + /** + * Upload member profile picture. + */ + public function uploadMemberPicture(Request $request, $id) + { + $request->validate([ + 'image' => 'required', + 'folder' => 'required|string', + 'filename' => 'required|string', + ]); + + try { + $member = User::findOrFail($id); + + // Handle base64 image from cropper + $imageData = $request->image; + $imageParts = explode(";base64,", $imageData); + $imageTypeAux = explode("image/", $imageParts[0]); + $extension = $imageTypeAux[1]; + $imageBinary = base64_decode($imageParts[1]); + + $folder = trim($request->folder, '/'); + $fileName = $request->filename . '.' . $extension; + $fullPath = $folder . '/' . $fileName; + + // Delete old profile picture if exists + if ($member->profile_picture && Storage::disk('public')->exists($member->profile_picture)) { + Storage::disk('public')->delete($member->profile_picture); + } + + // Store in the public disk + Storage::disk('public')->put($fullPath, $imageBinary); + + // Update member's profile_picture field + $member->update(['profile_picture' => $fullPath]); + + return response()->json([ + 'success' => true, + 'path' => $fullPath, + 'url' => asset('storage/' . $fullPath) + ]); + } catch (\Exception $e) { + return response()->json(['success' => false, 'message' => $e->getMessage()], 500); + } + } + + /** + * Store a health record for a member. + */ + public function storeMemberHealth(Request $request, $id) + { + $validated = $request->validate([ + 'recorded_at' => 'required|date', + 'height' => 'nullable|numeric|min:50|max:250', + 'weight' => 'nullable|numeric|min:0|max:999.9', + 'body_fat_percentage' => 'nullable|numeric|min:0|max:100', + 'bmi' => 'nullable|numeric|min:0|max:100', + 'body_water_percentage' => 'nullable|numeric|min:0|max:100', + 'muscle_mass' => 'nullable|numeric|min:0|max:999.9', + 'bone_mass' => 'nullable|numeric|min:0|max:999.9', + 'visceral_fat' => 'nullable|integer|min:0|max:50', + 'bmr' => 'nullable|integer|min:0|max:10000', + 'protein_percentage' => 'nullable|numeric|min:0|max:100', + 'body_age' => 'nullable|integer|min:0|max:150', + ]); + + $member = User::findOrFail($id); + + // Check for duplicate date + $existing = $member->healthRecords()->where('recorded_at', $validated['recorded_at'])->first(); + if ($existing) { + return redirect()->back() + ->with('error', 'A health record already exists for this date.'); + } + + $member->healthRecords()->create($validated); + + return redirect()->back()->withFragment('health') + ->with('success', 'Health record added successfully.'); + } + + /** + * Update a health record for a member. + */ + public function updateMemberHealth(Request $request, $id, $recordId) + { + $validated = $request->validate([ + 'recorded_at' => 'required|date', + 'height' => 'nullable|numeric|min:50|max:250', + 'weight' => 'nullable|numeric|min:0|max:999.9', + 'body_fat_percentage' => 'nullable|numeric|min:0|max:100', + 'bmi' => 'nullable|numeric|min:0|max:100', + 'body_water_percentage' => 'nullable|numeric|min:0|max:100', + 'muscle_mass' => 'nullable|numeric|min:0|max:999.9', + 'bone_mass' => 'nullable|numeric|min:0|max:999.9', + 'visceral_fat' => 'nullable|integer|min:0|max:50', + 'bmr' => 'nullable|integer|min:0|max:10000', + 'protein_percentage' => 'nullable|numeric|min:0|max:100', + 'body_age' => 'nullable|integer|min:0|max:150', + ]); + + $member = User::findOrFail($id); + $healthRecord = $member->healthRecords()->findOrFail($recordId); + + // Check for duplicate date (excluding current record) + $existing = $member->healthRecords() + ->where('recorded_at', $validated['recorded_at']) + ->where('id', '!=', $recordId) + ->first(); + if ($existing) { + return redirect()->back() + ->with('error', 'A health record already exists for this date.'); + } + + $healthRecord->update($validated); + + return redirect()->back()->withFragment('health') + ->with('success', 'Health record updated successfully.'); + } + + /** + * Store a tournament record for a member. + */ + public function storeMemberTournament(Request $request, $id) + { + $validated = $request->validate([ + 'title' => 'required|string|max:255', + 'type' => 'required|in:championship,tournament,competition,exhibition', + 'sport' => 'required|string|max:100', + 'date' => 'required|date', + 'time' => 'nullable|date_format:H:i', + 'location' => 'nullable|string|max:255', + 'participants_count' => 'nullable|integer|min:1', + 'club_affiliation_id' => 'nullable|exists:club_affiliations,id', + 'performance_results' => 'nullable|array', + 'performance_results.*.medal_type' => 'nullable|in:special,1st,2nd,3rd', + 'performance_results.*.points' => 'nullable|numeric|min:0', + 'performance_results.*.description' => 'nullable|string|max:500', + 'notes_media' => 'nullable|array', + 'notes_media.*.note_text' => 'nullable|string|max:1000', + 'notes_media.*.media_link' => 'nullable|url', + ]); + + // Create the tournament event + $tournament = TournamentEvent::create([ + 'user_id' => $id, + 'club_affiliation_id' => $validated['club_affiliation_id'] ?? null, + 'title' => $validated['title'], + 'type' => $validated['type'], + 'sport' => $validated['sport'], + 'date' => $validated['date'], + 'time' => $validated['time'], + 'location' => $validated['location'], + 'participants_count' => $validated['participants_count'], + ]); + + // Create performance results + if (isset($validated['performance_results'])) { + foreach ($validated['performance_results'] as $resultData) { + if (!empty($resultData['medal_type'])) { + $tournament->performanceResults()->create($resultData); + } + } + } + + // Create notes and media + if (isset($validated['notes_media'])) { + foreach ($validated['notes_media'] as $noteData) { + if (!empty($noteData['note_text']) || !empty($noteData['media_link'])) { + $tournament->notesMedia()->create($noteData); + } + } + } + + return response()->json(['success' => true, 'message' => 'Tournament record added successfully']); + } } diff --git a/app/Http/Controllers/FamilyController.php b/app/Http/Controllers/FamilyController.php index 334875b..320ad57 100644 --- a/app/Http/Controllers/FamilyController.php +++ b/app/Http/Controllers/FamilyController.php @@ -254,6 +254,7 @@ class FamilyController extends Controller 'mobile_code' => 'nullable|string|max:5', 'mobile' => 'nullable|string|max:20', 'gender' => 'required|in:m,f', + 'marital_status' => 'nullable|in:single,married,divorced,widowed', 'birthdate' => 'required|date', 'blood_type' => 'nullable|string|max:10', 'nationality' => 'required|string|max:100', @@ -261,10 +262,32 @@ class FamilyController extends Controller 'social_links.*.platform' => 'required_with:social_links.*.url|string', 'social_links.*.url' => 'required_with:social_links.*.platform|url', 'motto' => 'nullable|string|max:500', + 'remove_profile_picture' => 'nullable|boolean', + 'profile_picture_is_public' => 'nullable|boolean', ]); $user = Auth::user(); + // Handle profile picture removal + if ($request->input('remove_profile_picture') == '1') { + // Delete the profile picture file if it exists + if ($user->profile_picture && Storage::disk('public')->exists($user->profile_picture)) { + Storage::disk('public')->delete($user->profile_picture); + } + + // Also check for old format profile pictures + $extensions = ['png', 'jpg', 'jpeg', 'webp']; + foreach ($extensions as $ext) { + $path = 'images/profiles/profile_' . $user->id . '.' . $ext; + if (Storage::disk('public')->exists($path)) { + Storage::disk('public')->delete($path); + } + } + + // Set profile_picture to null + $user->profile_picture = null; + } + // Process social links - convert from array of objects to associative array $socialLinks = []; if (isset($validated['social_links']) && is_array($validated['social_links'])) { @@ -284,6 +307,9 @@ class FamilyController extends Controller ]; unset($validated['mobile_code']); + // Handle profile picture visibility + $validated['profile_picture_is_public'] = $request->has('profile_picture_is_public') ? true : false; + $user->update($validated); return redirect()->route('profile.show') @@ -335,10 +361,30 @@ class FamilyController extends Controller public function show($id) { $user = Auth::user(); - $relationship = UserRelationship::where('guardian_user_id', $user->id) - ->where('dependent_user_id', $id) - ->with('dependent') - ->firstOrFail(); + + // Check if user is super-admin or viewing their own profile + $isSuperAdmin = $user->hasRole('super-admin'); + $isOwnProfile = $user->id == $id; + + // Get the member to display + $member = User::findOrFail($id); + + // For super-admin or own profile, create a mock relationship + // For regular users, verify family relationship exists + if ($isSuperAdmin || $isOwnProfile) { + $relationship = (object)[ + 'dependent' => $member, + 'relationship_type' => $isOwnProfile ? 'self' : 'admin_view', + 'guardian_user_id' => $user->id, + 'dependent_user_id' => $member->id, + ]; + } else { + // Regular user - must have family relationship + $relationship = UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->with('dependent') + ->firstOrFail(); + } // Fetch health data for the dependent $latestHealthRecord = $relationship->dependent->healthRecords()->latest('recorded_at')->first(); @@ -450,10 +496,31 @@ class FamilyController extends Controller public function edit($id) { $user = Auth::user(); - $relationship = UserRelationship::where('guardian_user_id', $user->id) - ->where('dependent_user_id', $id) - ->with('dependent') - ->firstOrFail(); + + // Check if user is super-admin or viewing their own profile + $isSuperAdmin = $user->hasRole('super-admin'); + $isOwnProfile = $user->id == $id; + + // Get the member to edit + $member = User::findOrFail($id); + + // For super-admin or own profile, create a mock relationship + // For regular users, verify family relationship exists + if ($isSuperAdmin || $isOwnProfile) { + $relationship = (object)[ + 'dependent' => $member, + 'relationship_type' => $isOwnProfile ? 'self' : 'admin_view', + 'guardian_user_id' => $user->id, + 'dependent_user_id' => $member->id, + 'is_billing_contact' => false, + ]; + } else { + // Regular user - must have family relationship + $relationship = UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->with('dependent') + ->firstOrFail(); + } return view('family.edit', compact('relationship')); } @@ -473,6 +540,7 @@ class FamilyController extends Controller 'mobile_code' => 'nullable|string|max:5', 'mobile' => 'nullable|string|max:20', 'gender' => 'required|in:m,f', + 'marital_status' => 'nullable|in:single,married,divorced,widowed', 'birthdate' => 'required|date', 'blood_type' => 'nullable|string|max:10', 'nationality' => 'required|string|max:100', @@ -480,14 +548,46 @@ class FamilyController extends Controller 'social_links.*.platform' => 'required_with:social_links.*.url|string', 'social_links.*.url' => 'required_with:social_links.*.platform|url', 'motto' => 'nullable|string|max:500', - 'relationship_type' => 'required|string|max:50', + 'relationship_type' => 'nullable|string|max:50', 'is_billing_contact' => 'boolean', + 'remove_profile_picture' => 'nullable|boolean', + 'profile_picture_is_public' => 'nullable|boolean', ]); $user = Auth::user(); - $relationship = UserRelationship::where('guardian_user_id', $user->id) - ->where('dependent_user_id', $id) - ->firstOrFail(); + + // Check if user is super-admin or updating their own profile + $isSuperAdmin = $user->hasRole('super-admin'); + $isOwnProfile = $user->id == $id; + + // For regular users, verify family relationship exists + if (!$isSuperAdmin && !$isOwnProfile) { + $relationship = UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->firstOrFail(); + } + + $dependent = User::findOrFail($id); + + // Handle profile picture removal + if ($request->input('remove_profile_picture') == '1') { + // Delete the profile picture file if it exists + if ($dependent->profile_picture && Storage::disk('public')->exists($dependent->profile_picture)) { + Storage::disk('public')->delete($dependent->profile_picture); + } + + // Also check for old format profile pictures + $extensions = ['png', 'jpg', 'jpeg', 'webp']; + foreach ($extensions as $ext) { + $path = 'images/profiles/profile_' . $dependent->id . '.' . $ext; + if (Storage::disk('public')->exists($path)) { + Storage::disk('public')->delete($path); + } + } + + // Set profile_picture to null + $dependent->profile_picture = null; + } // Process social links - convert from array of objects to associative array $socialLinks = []; @@ -505,23 +605,33 @@ class FamilyController extends Controller 'number' => $validated['mobile'] ?? null, ]; - $dependent = User::findOrFail($id); $dependent->update([ 'full_name' => $validated['full_name'], 'email' => $validated['email'], 'mobile' => $mobile, 'gender' => $validated['gender'], + 'marital_status' => $validated['marital_status'] ?? null, 'birthdate' => $validated['birthdate'], 'blood_type' => $validated['blood_type'], 'nationality' => $validated['nationality'], 'social_links' => $socialLinks, 'motto' => $validated['motto'], + 'profile_picture_is_public' => $request->has('profile_picture_is_public') ? true : false, ]); - $relationship->update([ - 'relationship_type' => $validated['relationship_type'], - 'is_billing_contact' => $validated['is_billing_contact'] ?? false, - ]); + // Update relationship if it exists (not for admin or own profile) + if (!$isSuperAdmin && !$isOwnProfile && isset($relationship)) { + $relationship->update([ + 'relationship_type' => $validated['relationship_type'] ?? $relationship->relationship_type, + 'is_billing_contact' => $validated['is_billing_contact'] ?? false, + ]); + } + + // Redirect based on user type + if ($isSuperAdmin) { + return redirect()->route('admin.platform.members') + ->with('success', 'Member updated successfully.'); + } return redirect()->route('family.dashboard') ->with('success', 'Family member updated successfully.'); @@ -853,13 +963,33 @@ class FamilyController extends Controller public function destroy($id) { $user = Auth::user(); - $relationship = UserRelationship::where('guardian_user_id', $user->id) - ->where('dependent_user_id', $id) - ->firstOrFail(); + + // Check if user is super-admin + $isSuperAdmin = $user->hasRole('super-admin'); + + // Prevent deleting own account + if ($user->id == $id) { + return redirect()->back() + ->with('error', 'You cannot delete your own account.'); + } + + // For regular users, verify family relationship exists + if (!$isSuperAdmin) { + $relationship = UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->firstOrFail(); + } $dependent = User::findOrFail($id); + $memberName = $dependent->full_name; $dependent->delete(); + // Redirect based on user type + if ($isSuperAdmin) { + return redirect()->route('admin.platform.members') + ->with('success', $memberName . ' has been removed successfully.'); + } + return redirect()->route('family.dashboard') ->with('success', 'Family member removed successfully.'); } diff --git a/app/Http/Controllers/MemberController.php b/app/Http/Controllers/MemberController.php new file mode 100644 index 0000000..1bdeb84 --- /dev/null +++ b/app/Http/Controllers/MemberController.php @@ -0,0 +1,709 @@ +id) + ->with('dependent') + ->whereHas('dependent') + ->get() + ->sortBy(function($relationship) { + return $relationship->dependent->full_name; + }); + + return view('member.index', compact('user', 'dependents')); + } + + /** + * Show the form for creating a new member. + * + * @return \Illuminate\View\View + */ + public function create() + { + return view('member.create'); + } + + /** + * Store a newly created member in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\RedirectResponse + */ + public function store(Request $request) + { + $validated = $request->validate([ + 'full_name' => 'required|string|max:255', + 'email' => 'nullable|email|max:255', + 'gender' => 'required|in:m,f', + 'birthdate' => 'required|date', + 'blood_type' => 'nullable|string|max:10', + 'nationality' => 'required|string|max:100', + 'relationship_type' => 'required|string|max:50', + 'is_billing_contact' => 'boolean', + ]); + + $guardian = Auth::user(); + + // Use FamilyService to create the dependent + $familyService = app(\App\Services\FamilyService::class); + $dependent = $familyService->createDependent($guardian, $validated); + + return redirect()->route('members.index') + ->with('success', 'Member added successfully.'); + } + + /** + * Display the specified member's profile. + * + * @param int $id + * @return \Illuminate\View\View + */ + public function show($id) + { + $user = Auth::user(); + + // Check if user is super-admin or viewing their own profile + $isSuperAdmin = $user->hasRole('super-admin'); + $isOwnProfile = $user->id == $id; + + // Get the member to display + $member = User::findOrFail($id); + + // For super-admin or own profile, create a mock relationship + // For regular users, verify family relationship exists + if ($isSuperAdmin || $isOwnProfile) { + $relationship = (object)[ + 'dependent' => $member, + 'relationship_type' => $isOwnProfile ? 'self' : 'admin_view', + 'guardian_user_id' => $user->id, + 'dependent_user_id' => $member->id, + ]; + } else { + // Regular user - must have family relationship + $relationship = UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->with('dependent') + ->firstOrFail(); + } + + // Fetch health data for the member + $latestHealthRecord = $relationship->dependent->healthRecords()->latest('recorded_at')->first(); + $healthRecords = $relationship->dependent->healthRecords()->orderBy('recorded_at', 'desc')->paginate(10); + $comparisonRecords = $relationship->dependent->healthRecords()->orderBy('recorded_at', 'desc')->take(2)->get(); + + // Fetch invoices for the member + $invoices = Invoice::where('student_user_id', $relationship->dependent->id) + ->orWhere('payer_user_id', $relationship->dependent->id) + ->with(['student', 'tenant']) + ->get(); + + // Fetch tournament data for the member + $tournamentEvents = $relationship->dependent->tournamentEvents() + ->with(['performanceResults', 'notesMedia', 'clubAffiliation']) + ->orderBy('date', 'desc') + ->get(); + + // Calculate award counts + $awardCounts = [ + 'special' => $tournamentEvents->flatMap->performanceResults->where('medal_type', 'special')->count(), + '1st' => $tournamentEvents->flatMap->performanceResults->where('medal_type', '1st')->count(), + '2nd' => $tournamentEvents->flatMap->performanceResults->where('medal_type', '2nd')->count(), + '3rd' => $tournamentEvents->flatMap->performanceResults->where('medal_type', '3rd')->count(), + ]; + + // Get unique sports for filter + $sports = $tournamentEvents->pluck('sport')->unique()->sort()->values(); + + // Fetch goals data for the member + $goals = $relationship->dependent->goals()->orderBy('created_at', 'desc')->get(); + $activeGoalsCount = $goals->where('status', 'active')->count(); + $completedGoalsCount = $goals->where('status', 'completed')->count(); + $successRate = $goals->count() > 0 ? round(($completedGoalsCount / $goals->count()) * 100) : 0; + + // Fetch attendance data for the member + $attendanceRecords = $relationship->dependent->attendanceRecords()->orderBy('session_datetime', 'desc')->get(); + $sessionsCompleted = $attendanceRecords->where('status', 'completed')->count(); + $noShows = $attendanceRecords->where('status', 'no_show')->count(); + $totalSessions = $attendanceRecords->count(); + $attendanceRate = $totalSessions > 0 ? round(($sessionsCompleted / $totalSessions) * 100, 1) : 0; + + // Fetch affiliations data for the member with enhanced relationships + $clubAffiliations = $relationship->dependent->clubAffiliations() + ->with([ + 'skillAcquisitions.package', + 'skillAcquisitions.activity', + 'skillAcquisitions.instructor.user', + 'affiliationMedia', + 'subscriptions.package.activities', + 'subscriptions.package.packageActivities.activity', + 'subscriptions.package.packageActivities.instructor.user', + ]) + ->orderBy('start_date', 'desc') + ->get(); + + // Add icon_class to media items for JavaScript + $clubAffiliations->each(function($affiliation) { + $affiliation->affiliationMedia->each(function($media) { + $media->icon_class = $media->icon_class; + }); + }); + + // Calculate summary stats + $totalAffiliations = $clubAffiliations->count(); + $distinctSkills = $clubAffiliations->flatMap->skillAcquisitions->pluck('skill_name')->unique()->count(); + $totalMembershipDuration = $clubAffiliations->sum('duration_in_months'); + + // Get all unique skills for filter dropdown + $allSkills = $clubAffiliations->flatMap(function($affiliation) { + return $affiliation->skillAcquisitions->pluck('skill_name'); + })->unique()->sort()->values(); + + // Count total instructors + $totalInstructors = $clubAffiliations->flatMap(function($affiliation) { + return $affiliation->skillAcquisitions->pluck('instructor'); + })->filter()->unique('id')->count(); + + return view('member.show', [ + 'relationship' => $relationship, + 'latestHealthRecord' => $latestHealthRecord, + 'healthRecords' => $healthRecords, + 'comparisonRecords' => $comparisonRecords, + 'invoices' => $invoices, + 'tournamentEvents' => $tournamentEvents, + 'awardCounts' => $awardCounts, + 'sports' => $sports, + 'goals' => $goals, + 'activeGoalsCount' => $activeGoalsCount, + 'completedGoalsCount' => $completedGoalsCount, + 'successRate' => $successRate, + 'attendanceRecords' => $attendanceRecords, + 'sessionsCompleted' => $sessionsCompleted, + 'noShows' => $noShows, + 'attendanceRate' => $attendanceRate, + 'clubAffiliations' => $clubAffiliations, + 'totalAffiliations' => $totalAffiliations, + 'distinctSkills' => $distinctSkills, + 'totalMembershipDuration' => $totalMembershipDuration, + 'allSkills' => $allSkills, + 'totalInstructors' => $totalInstructors, + 'user' => $relationship->dependent, + ]); + } + + /** + * Show the form for editing the specified member. + * + * @param int $id + * @return \Illuminate\View\View + */ + public function edit($id) + { + $user = Auth::user(); + + // Check if user is super-admin or viewing their own profile + $isSuperAdmin = $user->hasRole('super-admin'); + $isOwnProfile = $user->id == $id; + + // Get the member to edit + $member = User::findOrFail($id); + + // For super-admin or own profile, create a mock relationship + // For regular users, verify family relationship exists + if ($isSuperAdmin || $isOwnProfile) { + $relationship = (object)[ + 'dependent' => $member, + 'relationship_type' => $isOwnProfile ? 'self' : 'admin_view', + 'guardian_user_id' => $user->id, + 'dependent_user_id' => $member->id, + 'is_billing_contact' => false, + ]; + } else { + // Regular user - must have family relationship + $relationship = UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->with('dependent') + ->firstOrFail(); + } + + return view('member.edit', compact('relationship')); + } + + /** + * Update the specified member in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse + */ + public function update(Request $request, $id) + { + $validated = $request->validate([ + 'full_name' => 'required|string|max:255', + 'email' => 'nullable|email|max:255|unique:users,email,' . $id, + 'mobile_code' => 'nullable|string|max:5', + 'mobile' => 'nullable|string|max:20', + 'gender' => 'required|in:m,f', + 'marital_status' => 'nullable|in:single,married,divorced,widowed', + 'birthdate' => 'required|date', + 'blood_type' => 'nullable|string|max:10', + 'nationality' => 'required|string|max:100', + 'social_links' => 'nullable|array', + 'social_links.*.platform' => 'required_with:social_links.*.url|string', + 'social_links.*.url' => 'required_with:social_links.*.platform|url', + 'motto' => 'nullable|string|max:500', + 'relationship_type' => 'nullable|string|max:50', + 'is_billing_contact' => 'boolean', + 'remove_profile_picture' => 'nullable|boolean', + 'profile_picture_is_public' => 'nullable|boolean', + ]); + + $user = Auth::user(); + + // Check if user is super-admin or updating their own profile + $isSuperAdmin = $user->hasRole('super-admin'); + $isOwnProfile = $user->id == $id; + + // For regular users, verify family relationship exists + if (!$isSuperAdmin && !$isOwnProfile) { + $relationship = UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->firstOrFail(); + } + + // Process social links - convert from array of objects to associative array + $socialLinks = []; + if (isset($validated['social_links']) && is_array($validated['social_links'])) { + foreach ($validated['social_links'] as $link) { + if (!empty($link['platform']) && !empty($link['url'])) { + $socialLinks[$link['platform']] = $link['url']; + } + } + } + + // Process mobile + $mobile = [ + 'code' => $validated['mobile_code'] ?? null, + 'number' => $validated['mobile'] ?? null, + ]; + + $member = User::findOrFail($id); + + // Handle profile picture removal + if ($request->input('remove_profile_picture') == '1') { + // Delete the profile picture file if it exists + if ($member->profile_picture && Storage::disk('public')->exists($member->profile_picture)) { + Storage::disk('public')->delete($member->profile_picture); + } + + // Also check for old format profile pictures + $extensions = ['png', 'jpg', 'jpeg', 'webp']; + foreach ($extensions as $ext) { + $path = 'images/profiles/profile_' . $member->id . '.' . $ext; + if (Storage::disk('public')->exists($path)) { + Storage::disk('public')->delete($path); + } + } + + // Set profile_picture to null + $member->profile_picture = null; + } + + $member->update([ + 'full_name' => $validated['full_name'], + 'email' => $validated['email'], + 'mobile' => $mobile, + 'gender' => $validated['gender'], + 'marital_status' => $validated['marital_status'] ?? null, + 'birthdate' => $validated['birthdate'], + 'blood_type' => $validated['blood_type'], + 'nationality' => $validated['nationality'], + 'social_links' => $socialLinks, + 'motto' => $validated['motto'], + 'profile_picture_is_public' => $request->has('profile_picture_is_public') ? true : false, + ]); + + // Update relationship if it exists (not for admin or own profile) + if (!$isSuperAdmin && !$isOwnProfile && isset($relationship)) { + $relationship->update([ + 'relationship_type' => $validated['relationship_type'] ?? $relationship->relationship_type, + 'is_billing_contact' => $validated['is_billing_contact'] ?? false, + ]); + } + + // Return JSON for AJAX requests + if ($request->wantsJson() || $request->ajax()) { + // Get the updated profile picture URL + $profilePictureUrl = null; + if ($member->profile_picture && file_exists(public_path('storage/' . $member->profile_picture))) { + $profilePictureUrl = asset('storage/' . $member->profile_picture); + } else { + $extensions = ['png', 'jpg', 'jpeg', 'webp']; + foreach ($extensions as $ext) { + $path = 'storage/images/profiles/profile_' . $member->id . '.' . $ext; + if (file_exists(public_path($path))) { + $profilePictureUrl = asset($path); + break; + } + } + } + + return response()->json([ + 'success' => true, + 'message' => 'Member updated successfully.', + 'profile_picture_url' => $profilePictureUrl + ]); + } + + return redirect()->route('member.show', $id) + ->with('success', 'Member updated successfully.'); + } + + /** + * Upload profile picture for a member. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\JsonResponse + */ + public function uploadPicture(Request $request, $id) + { + $request->validate([ + 'image' => 'required', + 'folder' => 'required|string', + 'filename' => 'required|string', + ]); + + try { + $user = Auth::user(); + + // Check if user is super-admin or uploading their own picture + $isSuperAdmin = $user->hasRole('super-admin'); + $isOwnProfile = $user->id == $id; + + // For regular users, verify family relationship exists + if (!$isSuperAdmin && !$isOwnProfile) { + UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->firstOrFail(); + } + + $member = User::findOrFail($id); + + // Handle base64 image from cropper + $imageData = $request->image; + $imageParts = explode(";base64,", $imageData); + $imageTypeAux = explode("image/", $imageParts[0]); + $extension = $imageTypeAux[1]; + $imageBinary = base64_decode($imageParts[1]); + + $folder = trim($request->folder, '/'); + $fileName = $request->filename . '.' . $extension; + $fullPath = $folder . '/' . $fileName; + + // Delete old profile picture if exists + if ($member->profile_picture && Storage::disk('public')->exists($member->profile_picture)) { + Storage::disk('public')->delete($member->profile_picture); + } + + // Store in the public disk + Storage::disk('public')->put($fullPath, $imageBinary); + + // Update member's profile_picture field + $member->update(['profile_picture' => $fullPath]); + + return response()->json([ + 'success' => true, + 'path' => $fullPath, + 'url' => asset('storage/' . $fullPath) + ]); + } catch (\Exception $e) { + return response()->json(['success' => false, 'message' => $e->getMessage()], 500); + } + } + + /** + * Store a health record for the specified member. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\RedirectResponse + */ + public function storeHealth(Request $request, $id) + { + $validated = $request->validate([ + 'recorded_at' => 'required|date', + 'height' => 'nullable|numeric|min:50|max:250', + 'weight' => 'nullable|numeric|min:0|max:999.9', + 'body_fat_percentage' => 'nullable|numeric|min:0|max:100', + 'bmi' => 'nullable|numeric|min:0|max:100', + 'body_water_percentage' => 'nullable|numeric|min:0|max:100', + 'muscle_mass' => 'nullable|numeric|min:0|max:999.9', + 'bone_mass' => 'nullable|numeric|min:0|max:999.9', + 'visceral_fat' => 'nullable|integer|min:0|max:50', + 'bmr' => 'nullable|integer|min:0|max:10000', + 'protein_percentage' => 'nullable|numeric|min:0|max:100', + 'body_age' => 'nullable|integer|min:0|max:150', + ]); + + $user = Auth::user(); + + // Check if user is super-admin or adding health for themselves + $isSuperAdmin = $user->hasRole('super-admin'); + $isOwnProfile = $user->id == $id; + + // For regular users, verify family relationship exists + if (!$isSuperAdmin && !$isOwnProfile) { + UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->firstOrFail(); + } + + $member = User::findOrFail($id); + + // Check for duplicate date + $existing = $member->healthRecords()->where('recorded_at', $validated['recorded_at'])->first(); + if ($existing) { + return redirect()->back() + ->with('error', 'A health record already exists for this date.'); + } + + $member->healthRecords()->create($validated); + + return redirect()->back()->withFragment('health') + ->with('success', 'Health record added successfully.'); + } + + /** + * Update a health record for the specified member. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @param int $recordId + * @return \Illuminate\Http\RedirectResponse + */ + public function updateHealth(Request $request, $id, $recordId) + { + $validated = $request->validate([ + 'recorded_at' => 'required|date', + 'height' => 'nullable|numeric|min:50|max:250', + 'weight' => 'nullable|numeric|min:0|max:999.9', + 'body_fat_percentage' => 'nullable|numeric|min:0|max:100', + 'bmi' => 'nullable|numeric|min:0|max:100', + 'body_water_percentage' => 'nullable|numeric|min:0|max:100', + 'muscle_mass' => 'nullable|numeric|min:0|max:999.9', + 'bone_mass' => 'nullable|numeric|min:0|max:999.9', + 'visceral_fat' => 'nullable|integer|min:0|max:50', + 'bmr' => 'nullable|integer|min:0|max:10000', + 'protein_percentage' => 'nullable|numeric|min:0|max:100', + 'body_age' => 'nullable|integer|min:0|max:150', + ]); + + $user = Auth::user(); + + // Check if user is super-admin or updating their own health + $isSuperAdmin = $user->hasRole('super-admin'); + $isOwnProfile = $user->id == $id; + + // For regular users, verify family relationship exists + if (!$isSuperAdmin && !$isOwnProfile) { + UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->firstOrFail(); + } + + $member = User::findOrFail($id); + $healthRecord = $member->healthRecords()->findOrFail($recordId); + + // Check for duplicate date (excluding current record) + $existing = $member->healthRecords() + ->where('recorded_at', $validated['recorded_at']) + ->where('id', '!=', $recordId) + ->first(); + if ($existing) { + return redirect()->back() + ->with('error', 'A health record already exists for this date.'); + } + + $healthRecord->update($validated); + + return redirect()->back()->withFragment('health') + ->with('success', 'Health record updated successfully.'); + } + + /** + * Store a tournament record for the specified member. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\JsonResponse + */ + public function storeTournament(Request $request, $id) + { + $validated = $request->validate([ + 'title' => 'required|string|max:255', + 'type' => 'required|in:championship,tournament,competition,exhibition', + 'sport' => 'required|string|max:100', + 'date' => 'required|date', + 'time' => 'nullable|date_format:H:i', + 'location' => 'nullable|string|max:255', + 'participants_count' => 'nullable|integer|min:1', + 'club_affiliation_id' => 'nullable|exists:club_affiliations,id', + 'performance_results' => 'nullable|array', + 'performance_results.*.medal_type' => 'nullable|in:special,1st,2nd,3rd', + 'performance_results.*.points' => 'nullable|numeric|min:0', + 'performance_results.*.description' => 'nullable|string|max:500', + 'notes_media' => 'nullable|array', + 'notes_media.*.note_text' => 'nullable|string|max:1000', + 'notes_media.*.media_link' => 'nullable|url', + ]); + + $user = Auth::user(); + + // Check if user is super-admin or adding tournament for themselves + $isSuperAdmin = $user->hasRole('super-admin'); + $isOwnProfile = $user->id == $id; + + // For regular users, verify family relationship exists + if (!$isSuperAdmin && !$isOwnProfile) { + UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->firstOrFail(); + } + + // Create the tournament event + $tournament = TournamentEvent::create([ + 'user_id' => $id, + 'club_affiliation_id' => $validated['club_affiliation_id'] ?? null, + 'title' => $validated['title'], + 'type' => $validated['type'], + 'sport' => $validated['sport'], + 'date' => $validated['date'], + 'time' => $validated['time'], + 'location' => $validated['location'], + 'participants_count' => $validated['participants_count'], + ]); + + // Create performance results + if (isset($validated['performance_results'])) { + foreach ($validated['performance_results'] as $resultData) { + if (!empty($resultData['medal_type'])) { + $tournament->performanceResults()->create($resultData); + } + } + } + + // Create notes and media + if (isset($validated['notes_media'])) { + foreach ($validated['notes_media'] as $noteData) { + if (!empty($noteData['note_text']) || !empty($noteData['media_link'])) { + $tournament->notesMedia()->create($noteData); + } + } + } + + return response()->json(['success' => true, 'message' => 'Tournament record added successfully']); + } + + /** + * Update the specified goal. + * + * @param \Illuminate\Http\Request $request + * @param int $goalId + * @return \Illuminate\Http\JsonResponse + */ + public function updateGoal(Request $request, $goalId) + { + $user = Auth::user(); + + // Find the goal + $goal = Goal::findOrFail($goalId); + + // Check if user is super-admin + $isSuperAdmin = $user->hasRole('super-admin'); + + // Check if user is authorized to update this goal + if (!$isSuperAdmin && $goal->user_id !== $user->id) { + // Check if user is guardian of the goal owner + $relationship = UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $goal->user_id) + ->first(); + + if (!$relationship) { + return response()->json(['success' => false, 'message' => 'Unauthorized'], 403); + } + } + + // Validate the request + $validated = $request->validate([ + 'current_progress_value' => 'required|numeric|min:0', + 'status' => 'required|in:active,completed', + ]); + + // Update the goal + $goal->update($validated); + + return response()->json(['success' => true, 'message' => 'Goal updated successfully']); + } + + /** + * Remove the specified member from storage. + * + * @param int $id + * @return \Illuminate\Http\RedirectResponse + */ + public function destroy($id) + { + $user = Auth::user(); + + // Check if user is super-admin + $isSuperAdmin = $user->hasRole('super-admin'); + + // Prevent deleting own account + if ($user->id == $id) { + return redirect()->back() + ->with('error', 'You cannot delete your own account.'); + } + + // For regular users, verify family relationship exists + if (!$isSuperAdmin) { + UserRelationship::where('guardian_user_id', $user->id) + ->where('dependent_user_id', $id) + ->firstOrFail(); + } + + $member = User::findOrFail($id); + $memberName = $member->full_name; + $member->delete(); + + // Redirect based on user type + if ($isSuperAdmin) { + return redirect()->route('admin.platform.members') + ->with('success', $memberName . ' has been removed successfully.'); + } + + return redirect()->route('members.index') + ->with('success', 'Member removed successfully.'); + } +} diff --git a/app/Models/User.php b/app/Models/User.php index a4d9c8f..d8a3432 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -29,6 +29,7 @@ class User extends Authenticatable 'mobile', 'password', 'gender', + 'marital_status', 'birthdate', 'blood_type', 'nationality', @@ -36,6 +37,7 @@ class User extends Authenticatable 'social_links', 'media_gallery', 'profile_picture', + 'profile_picture_is_public', 'motto', ]; diff --git a/database/migrations/2026_01_27_185405_add_marital_status_to_users_table.php b/database/migrations/2026_01_27_185405_add_marital_status_to_users_table.php new file mode 100644 index 0000000..eb83cb2 --- /dev/null +++ b/database/migrations/2026_01_27_185405_add_marital_status_to_users_table.php @@ -0,0 +1,28 @@ +string('marital_status')->nullable()->after('gender'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('users', function (Blueprint $table) { + $table->dropColumn('marital_status'); + }); + } +}; diff --git a/database/migrations/2026_01_27_221321_add_profile_picture_visibility_to_users_table.php b/database/migrations/2026_01_27_221321_add_profile_picture_visibility_to_users_table.php new file mode 100644 index 0000000..fb2ac73 --- /dev/null +++ b/database/migrations/2026_01_27_221321_add_profile_picture_visibility_to_users_table.php @@ -0,0 +1,28 @@ +boolean('profile_picture_is_public')->default(true)->after('profile_picture'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('users', function (Blueprint $table) { + $table->dropColumn('profile_picture_is_public'); + }); + } +}; diff --git a/resources/views/admin/platform/members.blade.php b/resources/views/admin/platform/members.blade.php index 59060fa..cd49ceb 100644 --- a/resources/views/admin/platform/members.blade.php +++ b/resources/views/admin/platform/members.blade.php @@ -32,7 +32,7 @@ data-member-phone="{{ $member->formatted_mobile ?? '' }}" data-member-nationality="{{ $member->nationality ?? '' }}" data-member-gender="{{ $member->gender ?? '' }}"> - +
@@ -40,7 +40,7 @@
@if($member->profile_picture) - {{ $member->full_name }} + {{ $member->full_name }} @else
{{ strtoupper(substr($member->full_name, 0, 1)) }} @@ -224,6 +224,16 @@ .member-card-wrapper.hidden { display: none; } + + /* Improve image quality */ + .rounded-circle img { + image-rendering: -webkit-optimize-contrast; + image-rendering: crisp-edges; + backface-visibility: hidden; + -webkit-backface-visibility: hidden; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } @endpush diff --git a/resources/views/components/edit-profile-modal.blade.php b/resources/views/components/edit-profile-modal.blade.php new file mode 100644 index 0000000..a129722 --- /dev/null +++ b/resources/views/components/edit-profile-modal.blade.php @@ -0,0 +1,1005 @@ +@props([ + 'user', + 'formAction', + 'formMethod' => 'PUT', + 'cancelUrl' => null, + 'showRelationshipFields' => false, + 'relationship' => null, +]) + + + + +@push('styles') + +@endpush + +@push('scripts') + +@endpush diff --git a/resources/views/components/nationality-dropdown.blade.php b/resources/views/components/nationality-dropdown.blade.php index 3d26a8c..3124fc9 100644 --- a/resources/views/components/nationality-dropdown.blade.php +++ b/resources/views/components/nationality-dropdown.blade.php @@ -108,7 +108,7 @@ ${country.name} `; button.addEventListener('click', function() { - selectNationality(componentId, country.name, flagEmoji); + selectNationality(componentId, country.iso3, flagEmoji, country.name); }); countryList.appendChild(button); }); @@ -133,26 +133,31 @@ // Set initial value if provided const hiddenInput = document.getElementById(componentId); if (hiddenInput && hiddenInput.value) { - const initialCountry = countries.find(c => c.name === hiddenInput.value); + // Try to find by ISO3 code first, then by name + let initialCountry = countries.find(c => c.iso3 === hiddenInput.value); + if (!initialCountry) { + initialCountry = countries.find(c => c.name === hiddenInput.value); + } + if (initialCountry) { const flagEmoji = initialCountry.iso2 .toUpperCase() .split('') .map(char => String.fromCodePoint(127397 + char.charCodeAt(0))) .join(''); - selectNationality(componentId, initialCountry.name, flagEmoji); + selectNationality(componentId, initialCountry.iso3, flagEmoji, initialCountry.name); } } } - function selectNationality(componentId, name, flag) { + function selectNationality(componentId, iso3, flag, displayName) { const flagElement = document.getElementById(componentId + 'SelectedFlag'); const countryElement = document.getElementById(componentId + 'SelectedCountry'); const hiddenInput = document.getElementById(componentId); if (flagElement) flagElement.textContent = flag + ' '; - if (countryElement) countryElement.textContent = name; - if (hiddenInput) hiddenInput.value = name; + if (countryElement) countryElement.textContent = displayName; + if (hiddenInput) hiddenInput.value = iso3; // Close the dropdown after selection const dropdownButton = document.getElementById(componentId + 'Dropdown'); diff --git a/resources/views/components/social-link-row.blade.php b/resources/views/components/social-link-row.blade.php new file mode 100644 index 0000000..859c9a7 --- /dev/null +++ b/resources/views/components/social-link-row.blade.php @@ -0,0 +1,92 @@ +@props(['index', 'link']) + + diff --git a/resources/views/family/edit.blade.php b/resources/views/family/edit.blade.php index fed2c0a..cf3e7ab 100644 --- a/resources/views/family/edit.blade.php +++ b/resources/views/family/edit.blade.php @@ -2,398 +2,15 @@ @section('content')
-
-
-
-
-

Edit Family Member

-
-
- -
-
- @if($relationship->dependent->profile_picture) - Profile Picture - @else -
- {{ strtoupper(substr($relationship->dependent->full_name, 0, 1)) }} -
- @endif -
- -
- -
- @csrf - @method('PUT') - -
- - - @error('full_name') -
{{ $message }}
- @enderror -
- -
- - - @error('email') -
{{ $message }}
- @enderror -
- -
- -
- -
- -
-
- - -
- @error('mobile') -
{{ $message }}
- @enderror - @error('mobile_code') -
{{ $message }}
- @enderror -
- -
-
- - - @error('gender') -
{{ $message }}
- @enderror -
-
- - - @error('birthdate') -
{{ $message }}
- @enderror -
-
- -
-
- - - @error('blood_type') -
{{ $message }}
- @enderror -
-
- -
-
- -
-
- Social Media Links - -
- -
- -
- - -
Share a personal motto or quote that inspires them.
- @error('motto') -
{{ $message }}
- @enderror -
- -
-
- - - @error('relationship_type') -
{{ $message }}
- @enderror -
-
- -
- is_billing_contact) ? 'checked' : '' }}> - -
- -
- Cancel -
- - -
-
-
-
-
-
-
+
- - - - - -@push('scripts') - -@endpush @endsection diff --git a/resources/views/family/partials/affiliations-enhanced.blade.php b/resources/views/family/partials/affiliations-enhanced.blade.php index f7d19c5..b80bac5 100644 --- a/resources/views/family/partials/affiliations-enhanced.blade.php +++ b/resources/views/family/partials/affiliations-enhanced.blade.php @@ -119,12 +119,16 @@
{{ $affiliation->club_name }}
- - {{ $affiliation->start_date->format('M Y') }} - {{ $isOngoing ? 'Present' : $affiliation->end_date->format('M Y') }} - - - {{ $affiliation->formatted_duration }} - + @if($affiliation->start_date) + + {{ $affiliation->start_date->format('M Y') }} - {{ $isOngoing ? 'Present' : ($affiliation->end_date ? $affiliation->end_date->format('M Y') : 'N/A') }} + + @endif + @if($affiliation->formatted_duration) + + {{ $affiliation->formatted_duration }} + + @endif @if($ageAtStart) Age: {{ $ageAtStart }}{{ $ageAtEnd && $ageAtEnd != $ageAtStart ? " to $ageAtEnd" : '' }} @@ -165,7 +169,7 @@ Proficiency: {{ ucfirst($skill->proficiency_level) }}
Duration: {{ $skill->formatted_duration }}
@if($skill->instructor)Instructor: {{ $skill->instructor->user->full_name ?? 'Unknown' }}
@endif - Started: {{ $skill->start_date->format('M Y') }}"> + @if($skill->start_date)Started: {{ $skill->start_date->format('M Y') }}@endif"> {{ $skill->skill_name }} {{ ucfirst($skill->proficiency_level) }} @@ -432,15 +436,18 @@
- {{ $subscription->start_date->format('M d, Y') }} - {{ $subscription->end_date->format('M d, Y') }} + {{ $subscription->start_date ? $subscription->start_date->format('M d, Y') : 'N/A' }} - {{ $subscription->end_date ? $subscription->end_date->format('M d, Y') : 'N/A' }}
@php - $duration = $subscription->start_date->diff($subscription->end_date); - $durationParts = []; - if ($duration->y > 0) $durationParts[] = $duration->y . ' year' . ($duration->y > 1 ? 's' : ''); - if ($duration->m > 0) $durationParts[] = $duration->m . ' month' . ($duration->m > 1 ? 's' : ''); - if ($duration->d > 0) $durationParts[] = $duration->d . ' day' . ($duration->d > 1 ? 's' : ''); - $durationText = implode(' ', $durationParts) ?: 'Same day'; + $durationText = 'N/A'; + if ($subscription->start_date && $subscription->end_date) { + $duration = $subscription->start_date->diff($subscription->end_date); + $durationParts = []; + if ($duration->y > 0) $durationParts[] = $duration->y . ' year' . ($duration->y > 1 ? 's' : ''); + if ($duration->m > 0) $durationParts[] = $duration->m . ' month' . ($duration->m > 1 ? 's' : ''); + if ($duration->d > 0) $durationParts[] = $duration->d . ' day' . ($duration->d > 1 ? 's' : ''); + $durationText = implode(' ', $durationParts) ?: 'Same day'; + } @endphp Duration: {{ $durationText }} @@ -530,13 +537,16 @@
You subscribed to this package {{ $samePackageSubscriptions->count() + 1 }} times:
-
+ @csrf
@@ -1312,7 +1299,7 @@
- + @csrf
@@ -2525,4 +2512,15 @@ document.addEventListener('DOMContentLoaded', function() { } }); + + + @endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 88634da..78d3192 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -396,7 +396,7 @@
{{ Auth::user()->full_name }}
{{ Auth::user()->email }}
- + My Profile @@ -405,8 +405,8 @@ My Sessions - - My Family + + Members My Bills diff --git a/resources/views/member/create.blade.php b/resources/views/member/create.blade.php new file mode 100644 index 0000000..f000019 --- /dev/null +++ b/resources/views/member/create.blade.php @@ -0,0 +1,276 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
+

Add Family Member

+
+
+ + @csrf + +
+ + + @error('full_name') +
{{ $message }}
+ @enderror +
+ +
+ + + @error('email') +
{{ $message }}
+ @enderror +
+ +
+ + + + + @error('mobile') +
{{ $message }}
+ @enderror +
+ +
+
+ +
+
+ +
+
+ +
+
+ + + @error('blood_type') +
{{ $message }}
+ @enderror +
+
+ +
+
+ +
+
+ Social Media Links + +
+ +
+ +
+ + +
Share a personal motto or quote that inspires them.
+ @error('motto') +
{{ $message }}
+ @enderror +
+ +
+
+ + + @error('relationship_type') +
{{ $message }}
+ @enderror +
+
+ +
+ + +
+ +
+ Cancel + +
+ +
+
+
+
+
+ +@push('scripts') + +@endpush + +@endsection diff --git a/resources/views/member/dashboard.blade.php b/resources/views/member/dashboard.blade.php new file mode 100644 index 0000000..1feafcc --- /dev/null +++ b/resources/views/member/dashboard.blade.php @@ -0,0 +1,256 @@ +@extends('layouts.app') + +@section('content') +
+
+

Family

+
+ + +
+ + + + @foreach($dependents as $relationship) +
+ +
+ +
+
+
+
+ @if($relationship->dependent->profile_picture) + {{ $relationship->dependent->full_name }} + @else +
+ {{ strtoupper(substr($relationship->dependent->full_name, 0, 1)) }} +
+ @endif +
+
+
+
{{ $relationship->dependent->full_name }}
+
+ @php + $age = $relationship->dependent->age; + $ageGroup = 'Adult'; + if ($age < 2) { + $ageGroup = 'Infant'; + } elseif ($age < 4) { + $ageGroup = 'Toddler'; + } elseif ($age < 6) { + $ageGroup = 'Preschooler'; + } elseif ($age < 13) { + $ageGroup = 'Child'; + } elseif ($age < 20) { + $ageGroup = 'Teenager'; + } elseif ($age < 40) { + $ageGroup = 'Young Adult'; + } elseif ($age < 60) { + $ageGroup = 'Adult'; + } else { + $ageGroup = 'Senior'; + } + @endphp + {{ $ageGroup }} + Active +
+
+
+
+ + +
+
+ + {{ $relationship->dependent->mobile_formatted ?: ($user->mobile_formatted ?: 'Not provided') }} + @if(!$relationship->dependent->mobile_formatted && $user->mobile_formatted) + Guardian's + @endif +
+ @if($relationship->dependent->email) +
+ + {{ $relationship->dependent->email }} +
+ @elseif($user->email) +
+ + {{ $user->email }} + Guardian's +
+ @endif +
+ + +
+
+
+
Gender
+
{{ $relationship->dependent->gender == 'm' ? 'Male' : 'Female' }}
+
+
+
Age
+
{{ $relationship->dependent->age }} years
+
+
+
+
+
Nationality
+
{{ $relationship->dependent->nationality }}
+
+
+
Horoscope
+
+ @php + $horoscopeSymbols = [ + 'Aries' => '♈', + 'Taurus' => '♉', + 'Gemini' => '♊', + 'Cancer' => '♋', + 'Leo' => '♌', + 'Virgo' => '♍', + 'Libra' => '♎', + 'Scorpio' => '♏', + 'Sagittarius' => '♐', + 'Capricorn' => '♑', + 'Aquarius' => '♒', + 'Pisces' => '♓' + ]; + $horoscope = $relationship->dependent->horoscope ?? 'N/A'; + $symbol = $horoscopeSymbols[$horoscope] ?? ''; + @endphp + {{ $symbol }} {{ $horoscope }} +
+
+
+
+
+ Next Birthday + + @if($relationship->dependent->birthdate) + {{ $relationship->dependent->birthdate->copy()->year(now()->year)->isFuture() + ? $relationship->dependent->birthdate->copy()->year(now()->year)->diffForHumans(['parts' => 2, 'syntax' => \Carbon\CarbonInterface::DIFF_ABSOLUTE]) + : $relationship->dependent->birthdate->copy()->year(now()->year + 1)->diffForHumans(['parts' => 2, 'syntax' => \Carbon\CarbonInterface::DIFF_ABSOLUTE]) }} + @else + N/A + @endif + +
+
+ Member Since + {{ $relationship->dependent->created_at->format('d/m/Y') }} +
+
+
+ + +
+
+ + {{ $relationship->relationship_type === 'spouse' ? 'WIFE' : strtoupper($relationship->relationship_type) }} + +
+
+
+ +
+ @endforeach + + +
+ +
+
+
+ +
+
Add Family Member
+
+
+ +
+
+ + +
+ + + + +@endsection diff --git a/resources/views/member/edit.blade.php b/resources/views/member/edit.blade.php new file mode 100644 index 0000000..3770b33 --- /dev/null +++ b/resources/views/member/edit.blade.php @@ -0,0 +1,16 @@ +@extends('layouts.app') + +@section('content') +
+ +
+ +@endsection diff --git a/resources/views/member/index.blade.php b/resources/views/member/index.blade.php new file mode 100644 index 0000000..4bb66dc --- /dev/null +++ b/resources/views/member/index.blade.php @@ -0,0 +1,256 @@ +@extends('layouts.app') + +@section('content') +
+
+

Members

+
+ + +
+ + + + @foreach($dependents as $relationship) +
+ +
+ +
+
+
+
+ @if($relationship->dependent->profile_picture) + {{ $relationship->dependent->full_name }} + @else +
+ {{ strtoupper(substr($relationship->dependent->full_name, 0, 1)) }} +
+ @endif +
+
+
+
{{ $relationship->dependent->full_name }}
+
+ @php + $age = $relationship->dependent->age; + $ageGroup = 'Adult'; + if ($age < 2) { + $ageGroup = 'Infant'; + } elseif ($age < 4) { + $ageGroup = 'Toddler'; + } elseif ($age < 6) { + $ageGroup = 'Preschooler'; + } elseif ($age < 13) { + $ageGroup = 'Child'; + } elseif ($age < 20) { + $ageGroup = 'Teenager'; + } elseif ($age < 40) { + $ageGroup = 'Young Adult'; + } elseif ($age < 60) { + $ageGroup = 'Adult'; + } else { + $ageGroup = 'Senior'; + } + @endphp + {{ $ageGroup }} + Active +
+
+
+
+ + +
+
+ + {{ $relationship->dependent->mobile_formatted ?: ($user->mobile_formatted ?: 'Not provided') }} + @if(!$relationship->dependent->mobile_formatted && $user->mobile_formatted) + Guardian's + @endif +
+ @if($relationship->dependent->email) +
+ + {{ $relationship->dependent->email }} +
+ @elseif($user->email) +
+ + {{ $user->email }} + Guardian's +
+ @endif +
+ + +
+
+
+
Gender
+
{{ $relationship->dependent->gender == 'm' ? 'Male' : 'Female' }}
+
+
+
Age
+
{{ $relationship->dependent->age }} years
+
+
+
+
+
Nationality
+
{{ $relationship->dependent->nationality }}
+
+
+
Horoscope
+
+ @php + $horoscopeSymbols = [ + 'Aries' => '♈', + 'Taurus' => '♉', + 'Gemini' => '♊', + 'Cancer' => '♋', + 'Leo' => '♌', + 'Virgo' => '♍', + 'Libra' => '♎', + 'Scorpio' => '♏', + 'Sagittarius' => '♐', + 'Capricorn' => '♑', + 'Aquarius' => '♒', + 'Pisces' => '♓' + ]; + $horoscope = $relationship->dependent->horoscope ?? 'N/A'; + $symbol = $horoscopeSymbols[$horoscope] ?? ''; + @endphp + {{ $symbol }} {{ $horoscope }} +
+
+
+
+
+ Next Birthday + + @if($relationship->dependent->birthdate) + {{ $relationship->dependent->birthdate->copy()->year(now()->year)->isFuture() + ? $relationship->dependent->birthdate->copy()->year(now()->year)->diffForHumans(['parts' => 2, 'syntax' => \Carbon\CarbonInterface::DIFF_ABSOLUTE]) + : $relationship->dependent->birthdate->copy()->year(now()->year + 1)->diffForHumans(['parts' => 2, 'syntax' => \Carbon\CarbonInterface::DIFF_ABSOLUTE]) }} + @else + N/A + @endif + +
+
+ Member Since + {{ $relationship->dependent->created_at->format('d/m/Y') }} +
+
+
+ + +
+
+ + {{ $relationship->relationship_type === 'spouse' ? 'WIFE' : strtoupper($relationship->relationship_type) }} + +
+
+
+ +
+ @endforeach + + +
+ +
+
+
+ +
+
Add Member
+
+
+ +
+
+ + +
+ + + + +@endsection diff --git a/resources/views/member/partials/affiliations-enhanced.blade.php b/resources/views/member/partials/affiliations-enhanced.blade.php new file mode 100644 index 0000000..b80bac5 --- /dev/null +++ b/resources/views/member/partials/affiliations-enhanced.blade.php @@ -0,0 +1,916 @@ +@php + // Helper function to calculate age at a specific date with detailed format + function calculateAgeAtDate($birthdate, $date) { + if (!$birthdate || !$date) return null; + $birth = \Carbon\Carbon::parse($birthdate); + $targetDate = \Carbon\Carbon::parse($date); + + $diff = $birth->diff($targetDate); + $parts = []; + + if ($diff->y > 0) $parts[] = $diff->y . ' year' . ($diff->y > 1 ? 's' : ''); + if ($diff->m > 0) $parts[] = $diff->m . ' month' . ($diff->m > 1 ? 's' : ''); + if ($diff->d > 0) $parts[] = $diff->d . ' day' . ($diff->d > 1 ? 's' : ''); + + return implode(' ', $parts) ?: 'Same day'; + } +@endphp + +
+
+ +
+
+
Club Affiliations & Skills Journey
+

Complete history of club memberships, skills acquired, and instructors

+
+
+ + +
+
+ + @if($clubAffiliations->count() > 0) + +
+
+
+
+ +

{{ $totalAffiliations }}

+ Total Clubs +
+
+
+
+
+
+ +

{{ $distinctSkills }}

+ Unique Skills +
+
+
+
+
+
+ +

{{ floor($totalMembershipDuration / 12) }}y {{ $totalMembershipDuration % 12 }}m

+ Total Training +
+
+
+
+
+
+ +

{{ $totalInstructors ?? 0 }}

+ Instructors +
+
+
+
+ + +
+
+
+
+
+ Membership Timeline +
+
+
+
+ @foreach($clubAffiliations as $index => $affiliation) + @php + $ageAtStart = calculateAgeAtDate($user->birthdate, $affiliation->start_date); + $ageAtEnd = $affiliation->end_date ? calculateAgeAtDate($user->birthdate, $affiliation->end_date) : null; + $isOngoing = !$affiliation->end_date; + + // Get all skills for this affiliation + $affiliationSkills = $affiliation->skillAcquisitions ?? collect(); + $skillNames = $affiliationSkills->pluck('skill_name')->unique()->implode(','); + @endphp + +
+ +
+ + +
+ +
+
+ @if($affiliation->logo) + {{ $affiliation->club_name }} + @else +
+ +
+ @endif +
+
{{ $affiliation->club_name }}
+
+ @if($affiliation->start_date) + + {{ $affiliation->start_date->format('M Y') }} - {{ $isOngoing ? 'Present' : ($affiliation->end_date ? $affiliation->end_date->format('M Y') : 'N/A') }} + + @endif + @if($affiliation->formatted_duration) + + {{ $affiliation->formatted_duration }} + + @endif + @if($ageAtStart) + + Age: {{ $ageAtStart }}{{ $ageAtEnd && $ageAtEnd != $ageAtStart ? " to $ageAtEnd" : '' }} + + @endif +
+
+ @if($isOngoing) + + Active + + @endif +
+
+ + +
+ @if($affiliation->location) +
+ + {{ $affiliation->location }} +
+ @endif + + + @if($affiliationSkills->count() > 0) +
+
+ Skills Acquired ({{ $affiliationSkills->count() }}) +
+
+ @foreach($affiliationSkills as $skill) + + {{ $skill->skill_name }} + {{ ucfirst($skill->proficiency_level) }} + + @endforeach +
+
+ @endif + + + @if($affiliation->subscriptions && $affiliation->subscriptions->count() > 0) +
+
+ Training Packages ({{ $affiliation->subscriptions->count() }}) +
+
+ @foreach($affiliation->subscriptions as $subIndex => $subscription) + @if($subscription->package) + + @endif + @endforeach +
+
+ @endif + + + @php + $instructors = $affiliationSkills->pluck('instructor')->filter()->unique('id'); + @endphp + @if($instructors->count() > 0) +
+
+ Instructors ({{ $instructors->count() }}) +
+
+ @foreach($instructors as $instructor) +
+
+
+ {{ strtoupper(substr($instructor->user->full_name ?? 'I', 0, 1)) }} +
+
+
{{ $instructor->user->full_name ?? 'Unknown' }}
+
{{ $instructor->role ?? 'Instructor' }}
+
+
+
+ @endforeach +
+
+ @endif +
+
+
+ @endforeach +
+ + + @php + $allInstructors = collect(); + foreach($clubAffiliations as $aff) { + $affInstructors = $aff->skillAcquisitions->pluck('instructor')->filter()->unique('id'); + $allInstructors = $allInstructors->merge($affInstructors); + } + $allInstructors = $allInstructors->unique('id'); + @endphp + + @foreach($allInstructors as $instructor) + + @endforeach + + + @foreach($clubAffiliations as $affiliation) + @foreach($affiliation->subscriptions as $subIndex => $subscription) + @if($subscription->package) + + @endif + @endforeach + @endforeach +
+
+
+
+ @else +
+ +
No Affiliations Yet
+

Club affiliations and skills will appear here once added

+
+ @endif +
+
+ + + + diff --git a/resources/views/member/profile-edit.blade.php b/resources/views/member/profile-edit.blade.php new file mode 100644 index 0000000..099fa56 --- /dev/null +++ b/resources/views/member/profile-edit.blade.php @@ -0,0 +1,14 @@ +@extends('layouts.app') + +@section('content') +
+ +
+ +@endsection diff --git a/resources/views/member/show.blade.php b/resources/views/member/show.blade.php new file mode 100644 index 0000000..e3f716c --- /dev/null +++ b/resources/views/member/show.blade.php @@ -0,0 +1,2550 @@ +@extends('layouts.app') + +@php + function calculateTimeDifference($date1, $date2) { + $diff = $date1->diff($date2); + $parts = []; + + if ($diff->y > 0) $parts[] = $diff->y . ' year' . ($diff->y > 1 ? 's' : ''); + if ($diff->m > 0) $parts[] = $diff->m . ' month' . ($diff->m > 1 ? 's' : ''); + if ($diff->d > 0) $parts[] = $diff->d . ' day' . ($diff->d > 1 ? 's' : ''); + + return implode(' ', $parts) ?: 'Same day'; + } +@endphp + +@section('content') +
+ + +
+
+

Member Profile

+

Comprehensive member information and analytics

+
+
+ + +
+
+ +
+ @if($relationship->dependent->profile_picture) + {{ $relationship->dependent->full_name }} + @else +
+ {{ strtoupper(substr($relationship->dependent->full_name, 0, 1)) }} +
+ @endif +
+ + +
+
+

{{ $relationship->dependent->full_name }}

+ @if($relationship->relationship_type == 'self' || Auth::id() == $relationship->guardian_user_id) + + @else + + @endif +
+ @if($relationship->dependent->motto) +

"{{ $relationship->dependent->motto }}"

+ @endif + + +
+ 🏆 {{ $awardCounts['special'] }} + 🥇 {{ $awardCounts['1st'] }} + 🥈 {{ $awardCounts['2nd'] }} + 🥉 {{ $awardCounts['3rd'] }} + 🎯 {{ $activeGoalsCount + $completedGoalsCount }} + ⭐ {{ $totalAffiliations }} +
+ + +
+ + {{ $relationship->dependent->nationality }} + + + + {{ $relationship->dependent->gender == 'm' ? 'Male' : 'Female' }} + + + + Age {{ $relationship->dependent->age }} + + @if($relationship->dependent->blood_type) + + + {{ $relationship->dependent->blood_type }} + + @endif + + @php + $horoscopeSymbols = [ + 'Aries' => '♈', + 'Taurus' => '♉', + 'Gemini' => '♊', + 'Cancer' => '♋', + 'Leo' => '♌', + 'Virgo' => '♍', + 'Libra' => '♎', + 'Scorpio' => '♏', + 'Sagittarius' => '♐', + 'Capricorn' => '♑', + 'Aquarius' => '♒', + 'Pisces' => '♓' + ]; + $horoscope = $relationship->dependent->horoscope ?? 'N/A'; + $symbol = $horoscopeSymbols[$horoscope] ?? ''; + @endphp + {{ $symbol }} {{ $horoscope }} + + @if($relationship->dependent->birthdate) + + 🎂 + + @php + $nextBirthday = $relationship->dependent->birthdate->copy()->year(now()->year); + if ($nextBirthday->isPast()) { + $nextBirthday->addYear(); + } + $diff = now()->diff($nextBirthday); + $parts = []; + if ($diff->m > 0) $parts[] = $diff->m . ' month' . ($diff->m > 1 ? 's' : ''); + if ($diff->d > 0) $parts[] = $diff->d . ' day' . ($diff->d > 1 ? 's' : ''); + echo !empty($parts) ? implode(' ', $parts) : 'Today!'; + @endphp + + + @endif + + + Active + + + + Joined {{ $relationship->dependent->created_at->format('F Y') }} + +
+ + + @if($relationship->dependent->social_links && count($relationship->dependent->social_links) > 0) +
+ @php + $socialLinks = $relationship->dependent->social_links; + ksort($socialLinks); // Sort by platform name + + $socialIcons = [ + 'facebook' => 'bi-facebook', + 'twitter' => 'X', // Special case for Twitter/X + 'instagram' => 'bi-instagram', + 'linkedin' => 'bi-linkedin', + 'youtube' => 'bi-youtube', + 'tiktok' => 'bi-tiktok', + 'snapchat' => 'bi-snapchat', + 'whatsapp' => 'bi-whatsapp', + 'telegram' => 'bi-telegram', + 'discord' => 'bi-discord', + 'reddit' => 'bi-reddit', + 'pinterest' => 'bi-pinterest', + 'twitch' => 'bi-twitch', + 'github' => 'bi-github', + 'spotify' => 'bi-spotify', + 'skype' => 'bi-skype', + 'slack' => 'bi-slack', + 'medium' => 'bi-medium', + 'vimeo' => 'bi-vimeo', + 'messenger' => 'bi-messenger', + 'wechat' => 'bi-wechat', + 'line' => 'bi-line', + ]; + $socialTitles = [ + 'facebook' => 'Facebook', + 'twitter' => 'Twitter/X', + 'instagram' => 'Instagram', + 'linkedin' => 'LinkedIn', + 'youtube' => 'YouTube', + 'tiktok' => 'TikTok', + 'snapchat' => 'Snapchat', + 'whatsapp' => 'WhatsApp', + 'telegram' => 'Telegram', + 'discord' => 'Discord', + 'reddit' => 'Reddit', + 'pinterest' => 'Pinterest', + 'twitch' => 'Twitch', + 'github' => 'GitHub', + 'spotify' => 'Spotify', + 'skype' => 'Skype', + 'slack' => 'Slack', + 'medium' => 'Medium', + 'vimeo' => 'Vimeo', + 'messenger' => 'Messenger', + 'wechat' => 'WeChat', + 'line' => 'Line', + ]; + @endphp + @foreach($socialLinks as $platform => $url) + @if(!empty($url) && isset($socialIcons[$platform])) + + @if($platform === 'twitter') + {{ $socialIcons[$platform] }} + @else + + @endif + + @endif + @endforeach +
+ @endif +
+
+
+ + + + + +
+ +
+ +
+ +
+
+
+
+ +
Profile Statistics
+
+

Key performance metrics and milestones

+ +
+ +
+
+
+ +
+
+
Total Sessions
+
127
+
+
+
+ Sessions completed this year +
+
+
+ + + + +
+
+
+ +
+
+
Attendance Rate
+
85%
+
+
+
+ Average session attendance +
+
+
+ + + + +
+
+
+ +
+
+
Achievements
+
8
+
+
+
+ Total badges earned +
+
+
+ + +
+
+
+ +
+
+
Goal Completion
+
75%
+
+
+
+ Current goals achieved +
+
+
+
+
+
+
+ + +
+
+
+
+ +
Self Investment Chart
+
+

Self investment analytics over time

+ +
+
+ +

Revenue chart visualization coming soon...

+ Chart will display revenue trends over time +
+
+
+
+
+
+ + +
+
+
+ +
Complete Payment & Revenue History
+
+

All package payments and revenue transactions in one view

+ +
+ + + + + + + + + + + + + + + + @forelse($invoices as $invoice) + + + + + + + + + + + + @empty + + + + @endforelse + +
DateTransaction TypePackage/ItemDurationSessionsAmountStatusMethodEvidence
{{ $invoice->created_at->format('Y-m-d') }}Invoice{{ $invoice->tenant->club_name ?? 'N/A' }}--{{ $invoice->amount }} BHD + @if($invoice->status == 'paid') + ✓ Paid + @elseif($invoice->status == 'due') + ○ Due + @else + {{ ucfirst($invoice->status) }} + @endif + - + + +
No invoices found
+
+
+
+ + +
+ + +
+
+
+
+
+

Member Attendance

+

Track your gym session attendance and performance

+
+
+ + +
+
+
+
+
{{ $sessionsCompleted }}
+
Sessions Completed
+
+
+
+
+
+
+
{{ $noShows }}
+
No Shows
+
+
+
+
+
+
+
{{ $attendanceRate }}%
+
Attendance Rate
+
+
+
+
+ + +
+
+
Session History
+
+
+
+ + + + + + + + + + + + @forelse($attendanceRecords as $record) + + + + + + + + @empty + + + + @endforelse + +
Date & TimeSession TypeTrainer NameStatusNotes
+
{{ $record->session_datetime->format('M j, Y') }}
+ {{ $record->session_datetime->format('g:i A') }} + 		{{ $record->session_type }}{{ $record->trainer_name }} + @if($record->status === 'completed') + Completed + @else + No Show + @endif + + {{ $record->notes ?: '-' }} +
+ +

No attendance records found

+
+
+
+
+
+
+
+ + +
+ +
+
+
+ +
Health Metrics Overview
+
+ +
+

Monitor health metrics and progress over time

+ + @if($latestHealthRecord) + @php + $latestDate = $latestHealthRecord->recorded_at; + $now = \Carbon\Carbon::now(); + $diff = $latestDate->diff($now); + @endphp + +
+
+ + Snapshot Date: + {{ $latestDate->format('F j, Y') }} +
+
+
+ + Time Since: + + @if($diff->y > 0) + {{ $diff->y }} {{ $diff->y == 1 ? 'year' : 'years' }} + @endif + @if($diff->m > 0) + {{ $diff->m }} {{ $diff->m == 1 ? 'month' : 'months' }} + @endif + @if($diff->d > 0) + {{ $diff->d }} {{ $diff->d == 1 ? 'day' : 'days' }} + @endif + ago + +
+
+ @else +
No health records available
+ @endif +
+ + +
+ @if($latestHealthRecord) + +
+
+ +
{{ $latestHealthRecord->weight ?? 'N/A' }}
+ Weight (kg) +
+
+ + +
+
+ +
{{ $latestHealthRecord->body_fat_percentage ?? 'N/A' }}%
+ Body Fat +
+
+ + +
+
+ +
{{ $latestHealthRecord->body_water_percentage ?? 'N/A' }}%
+ Body Water +
+
+ + +
+
+ +
{{ $latestHealthRecord->muscle_mass ?? 'N/A' }}
+ Muscle Mass +
+
+ + +
+
+ +
{{ $latestHealthRecord->bone_mass ?? 'N/A' }}
+ Bone Mass +
+
+ + +
+
+ +
{{ $latestHealthRecord->bmr ?? 'N/A' }}
+ BMR (cal) +
+
+ @else +
+
+ +

No health metrics available

+
+
+ @endif +
+
+
+ + +
+ +
+
+
+
Body Composition Analysis
+ +
+ +
+
+
+
+ + +
+
+
+
Compare
+ + @if($comparisonRecords->count() >= 2) + @php + $current = $comparisonRecords->first(); + $previous = $comparisonRecords->skip(1)->first(); + @endphp + +
+
+
+ + +
+
+ + +
+
+
+
+ @if($current && $previous) + Time between records: {{ calculateTimeDifference($current->recorded_at, $previous->recorded_at) }} + @else + Select dates to see time difference + @endif +
+
+
+ +
+ + + + + + + + + + + @php + function getChangeIcon($current, $previous) { + if ($current > $previous) return ''; + if ($current < $previous) return ''; + return ''; + } + @endphp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MetricCurrentPreviousChange
Height{{ $current->height ?? 'N/A' }}cm{{ $previous->height ?? 'N/A' }}cm{!! $current->height && $previous->height ? getChangeIcon($current->height, $previous->height) : '-' !!}
Weight{{ $current->weight ?? 'N/A' }}kg{{ $previous->weight ?? 'N/A' }}kg{!! $current->weight && $previous->weight ? getChangeIcon($current->weight, $previous->weight) : '-' !!}
Body Fat{{ $current->body_fat_percentage ?? 'N/A' }}%{{ $previous->body_fat_percentage ?? 'N/A' }}%{!! $current->body_fat_percentage && $previous->body_fat_percentage ? getChangeIcon($current->body_fat_percentage, $previous->body_fat_percentage) : '-' !!}
BMI{{ $current->bmi ?? 'N/A' }}{{ $previous->bmi ?? 'N/A' }}{!! $current->bmi && $previous->bmi ? getChangeIcon($current->bmi, $previous->bmi) : '-' !!}
Body Water{{ $current->body_water_percentage ?? 'N/A' }}%{{ $previous->body_water_percentage ?? 'N/A' }}%{!! $current->body_water_percentage && $previous->body_water_percentage ? getChangeIcon($current->body_water_percentage, $previous->body_water_percentage) : '-' !!}
Muscle Mass{{ $current->muscle_mass ?? 'N/A' }}kg{{ $previous->muscle_mass ?? 'N/A' }}kg{!! $current->muscle_mass && $previous->muscle_mass ? getChangeIcon($current->muscle_mass, $previous->muscle_mass) : '-' !!}
Bone Mass{{ $current->bone_mass ?? 'N/A' }}kg{{ $previous->bone_mass ?? 'N/A' }}kg{!! $current->bone_mass && $previous->bone_mass ? getChangeIcon($current->bone_mass, $previous->bone_mass) : '-' !!}
Visceral Fat{{ $current->visceral_fat ?? 'N/A' }}{{ $previous->visceral_fat ?? 'N/A' }}{!! $current->visceral_fat && $previous->visceral_fat ? getChangeIcon($current->visceral_fat, $previous->visceral_fat) : '-' !!}
BMR{{ $current->bmr ?? 'N/A' }}cal{{ $previous->bmr ?? 'N/A' }}cal{!! $current->bmr && $previous->bmr ? getChangeIcon($current->bmr, $previous->bmr) : '-' !!}
Protein{{ $current->protein_percentage ?? 'N/A' }}%{{ $previous->protein_percentage ?? 'N/A' }}%{!! $current->protein_percentage && $previous->protein_percentage ? getChangeIcon($current->protein_percentage, $previous->protein_percentage) : '-' !!}
Body Age{{ $current->body_age ?? 'N/A' }}yrs{{ $previous->body_age ?? 'N/A' }}yrs{!! $current->body_age && $previous->body_age ? getChangeIcon($current->body_age, $previous->body_age) : '-' !!}
+
+ @else +
+ +

Need at least 2 health records to compare

+
+ @endif +
+
+
+
+ + +
+
+
Health Tracking
+ + @if($healthRecords->count() > 0) +
+ + + + + + + + + + + + + + + + + + + @foreach($healthRecords as $record) + + + + + + + + + + + + + + + + @endforeach + +
DateHeight (cm)Weight (kg)Body Fat %BMIBody Water %Muscle Mass (kg)Bone Mass (kg)Visceral FatBMRProtein %Body Age
{{ $record->recorded_at->format('M j, Y') }}{{ $record->height ?? '-' }}{{ $record->weight ?? '-' }}{{ $record->body_fat_percentage ?? '-' }}{{ $record->bmi ?? '-' }}{{ $record->body_water_percentage ?? '-' }}{{ $record->muscle_mass ?? '-' }}{{ $record->bone_mass ?? '-' }}{{ $record->visceral_fat ?? '-' }}{{ $record->bmr ?? '-' }}{{ $record->protein_percentage ?? '-' }}{{ $record->body_age ?? '-' }} + +
+
+ + +
+ {{ $healthRecords->links() }} +
+ @else +
+ +

No health records found

+ Health tracking data will appear here once records are added +
+ @endif +
+
+
+ + +
+
+
+ +
+
+
Goal Tracking
+

Set, track, and achieve your fitness objectives.

+
+
+ + +
+ +
+
+
+ +

{{ $activeGoalsCount }}

+ Active Goals +
+
+
+ +
+
+
+ +

{{ $completedGoalsCount }}

+ Completed Goals +
+
+
+ +
+
+
+ +

{{ $successRate }}%

+ Success Rate +
+
+
+
+ + + @if($goals->count() > 0) +
+ @foreach($goals as $goal) +
+
+ + @if($goal->status == 'active' && ($relationship->relationship_type == 'self' || Auth::id() == $relationship->guardian_user_id)) + + @endif + +
+ +
+
+ @if($goal->icon_type == 'dumbbell') + + @elseif($goal->icon_type == 'clock') + + @else + + @endif +
+
+
{{ $goal->title }}
+ @if($goal->description) +

{{ $goal->description }}

+ @endif +
+
+ + +
+
+ Progress: {{ number_format($goal->current_progress_value, 1) }} / {{ number_format($goal->target_value, 1) }} {{ $goal->unit }} + {{ number_format($goal->progress_percentage, 1) }}% +
+
+
+
+
+ + +
+
+ Started: + {{ $goal->start_date->format('M d, Y') }} +
+
+ Target: + {{ $goal->target_date->format('M d, Y') }} +
+
+ + +
+ + {{ ucfirst($goal->status) }} + + + {{ ucfirst($goal->priority_level) }} + +
+
+
+
+ @endforeach +
+ @else +
+ +
No Goals Set Yet
+

Start your fitness journey by setting your first goal!

+
+ @endif +
+
+
+ + +
+ @include('member.partials.affiliations-enhanced') +
+ + +
+ +
+
+ +
+
+
Tournament & Event Participation
+

Proven champion with multiple championship wins and prestigious awards.

+
+ +
+ + +
+
+ + +
+
+
+
+ +

{{ $awardCounts['special'] }}

+ Special Award +
+
+
+
+
+
+ +

{{ $awardCounts['1st'] }}

+ 1st Place +
+
+
+
+
+
+ +

{{ $awardCounts['2nd'] }}

+ 2nd Place +
+
+
+
+
+
+ +

{{ $awardCounts['3rd'] }}

+ 3rd Place +
+
+
+
+
+
+ + +
+
+
Tournament & Championships History
+ + @if($tournamentEvents->count() > 0) +
+ + + + + + + + + + + @foreach($tournamentEvents as $event) + + + + + + + @endforeach + +
Tournament DetailsClub AffiliationPerformance & ResultNotes & Media
+
{{ $event->title }}
+
+ {{ ucfirst($event->type) }} + {{ $event->sport }} +
+
+ {{ $event->date->format('M j, Y') }} + @if($event->time) + {{ $event->time->format('H:i') }} + @endif + @if($event->location) + {{ $event->location }} + @endif + @if($event->participants_count) + {{ $event->participants_count }} participants + @endif +
+ 		+ @if($event->clubAffiliation) +
+
{{ $event->clubAffiliation->club_name }}
+
{{ $event->clubAffiliation->location }}
+
+ @else + Individual + @endif + 		+ @if($event->performanceResults->count() > 0) + @foreach($event->performanceResults as $result) +
+ @if($result->medal_type == '1st') + + 1st Place + @elseif($result->medal_type == '2nd') + + 2nd Place + @elseif($result->medal_type == '3rd') + + 3rd Place + @elseif($result->medal_type == 'special') + + Special Award + @endif + @if($result->points) + {{ $result->points }} pts + @endif +
+ @if($result->description) + {{ $result->description }} + @endif + @endforeach + @else + No results recorded + @endif + 		+ @if($event->notesMedia->count() > 0) + @foreach($event->notesMedia as $note) + @if($note->note_text) +

{{ $note->note_text }}

+ @endif + @if($note->media_link) + + View Media + + @endif + @endforeach + @else + No notes available + @endif +
+
+ @else +
+ +

No tournament records found

+ Tournament participation will appear here once records are added +
+ @endif +
+
+
+ + +
+
+
+
Event Participation
+

Event history coming soon...

+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +@endsection diff --git a/resources/views/vendor/takeone/components/widget.blade.php b/resources/views/vendor/takeone/components/widget.blade.php index 383c1e9..8e0da92 100644 --- a/resources/views/vendor/takeone/components/widget.blade.php +++ b/resources/views/vendor/takeone/components/widget.blade.php @@ -27,7 +27,6 @@ .cropme-wrapper { overflow: hidden !important; border-radius: 8px; } .cropme-slider { display: none !important; } .takeone-canvas { - height: 400px; background: #111; border-radius: 8px; position: relative; @@ -117,15 +116,15 @@ @push('modals')