Merge branch 'master' of https://revinr.site/mostafij-revinr/student-admission

app/User.php

@@ -83,4 +83,11 @@ class User extends Authenticatable
         return $this->belongsTo('App\Models\University', 'university_id');
     } 
 
+    public function wishlist_teacher()
+    {
+        return $this->belongsTo('App\User', 'wishlist_teacher_id','id');
+    } 
+
+
+
 }

resources/views/admin/admin_profile.blade.php

@@ -653,10 +653,8 @@ tbody, td, tfoot, th, thead, tr {
                                                                             <tr>
                                                                                 <th>Sl</th>
                                                                                 <th>Name</th>
-                                                                                <th>Email</th>
-                                                                                {{-- <th>Signed Up</th>
-                                                                                <th class="text-center">Application</th> --}}
-                                                                                <th class="text-center" style="width: 12%;">Action</th>
+                                                                                <th>Supervisor Name</th>
+                                                                                <th>Invited</th>
                                                                             </tr>
                                                                         </thead>
                                                                         <tbody>
@@ -674,20 +672,35 @@ tbody, td, tfoot, th, thead, tr {
                                                                                                             @endif --}}
                                                                                                             <div class="inner_right ms-2 mt-1">
                                                                                                                 <strong style="font-size:13px;">{{$row->first_name}} {{$row->last_name }}</strong></br>
-                                                                                                                @if(!empty($row->invitation_date)){{utc_to_ltz($row->invitation_date, 'd M Y g:i A', local_tz($admin))}} @else @endif
+                                                                                                                <span style="font-size: 11px;">{{$row->email}}</span>
+                                                                                                               
                                                                                                             </div>
                                                                                                         </div>
                                                                                                     </div>
                                                                                                 </div>
                                                                                             </div>
                                                                                         </td>
-                                                                                        <td style="font-size: 11px;">{{$row->email}}
+                                                                                        <td style="font-size: 11px;">
                                                                                             <div class="mt-1">
-                                                                                                {{-- @if($row->email_verification ==1)
-                                                                                                    <span class="label_badge_radius" style="background-color: #d8fdd8; color: green;">verified</span>
+                                                                                                <strong style="font-size:13px;">{{ cn($row,'wishlist_teacher.first_name','')}} {{ cn($row,'wishlist_teacher.last_name','')}}</strong><br>
+                                                                                                <span style="font-size:12px; font-weight:400;"> {{cn($row,'wishlist_teacher.designation','')}} </span> <br>
+                                                                                                
+                                                                                                @if(isset($row->wishlist_teacher->others_department))
+                                                                                                    <span style="font-size:12px; font-weight:400;">{{cn($row,'wishlist_teacher.others_department','')}}</span>
                                                                                                 @else
-                                                                                                <span class="label_badge_radius" style="background-color: #f9edc7; color: rgb(228, 139, 38);">pending</span>
-                                                                                                @endif --}}
+                                                                                                    <span style="font-size:12px; font-weight:400;"> {{cn($row,'wishlist_teacher.department_name.name','')}}</span>
+                                                                                                @endif
+                                                                                                <span> • </span>
+                                                                                                @if(isset($row->wishlist_teacher->university_name))
+                                                                                                <span style="font-size:12px; font-weight:400;">{{ cn($row,'wishlist_teacher.university_name','')}}</span>
+                                                                                                @else
+                                                                                                <span style="font-size:12px; font-weight:400;"> {{ $row->wishlist_teacher->university->name ?? ''}}</span>
+                                                                                                @endif 
+                                                                                            </div> 
+                                                                                        </td>
+                                                                                        <td style="font-size: 11px;">
+                                                                                            <div class="mt-1">
+                                                                                                @if(!empty($row->invitation_date)){{utc_to_ltz($row->invitation_date, 'd M Y g:i A', local_tz($admin))}} @else @endif
                                                                                             </div> 
                                                                                         </td>
                                                                                        
@@ -695,7 +708,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                                 @endforeach
                                                                             @else
                                                                             <tr>
-                                                                                <td colspan="6" class="text-center">
+                                                                                <td colspan="3" class="text-center">
                                                                                     <span class="text-danger">No data found!</span>
                                                                                 </td>
                                                                             </tr>