Browse Source

University Modiifed

Md.Mostafijur Rahman 1 year ago
parent
commit
66ebbbf27f

+ 60 - 58
app/Http/Controllers/AjaxController.php

@@ -171,7 +171,7 @@ class AjaxController extends Controller
             $validator=\Validator::make($req->all(), [
                 'first_name'=>'required',
                 'last_name'=>'required',
-                'university_name'=>'required',
+                'university_id'=>'required',
                 'department'=>'required',
                 'designation'=>'required',
             ]);
@@ -184,8 +184,10 @@ class AjaxController extends Controller
             $data = User::find($req->id);
             $data->first_name =$req->first_name;
             $data->last_name =$req->last_name;
-            $data->university_name =$req->university_name;
+            $data->university_id =$req->university_id;
+            $data->university_name =NULL;
             $data->department =$req->department;
+            $data->others_department =NULL;
             $data->designation =$req->designation;
             $data->update();
 
@@ -321,17 +323,17 @@ class AjaxController extends Controller
                 ['msg'=>'Updated successfully.']
             );
 
-        }elseif($name=="proposal_status_update"){ 
+        }elseif($name=="proposal_status_update"){
             $data =StudentProposal::find($req->id);
             $data->proposal_status =$req->value;
             $data->proposal_status_date =now();
-            $data->feedback_msg =NULL;   
+            $data->feedback_msg =NULL;
             $data->update();
 
-            if($req->value){ 
+            if($req->value){
                 $user_data = User::find($data->student_id);
                 $user_data->freez_profile =2;  // 2 = [In Review,Pause,Interested]
-                $user_data->update(); 
+                $user_data->update();
             }
 
             return response(
@@ -346,7 +348,7 @@ class AjaxController extends Controller
             if($validator->fails()){
                 $errors=$validator->errors()->all();
                 return response(['msg'=>$errors[0]], 422);
-            } 
+            }
 
             $data =StudentProposal::find($req->id);
             $data->proposal_status =$req->proposal_status;
@@ -356,15 +358,15 @@ class AjaxController extends Controller
 
             if($req->proposal_status ==3){ // 3= rejected
                 $user_rejected = User::find($data->student_id);
-                $user_rejected->freez_profile =0; 
-                $user_rejected->update(); 
+                $user_rejected->freez_profile =0;
+                $user_rejected->update();
             }
 
             return response(
                 ['msg'=>'Updated successfully.']
             );
 
-        }elseif($name=="accept_status_update"){ 
+        }elseif($name=="accept_status_update"){
 
             $data =StudentProposal::find($req->id);
             $data->accepted_status =1;
@@ -415,17 +417,17 @@ class AjaxController extends Controller
 
             $user_check_data =User::where('email',$req->email)->where('user_type',1)->doesntExist();
 
-            if($user_check_data){ 
+            if($user_check_data){
                $user_data =new User;
                $user_data->first_name =$req->name;
-               $user_data->email =$req->email; 
+               $user_data->email =$req->email;
                $user_data->user_type =1;
-               $user_data->status =0; 
+               $user_data->status =0;
                $user_data->register_type =3; // 1=invitation ; 2= landing/wishlish; 3 =q_form ; 4=student_wishlist
                $user_data->invitation_date =now();
                $user_data->wishlist_teacher_id =$req->id;
                $user_data->save();
-            } 
+            }
 
             $user =User::where('email',$req->email)->where('user_type',1)->first();
 
@@ -438,8 +440,8 @@ class AjaxController extends Controller
             $refer->save();
 
             if($refer->save()){
-                $user_teacher = User::find($refer->teacher_id); 
-                $data['name'] = $refer->name; 
+                $user_teacher = User::find($refer->teacher_id);
+                $data['name'] = $refer->name;
                 $data['student_id'] = $user->id;
                 $data['teacher'] = $user_teacher->first_name.' '.$user_teacher->last_name;
                 $data['designation'] = $user_teacher->designation;
@@ -488,18 +490,18 @@ class AjaxController extends Controller
             )->where(
                 'sign_up',1
             )->first();
- 
 
-            if($user_check){  
-               // return redirect()->to("/login")->with('success','You are already registered. Please login here.'); 
+
+            if($user_check){
+               // return redirect()->to("/login")->with('success','You are already registered. Please login here.');
                return response(
-                ['msg'=>'You are already registered.','action'=>'redirect'] 
-            
+                ['msg'=>'You are already registered.','action'=>'redirect']
+
             );
 
             }else{
 
-                $user_data = User::find($req->id);  
+                $user_data = User::find($req->id);
                 $user_data->first_name =$req->first_name;
                 $user_data->last_name =$req->last_name;
                 $user_data->first_name =$req->first_name;
@@ -513,9 +515,9 @@ class AjaxController extends Controller
                 //$user_data->email_verification=1;
                 $user_data->remember_token=$token;
                 //$user_data->email_verified_at=now();
-                $user_data->update(); 
+                $user_data->update();
+
 
-                 
                 $data['name'] = $user_data->first_name .' '.$user_data->last_name;
                 $data['token']=$token;
                 $data['receive_email']=$user_data->email;
@@ -525,14 +527,14 @@ class AjaxController extends Controller
                 Mail::send('email.q_apply_wishlist_registration_email',$data, function ($message) use ($user_mail,$from) {
                     $message->from($from);
                     $message->to($user_mail)->subject('Thank You for joining us!');
-                }); 
+                });
             }
             return response(
                 ['msg'=>'Successfully saved. Please check your email for verify.']
             );
 
         }elseif($name=="invitation_register_save"){
-             
+
             $validator=\Validator::make($req->all(), [
                 'first_name'=>'required',
                 'last_name'=>'required',
@@ -553,7 +555,7 @@ class AjaxController extends Controller
                 return response(['msg'=>$errors[0]], 422);
             }
 
-            
+
 
             $user_check = User::where(
                 'id',$req->id
@@ -562,16 +564,16 @@ class AjaxController extends Controller
             )->where(
                 'sign_up',1
             )->first();
- 
 
-            if($user_check){  
-                //return redirect()->to("/login")->with('success','You are already registered. Please login here.'); 
-                
+
+            if($user_check){
+                //return redirect()->to("/login")->with('success','You are already registered. Please login here.');
+
                 return response(
-                    ['msg'=>'You are already registered.','action'=>'redirect'] 
+                    ['msg'=>'You are already registered.','action'=>'redirect']
                 );
 
-            }else{ 
+            }else{
 
                 $user_data = User::find($req->id);
 
@@ -599,7 +601,7 @@ class AjaxController extends Controller
                 $user_data->password =Hash::make($req->password);
                 $user_data->status =1;
                 $user_data->sign_up = 1; // 1=signup
-                $user_data->user_type = 2;  
+                $user_data->user_type = 2;
                 $user_data->registered_date = now();
                 $user_data->update();
 
@@ -705,7 +707,7 @@ class AjaxController extends Controller
                 'last_name'=>'required',
                 'university'=>'required',
                 'department'=>'required',
-                'designation'=>'required', 
+                'designation'=>'required',
             ]);
 
             if($validator->fails()){
@@ -715,7 +717,7 @@ class AjaxController extends Controller
 
             $user_data = User::find($req->edit_id);
             $user_data->first_name =$req->first_name;
-            $user_data->last_name =$req->last_name; 
+            $user_data->last_name =$req->last_name;
             $user_data->university_id =$req->university;
             $user_data->university_name = NULL;
             $user_data->department =$req->department;
@@ -775,7 +777,7 @@ class AjaxController extends Controller
                 'msg'=>'Successfully updated.'
             ]);
         }elseif($name=="add_proposal_publication"){
-            $student=Auth::user(); 
+            $student=Auth::user();
 
             $validator=\Validator::make($req->all(), [
                 'publication'=>'required',
@@ -822,7 +824,7 @@ class AjaxController extends Controller
             return response([
                 'msg'=>'Successfully deleted.'
             ]);
-        }elseif($name=="is_attended_conference_status"){ 
+        }elseif($name=="is_attended_conference_status"){
 
             $data =User::find($req->uid);
             if($req->checked =='yes'){
@@ -836,7 +838,7 @@ class AjaxController extends Controller
             return response([
                 'msg'=>'Successfully saved.'
             ]);
-             
+
         }elseif($name=="work_experience_status_update"){
             $data =User::find($req->uid);
             if($req->value =='yes'){
@@ -863,7 +865,7 @@ class AjaxController extends Controller
             return response([
                 'msg'=>'Successfully saved.'
             ]);
-        
+
         }elseif($name=="education_status_update"){
             $data =User::find($req->uid);
             if($req->value =='yes'){
@@ -884,22 +886,22 @@ class AjaxController extends Controller
                 'academiclevel'=>'required',
                 'subject'=>'required',
                 'institution'=>'required',
-                'passingyear'=>'required', 
+                'passingyear'=>'required',
                 'result'=>'required',
             ]);
 
             if($validator->fails()){
                 $errors=$validator->errors()->all();
                 return response(['msg'=>$errors[0]], 422);
-            } 
-            
+            }
+
             $institution= Institution::find($req->edit_id);
             $institution->student_id= $student->id;
             $institution->academic_level= $req->academiclevel;
             $institution->subject= $req->subject;
             $institution->institution= $req->institution;
-            $institution->passing_year= $req->passingyear; 
-            $institution->result= $req->result; 
+            $institution->passing_year= $req->passingyear;
+            $institution->result= $req->result;
             $institution->update();
             return response([
                 'msg'=>'Successfully updated.'
@@ -917,7 +919,7 @@ class AjaxController extends Controller
                 'testdate'=>'required',
                 'expirationdate'=>'required',
                 'testname'=>'required',
-                'overallscore'=>'required', 
+                'overallscore'=>'required',
                 'listening'=>'required',
                 'speaking'=>'required',
                 'writing'=>'required',
@@ -927,7 +929,7 @@ class AjaxController extends Controller
             if($validator->fails()){
                 $errors=$validator->errors()->all();
                 return response(['msg'=>$errors[0]], 422);
-            }  
+            }
 
             $score= Score::find($req->edit_id);
             $score->student_id= $student->id;
@@ -951,20 +953,20 @@ class AjaxController extends Controller
                 'msg'=>'Successfully deleted.'
             ]);
         }elseif($name=="update_work_experience"){
-            $student=Auth::user(); 
+            $student=Auth::user();
 
             $validator=\Validator::make($req->all(), [
                 'companyname'=>'required',
                 'designation'=>'required',
                 'startdate'=>'required',
-                'enddate'=>'required', 
+                'enddate'=>'required',
             ]);
 
             if($validator->fails()){
                 $errors=$validator->errors()->all();
                 return response(['msg'=>$errors[0]], 422);
-            }  
- 
+            }
+
             $work_experience= Workexperience::find($req->edit_id);
             $work_experience->student_id= $student->id;
             $work_experience->company_name= $req->companyname;
@@ -974,11 +976,11 @@ class AjaxController extends Controller
             }else{
                 $work_experience->currently_working=0;
             }
-           
+
             $work_experience->start_date= date($req->startdate.'-'.$req->startmonth.'-01');
             $work_experience->end_date= date($req->enddate.'-'.$req->endmonth.'-01');
             $work_experience->update();
-            
+
             return response([
                 'msg'=>'Successfully updated.'
             ]);
@@ -1005,26 +1007,26 @@ class AjaxController extends Controller
             Publication::where('student_id',$req->uid)->delete();
             return response([
                 'msg'=>'Successfully delete.'
-            ]); 
-         
+            ]);
+
         }elseif($name=="all_education_history_delete"){
             Institution::where('student_id',$req->uid)->delete();
             return response([
                 'msg'=>'Successfully delete.'
             ]);
-             
+
         }elseif($name=="all_work_experience_delete"){
             Workexperience::where('student_id',$req->uid)->delete();
             return response([
                 'msg'=>'Successfully delete.'
             ]);
-             
+
         }elseif($name=="all_test_score_delete"){
             Score::where('student_id',$req->uid)->delete();
             return response([
                 'msg'=>'Successfully delete.'
             ]);
-             
+
         }
 
 

+ 9 - 9
resources/views/admin/sub_contents/load_profile_info.blade.php

@@ -1,5 +1,5 @@
-@extends('admin.sub_contents.base')  
-@section('main') 
+@extends('admin.sub_contents.base')
+@section('main')
 <div class="single_glance_row mt-5">
     <span class="title" style="font-size:11px; font-weight: 600;">Name :</span>
     <span class="tbl2 mb-2">
@@ -12,11 +12,11 @@
 </div>
 <div class="single_glance_row mt-1" style="display: flex;">
     <span class="title" style="font-size:11px; font-weight: 600;">University Name : </span>
-    <span style="font-size: 11px; color: #868e96;"> 
+    <span style="font-size: 11px; color: #868e96;">
         @if($tuser->university_name)
-        $tuser->university_name
+        {{ $tuser->university_name }}
         @else
-        {{cn($tuser,'university.name','') }} 
+        {{cn($tuser,'university.name','') }}
         @endif
     </span>
 </div>
@@ -27,10 +27,10 @@
     @else
         <span style="font-size: 11px; color: #868e96;"> {{ cn($tuser,'department_name.name','')}}</span>
     @endif
-</div>   
+</div>
 <div class="single_glance_row mt-1" style="display: flex;">
     <span class="title" style="font-size:11px; font-weight: 600;">Designation : </span>
     <span class="ms-1" style="font-size: 11px; color: #868e96;"> {{$tuser->designation}} </span>
-</div>     
- 
-@endsection
+</div>
+
+@endsection

+ 11 - 7
resources/views/admin/sub_contents/load_ref_no_available_info.blade.php

@@ -5,10 +5,10 @@
     <div class="col-md-12">
         <div class="row">
             <div class="col-md-10">
-                <div class="uni_details" style="display:flex;">  
-                    @if($teacher->university) 
+                <div class="uni_details" style="display:flex;">
+                    @if($teacher->university)
                     <img class="img-responsive listFlag mt-2" style="border-radius: 2px; padding: 0px;height: 45px; width: 45px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($teacher,'university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
-                    {{-- @else 
+                    {{-- @else
                     {{-- <div class="inner_left mt-1" style="background-color: #141639c4; padding: 18px 0px 0px 0px; height: 47px; width: 56px; margin-top: 9px !important;">
                         <p style="color:white; font-weight:600 !important; letter-spacing: 2px; text-align: center; margin-top: -8px; font-size: 17px;">{{ name_initials($teacher->first_name, $teacher->last_name) }}</p>
                     </div> --}}
@@ -16,14 +16,18 @@
                     <div class="alert" style="background-color:white; padding: 3px 7px; margin-bottom: 0px;">
                         <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
                         <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br>
-                        @if(isset($teacher->department_name))
-                            <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'department_name.name','')}}</span>
-                        @else
+                        @if($teacher->others_department)
                             <span class="text-muted" style="font-weight: 500;">{{$teacher->others_department}}</span>
+                        @else
+                            <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'department_name.name','')}}</span>
                         @endif
 
                         <span>.</span>
-                        <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'university.name','')}}</span>
+                        @if($teacher->university_name)
+                            <span class="text-muted" style="font-weight: 500;">{{$teacher->university_name}}</span>
+                        @else
+                            <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'university.name','')}}</span>
+                        @endif
                     </div>
                 </div>
             </div>

+ 14 - 8
resources/views/home.blade.php

@@ -3,7 +3,7 @@
         <section class="bg-half-170 d-table w-100" style="background-color: #efefef; height: 100vh;">
             <div class="container mt-5 pt-4" style="padding: 10px 20px 0px 20px;">
                 <div class="col-md-12">
-                    
+
                     @if(\Auth::user()->email_verification==0)
                         <div class="col md-4 mt-1">
                             <div class="col-md-12">
@@ -126,21 +126,27 @@
                                                         <td style="font-size: 12px;">
                                                             <div class="d-flex">
                                                                 @if($row->teacher_details->university)
-                                                                    <img class="img-responsive listFlag mt-2" style="border-radius: 2px; padding: 0px;height: 35px; width: 35px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($row,'teacher_details.university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top"> 
+                                                                    <img class="img-responsive listFlag mt-2" style="border-radius: 2px; padding: 0px;height: 35px; width: 35px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($row,'teacher_details.university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
                                                                 @endif
                                                                 <div class="alert" style="background-color:white; padding: 3px 7px; margin-bottom: 0px;">
                                                                 <strong class="ml-2">{{ cn($row,'teacher_details.first_name','')}} {{ cn($row,'teacher_details.last_name','')}}</strong><br>
                                                                 <span class="ml-2" style="font-weight: 300;">{{cn($row,'teacher_details.designation','')}}</span>
                                                                 </div>
                                                             </div>
-                                                        
+
                                                         </td>
-                                                        <td style="font-size: 12px;">{{cn($row,'teacher_details.university.name','')}}</br>
+                                                        <td style="font-size: 12px;">
+                                                            @if($row->teacher_details->university_name)
+                                                               {{cn($row,'teacher_details.university_name','')}}
+                                                            @else
+                                                              {{cn($row,'teacher_details.university.name','')}}
+                                                            @endif
+                                                        </br>
                                                         <span>
-                                                            @if(isset($row->teacher_details->department_name))
-                                                            {{cn($row,'teacher_details.department_name.name','')}}
+                                                            @if($row->teacher_details->others_department)
+                                                                <span style="font-size: 12px; color: #868e96;">{{cn($row,'teacher_details.others_department','')}}</span>
                                                             @else
-                                                            <span style="font-size: 12px; color: #868e96;">{{cn($row,'teacher_details.others_department','')}}</span>
+                                                            <span style="font-size: 12px; color: #868e96;"> {{cn($row,'teacher_details.department_name.name','')}} </span>
                                                             @endif
 
                                                         </span></td>
@@ -258,7 +264,7 @@
             }
         });
 
-        $('.ref_button').on('click', function(){ 
+        $('.ref_button').on('click', function(){
             $('#teacher_ref_no').val("");
         });
 

+ 8 - 4
resources/views/modal_pages/apply_student_proposal.blade.php

@@ -21,13 +21,17 @@
                         <div class="alert" style="background-color:white; padding: 3px 7px; margin-bottom: 0px;">
                             <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
                             <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br>
-                            @if(isset($teacher->department_name))
-                                <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'department_name.name','')}}</span>
-                            @else
+                            @if($teacher->others_department)
                                 <span class="text-muted" style="font-weight: 500;">{{$teacher->others_department}}</span>
+                            @else
+                                <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'department_name.name','')}}</span>
                             @endif
                             <span> . </span>
-                            <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'university.name','')}}</span>
+                            @if($teacher->university_name)
+                                <span class="text-muted" style="font-weight: 500;">{{$teacher->university_name}}</span>
+                            @else
+                                <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'university.name','')}}</span>
+                            @endif
                         </div>
                     </div>
 

+ 35 - 31
resources/views/modal_pages/view_apply_proposal.blade.php

@@ -1,30 +1,34 @@
 @extends('modal_pages.base')
 
 @section('main')
- 
+
     <div class="container mt-2">
         <div class="col-md-12">
-            <div class="alert p-3" style="background-color:white;"> 
+            <div class="alert p-3" style="background-color:white;">
                 <div class="d-flex">
-                    @if(cn($std_proposal,'teacher_details.university','')) 
+                    @if(cn($std_proposal,'teacher_details.university',''))
                         <img class="img-responsive listFlag mt-2" style="border-radius: 2px; padding: 0px;height: 45px; width: 45px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($std_proposal,'teacher_details.university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
                     @endif
-                    
+
                     <div class="alert" style="background-color:white; padding: 3px 7px; margin-bottom: 0px;">
                         <span style="margin: 0px;">{{cn($std_proposal,'teacher_details.first_name','')}} {{cn($std_proposal,'teacher_details.last_name','')}}</span></br>
                         <span style="font-weight: 500;">{{cn($std_proposal,'teacher_details.designation','')}}</span></br>
-                        @if(isset($std_proposal->teacher_details->department_name))
-                            <span style="font-weight: 500; font-size: 10px;">{{cn($std_proposal,'teacher_details.department_name.name','')}}</span>
+                        @if($std_proposal->teacher_details->others_department)
+                        <span style="font-weight: 500; font-size: 10px;">{{cn($std_proposal,'teacher_details.others_department','')}}</span>
                         @else
-                            <span style="font-weight: 500; font-size: 10px;">{{cn($std_proposal,'teacher_details.others_department','')}}</span>
-                        @endif 
+                        <span style="font-weight: 500; font-size: 10px;">{{cn($std_proposal,'teacher_details.department_name.name','')}}</span>
+                        @endif
                         <span> . </span>
-                        <span style="font-weight: 500; font-size: 10px;">{{cn($std_proposal,'teacher_details.university.name','')}} </span>
+                        @if($std_proposal->teacher_details->university_name)
+                            <span style="font-weight: 500; font-size: 10px;">{{cn($std_proposal,'teacher_details.university_name','')}} </span>
+                        @else
+                            <span style="font-weight: 500; font-size: 10px;">{{cn($std_proposal,'teacher_details.university.name','')}} </span>
+                        @endif
                     </div>
                 </div>
                 </br>
-                
-                
+
+
             </div>
         </div>
 
@@ -34,9 +38,9 @@
                 <div style="width:100%;">
                     <div class="mt-2 p-2 ms-2">
                         <div class="custom-control custom-radio custom-control-inline">
-                            <div class="form-check mb-0" style="padding-left: 0 !important;"> 
+                            <div class="form-check mb-0" style="padding-left: 0 !important;">
                                 <label class="form-check-label" for="flexRadioDefault1" style="font-size: 13px; font-weight: 600;">{{cn($std_proposal,'proposal.title','')}}</label></br>
-                               
+
                                 <div class="pro_title mb-2 mt-3" style="width: 69%;">
                                     <div style="margin-top: -11px; display: block; font-size: 10px;">
                                     <span class="label_badge_radius" style="background-image: linear-gradient(90deg,rgba(46,17,83,.19),#f5f4fd); font-weight: 400 !important; font-size: 10px;">Ref. ({{cn($std_proposal,'proposal.proposal_ref','')}})</span>
@@ -46,41 +50,41 @@
                                             $proposal =\DB::table('proposal')->where(
                                                 'id',$std_proposal->proposal_id
                                                 )->first();
-                                                
+
                                             $department =\DB::table('departments')->where(
                                                 'id', $proposal->department
                                             )->first();
-                                                
+
                                         @endphp
-                                        
+
                                         @if($department)
                                         <span> • </span>
-                                        <span style="font-weight:400;">{{$department->name}}</span> 
+                                        <span style="font-weight:400;">{{$department->name}}</span>
                                         @endif
-                                        <span> • </span>  
-                                        <span style="font-weight:400;">{{cn($std_proposal,'proposal.status','')}}</span> 
-                                        
-                                    </div>                                             
+                                        <span> • </span>
+                                        <span style="font-weight:400;">{{cn($std_proposal,'proposal.status','')}}</span>
+
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
-            </div> 
+            </div>
         </div>
     </div>
     <div class="container mb-2">
-        <div class="col-md-12 mt-3" style="background-color:white; border-radius:6px;"> 
+        <div class="col-md-12 mt-3" style="background-color:white; border-radius:6px;">
             <div class="row">
                 <div class="col-md-5">
-                    <div class="p-2 ms-2"> 
+                    <div class="p-2 ms-2">
                         <div class="form-icon position-relative ms-1" style="font-size: 12px;">
                             Preferred Start Date : <strong style="font-weight: bolder;">{{date("M", mktime(0, 0, 0, $std_proposal->start_month, 10))}} {{ $std_proposal->start_year}}</strong>
                         </div>
                     </div>
                 </div>
                 <div class="col-md-6" style="text-align: end; margin-left: 3.5rem;">
-                    <div class="p-2"> 
+                    <div class="p-2">
                         <div class="form-icon position-relative ms-1" style="font-size: 12px;">
                            Application Status :
                            <span class="label_badge_radius" style="background-color: #d8fdd8; color: green; font-weight: bold;">Applied</span>
@@ -89,21 +93,21 @@
                 </div>
                 {{-- <div class="col-md-6">
                     <div class="mb-1">
-                           
+
                         <div class="form-icon position-relative">
-                             Start Month : 
+                             Start Month :
                         </div>
                     </div>
                 </div> --}}
             </div>
-        </div> 
+        </div>
     </div>
- 
+
 
 <script>
     $(function(){
         // $('.select2').select2();
-        $('#modal_page_footer').hide(); 
+        $('#modal_page_footer').hide();
     });
     </script>
-@endsection
+@endsection

+ 7 - 7
resources/views/teacher_profile.blade.php

@@ -699,7 +699,7 @@ tbody, td, tfoot, th, thead, tr {
                                         <tr>
                                             <td style="font-size: 11px;">{{$key+1}}</td>
                                             <td style="font-size: 11px;">{{$row->first_name }} {{$row->last_name }}</td>
-                                            <td style="font-size: 11px;">{{$row->email}}</td> 
+                                            <td style="font-size: 11px;">{{$row->email}}</td>
                                             <td style="font-size: 11px;">@if(!empty($row->invitation_date)) {{ date('d M Y h.i A', strtotime($row->invitation_date)) }} @else -- @endif</td>
                                             <td style="font-size: 11px;">@if(!empty($row->registered_date)) {{ date('d M Y h.i A', strtotime($row->registered_date)) }} @else -- @endif</td>
                                             <td style="font-size: 11px;">
@@ -715,7 +715,7 @@ tbody, td, tfoot, th, thead, tr {
                                                 @endphp
                                                 @if($user_invited_count > 1)
                                                 <span class="badge bg-secondary">
-                                                    {{ $user_invited_count }} 
+                                                    {{ $user_invited_count }}
                                                 </span>
                                                 @else
                                                     --
@@ -857,9 +857,9 @@ tbody, td, tfoot, th, thead, tr {
                                                                 <span class="title p-2" style="margin-bottom: 0px !important; color: #141639c4; font-weight:bold !important;">Profile</span>
                                                             </div>
                                                             <div class="right" style="width: 10%;">
-                                                                <span class="title" style="font-size:11px; font-weight: 600;"> 
+                                                                <span class="title" style="font-size:11px; font-weight: 600;">
                                                                         <button type="button" class="btn btn2" id="edit_profile_open_hide" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-pencil"></i></button>
-                                                                    
+
                                                                 </span>
                                                             </div>
                                                         </div>
@@ -891,7 +891,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                                     <label class="form-label config">University Name</label>
                                                                                     <div class="form-icon position-relative">
                                                                                         {{-- <input type="text" class="form-control" placeholder="University Name" id="university_name" name="university_name" value="{{$user->university_name}}" required="" style="font-size: 13px;"> --}}
-                                                                                        <select class="form-control" name="university_name" id="university_name">
+                                                                                        <select class="form-control" name="university" id="university_id">
                                                                                             <option value="" disabled selected>Choose one..</option>
                                                                                             @foreach($universities as $row)
                                                                                                 <option value="{{$row->id}}" @if($user->university_name ==$row->id) selected @endif>{{ $row->name}}</option>
@@ -1208,7 +1208,7 @@ tbody, td, tfoot, th, thead, tr {
                 var id =$('#u_id').val();
                 var first_name =$('#first_name').val();
                 var last_name =$('#last_name').val();
-                var university_name =$('#university_name').val();
+                var university_id =$('#university_id').val();
                 var department =$('#department_id option:selected').val();
                 var designation =$('#designation').val();
 
@@ -1217,7 +1217,7 @@ tbody, td, tfoot, th, thead, tr {
                     id: id,
                     first_name: first_name,
                     last_name: last_name,
-                    university_name: university_name,
+                    university_id: university_id,
                     department: department,
                     designation: designation,
                 }