Mostafijur Rahman 1 年之前
父节点
当前提交
53b1e495c5

+ 12 - 0
app/Helpers/functions.php

@@ -226,3 +226,15 @@ if(!function_exists('res_msg')){
 }
 
 
+if(!function_exists('is_freez_profile')){
+
+	function is_freez_profile($std_id){
+
+		return \App\User::where('id',$std_id)->where(
+			 'freez_profile',1
+			)->exists();   
+
+	}
+}
+
+

+ 61 - 1
app/Http/Controllers/Admin/SubContentController.php

@@ -12,7 +12,11 @@ use App\Models\ResearchInterest;
 use App\Models\Requirement;
 use App\Models\Publication;
 use App\StudentProposal;
+use App\AcademicLevel;
+use App\Institution;
 use App\Proposal;
+use App\Score;
+use App\Workexperience;
 use App\User;
 use Auth;
 
@@ -109,10 +113,66 @@ class SubContentController extends Controller
 				'id','DESC'
 			)->get();
 
+			$data['is_freez_profile'] = User::where(
+				'id',Auth::user()->id
+			 )->where(
+				'freez_profile','!=',0 
+			 )->exists();
+
 		}elseif($name=="edit_publication_load"){
 
-			$data['edit_data']=Publication::find($req->edit_id);
+			$data['edit_data']=Publication::find($req->edit_id); 
+
+		}elseif($name=="education_history_load"){
+
+			$data['institution']= Institution::where(
+				'student_id',Auth::user()->id
+			)->orderBy(
+				'id','DESC'
+			)->get();
+
+			$data['is_freez_profile'] = User::where(
+				'id',Auth::user()->id
+			 )->where(
+				'freez_profile','!=',0 
+			 )->exists();
+
+		}elseif($name=="edit_education_load"){
 
+			$data['edit_data']=Institution::find($req->edit_id);
+			$data['academic_level']= AcademicLevel::orderBy('name','ASC')->get();
+			$data['passingyear']= range((int)date('Y')-20,(int)date('Y'));
+
+		}elseif($name=="english_languge_proficiency_load"){
+			$student=Auth::user();
+			$data['score']= Score::where(
+				'student_id',$student->id
+			)->orderBy(
+				'id','ASC'
+			)->get();
+			$data['is_freez_profile'] = User::where(
+				'id',Auth::user()->id
+			 )->where(
+				'freez_profile','!=',0 
+			 )->exists();
+			 
+		}elseif($name=="edit_english_languge_proficiency_form"){
+			$student=Auth::user();
+			$data['edit_data']= Score::find($req->edit_id);
+			
+		}elseif($name=="work_experience_load"){
+			$data['work_experience']= Workexperience::where(
+				'student_id',Auth::user()->id
+				)->orderBy('id','DESC')->get();
+			$data['is_freez_profile'] = User::where(
+				'id',Auth::user()->id
+				)->where(
+				'freez_profile','!=',0 
+				)->exists();
+		}elseif($name=="edit_work_experience_form"){
+			$student=Auth::user();
+			$data['edit_data']= Workexperience::find($req->edit_id);
+			$data['years']= range((int)date('Y')-20,(int)date('Y'));
 		}else $name='default';
 		//$data['page_sl']=new PageSL($data['chapter_details']);
 		return view("admin.sub_contents.{$name}", $data);

+ 177 - 6
app/Http/Controllers/AjaxController.php

@@ -14,6 +14,10 @@ use App\Models\Requirement;
 use App\Models\Publication;
 use App\StudentProposal;
 use App\Proposal;
+use App\Institution;
+use App\Score;
+use App\Workexperience;
+use Carbon\Carbon;
 use Session;
 use Mail;
 use Auth;
@@ -312,15 +316,19 @@ 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){ 
+                $user_data = User::find($data->student_id);
+                $user_data->freez_profile =2;  // 2 = [In Review,Pause,Interested]
+                $user_data->update(); 
+            }
+
             return response(
                 ['msg'=>'Updated successfully.']
             );
@@ -333,7 +341,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;
@@ -341,16 +349,28 @@ class AjaxController extends Controller
             $data->proposal_status_date =now();
             $data->update();
 
+            if($req->proposal_status ==3){ // 3= rejected
+                $user_rejected = User::find($data->student_id);
+                $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;
             $data->accepted_date =now();
             $data->update();
 
+            $user_accepted = User::find($data->student_id);
+            $user_accepted->freez_profile =0;
+            $user_accepted->update();
+
+
             return response([
                 'msg'=>'Updated successfully.'
             ]);
@@ -775,6 +795,157 @@ class AjaxController extends Controller
 
             $data->update();
 
+            return response([
+                'msg'=>'Successfully saved.'
+            ]);
+        }elseif($name=="publication_status_update"){
+            $data =User::find($req->uid);
+            if($req->value =='yes'){
+                $data->is_publication =1; // 1=yes
+            }else{
+                $data->is_publication =2; // 2=no
+            }
+
+            $data->update();
+
+            return response([
+                'msg'=>'Successfully saved.'
+            ]);
+        
+        }elseif($name=="education_status_update"){
+            $data =User::find($req->uid);
+            if($req->value =='yes'){
+                $data->is_education =1; // 1=yes
+            }else{
+                $data->is_education =2; // 2=no
+            }
+
+            $data->update();
+
+            return response([
+                'msg'=>'Successfully saved.'
+            ]);
+        }elseif($name=="update_education_history"){
+            $student=Auth::user();
+
+            $validator=\Validator::make($req->all(), [
+                'academiclevel'=>'required',
+                'subject'=>'required',
+                'institution'=>'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->update();
+            return response([
+                'msg'=>'Successfully updated.'
+            ]);
+        }elseif($name=="delete_education_info"){
+            $data =Institution::find($req->delete_id);
+            $data->delete();
+            return response([
+                'msg'=>'Successfully deleted.'
+            ]);
+        }elseif($name=="update_english_languge_proficiency"){
+            $student=Auth::user();
+
+            $validator=\Validator::make($req->all(), [
+                'testdate'=>'required',
+                'expirationdate'=>'required',
+                'testname'=>'required',
+                'overallscore'=>'required', 
+                'listening'=>'required',
+                'speaking'=>'required',
+                'writing'=>'required',
+                'reading'=>'required',
+            ]);
+
+            if($validator->fails()){
+                $errors=$validator->errors()->all();
+                return response(['msg'=>$errors[0]], 422);
+            }  
+
+            $score= Score::find($req->edit_id);
+            $score->student_id= $student->id;
+            $score->test_date= Carbon::parse($req->testdate)->format('Y-m-d');
+            $score->expiration_date= Carbon::parse($req->expirationdate)->format('Y-m-d');
+            $score->test_name= $req->testname;
+            $score->overall_score= $req->overallscore;
+            $score->listening= $req->listening;
+            $score->writing= $req->speaking;
+            $score->reading= $req->writing;
+            $score->speaking= $req->reading;
+            $score->update();
+            return response([
+                'msg'=>'Successfully updated.'
+            ]);
+
+        }elseif($name=="delete_score_info"){
+            $data =Score::find($req->delete_id);
+            $data->delete();
+            return response([
+                'msg'=>'Successfully deleted.'
+            ]);
+        }elseif($name=="update_work_experience"){
+            $student=Auth::user(); 
+
+            $validator=\Validator::make($req->all(), [
+                'companyname'=>'required',
+                'designation'=>'required',
+                'startdate'=>'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;
+            $work_experience->designation= $req->designation;
+            if($req->currently_working=='on'){
+                $work_experience->currently_working=1;
+            }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.'
+            ]);
+        }elseif($name=="delete_work_experience_info"){
+            $data =Workexperience::find($req->delete_id);
+            $data->delete();
+            return response([
+                'msg'=>'Successfully deleted.'
+            ]);
+        }elseif($name=="test_score_status_update"){
+            $data =User::find($req->uid);
+            if($req->value =='yes'){
+                $data->is_test_score =1; // 1=yes
+            }else{
+                $data->is_test_score =2; // 2=no
+            }
+
+            $data->update();
+
             return response([
                 'msg'=>'Successfully saved.'
             ]);

+ 20 - 11
app/Http/Controllers/ModalController.php

@@ -34,8 +34,9 @@ class ModalController extends Controller{
         ];
 
         if($name=="apply_student_proposal"){
-            $data['teacher'] = User::find($req->id);
-            $data['student'] = User::find($user->id);
+            $student =Auth::user();
+            $data['teacher'] = User::find($req->t_id);
+            $data['student'] = User::find($student->id);
             $data['proposal']= Proposal::where('student_id',$user->id)->get();
         }elseif($name=="view_apply_proposal"){
             $data['std_proposal'] =StudentProposal::find($req->id);
@@ -71,7 +72,7 @@ class ModalController extends Controller{
 
     public function post(Request $req, $name){
 
-        $user=\Auth::user();
+        $user=Auth::user();
         $carbon=new \Carbon\Carbon;
 
         if($name=='apply_student_proposal'){
@@ -97,10 +98,15 @@ class ModalController extends Controller{
                 return response(['msg'=>'Sorry! You already submitted. You can not submit proposal.'],403);
             }
 
-            $publication =Publication::where('student_id',$req->student_id)->doesntExist();
-            $worK_exp =Workexperience::where('student_id',$req->student_id)->doesntExist();
-            $institution =Institution::where('student_id',$req->student_id)->doesntExist();
-            $score =Score::where('student_id',$req->student_id)->doesntExist();
+            //$publication =Publication::where('student_id',$req->student_id)->doesntExist();
+            //$worK_exp =Workexperience::where('student_id',$req->student_id)->doesntExist();
+            //$institution =Institution::where('student_id',$req->student_id)->doesntExist();
+            //$score =Score::where('student_id',$req->student_id)->doesntExist();
+            
+            $publication =User::where('id',$req->student_id)->whereNull('is_publication')->exists();
+            $worK_exp =User::where('id',$req->student_id)->whereNull('is_work_experience')->exists();
+            $institution =User::where('id',$req->student_id)->whereNull('is_education')->exists();
+            $score =User::where('id',$req->student_id)->whereNull('is_test_score')->exists();
 
             if($publication || $worK_exp || $institution || $score){
                 return response(['msg'=>'you didn\'t complete your profile.'],403);
@@ -118,16 +124,19 @@ class ModalController extends Controller{
             $student_proposal->student_apply_ref =studentRefNoGenerate();
             $student_proposal->save();
 
-            $user =User::find($student_proposal->student_id);
+            $student_data =User::find($student_proposal->student_id);
+            $student_data->freez_profile =1;
+            $student_data->update();
+            
             $proposal_user =User::find($student_proposal->teacher_id);
 
 			 if($user){
-				$data['name'] = $user->first_name.' '.$user->last_name;
+				$data['name'] = $student_data->first_name.' '.$student_data->last_name;
 				$data['teacher'] = $proposal_user->first_name.' '.$proposal_user->last_name;
 				$data['arn'] = $proposal_user->ref_no;
-				$user_mail =$user->email;
+				$user_mail =$student_data->email;
 				$from = 'asraful@revinr.com';
-				Mail::send('email.student_proposal_email',$data, function ($message) use ($user_mail,$from) {
+				Mail::send('email.student_proposal_email',$data, function ($message) use ($user_mail,$from,$student_proposal) {
 					$message->from($from);
 					$message->to($user_mail)->subject('Apply Ref:' .$student_proposal->student_apply_ref. '- Proposal has been submitted successfully ');
 				});

+ 20 - 13
app/Http/Controllers/StudentHomeController.php

@@ -38,16 +38,23 @@ class StudentHomeController extends Controller
 
    public function profile()
     {
-        $user = Auth::user();
-        $institution= Institution::where('student_id',Auth::user()->id)->get();
-        $work_experience= Workexperience::where('student_id',Auth::user()->id)->get();
-        $score= Score::where('student_id',$user->id)->get();
-        $proposal= Proposal::where('student_id',$user->id)->orderBy('id','DESC')->get();
-        $user_info= User::find($user->id);
-        $academic_level= AcademicLevel::all();
-        $proposal_files= StudentProposalUpload::where('student_id',$user->id)->get();
-        $departments = Department::where('status',1)->orderBy('name','ASC')->get();
-        return view('profile',compact('institution','academic_level','work_experience','score','user_info','proposal','proposal_files','departments'));
+         $user = Auth::user();
+         $institution= Institution::where('student_id',Auth::user()->id)->get();
+         $work_experience= Workexperience::where('student_id',Auth::user()->id)->get();
+         $score= Score::where('student_id',$user->id)->get();
+         $proposal= Proposal::where('student_id',$user->id)->orderBy('id','DESC')->get();
+         $user_info= User::find($user->id);
+         $academic_level= AcademicLevel::all();
+         $proposal_files= StudentProposalUpload::where('student_id',$user->id)->get();
+         $departments = Department::where('status',1)->orderBy('name','ASC')->get();  
+
+         $is_freez_profile = User::where(
+            'id',$user->id
+         )->where(
+            'freez_profile','!=',0 
+         )->exists();   
+    
+        return view('profile',compact('is_freez_profile','institution','academic_level','work_experience','score','user_info','proposal','proposal_files','departments'));
     }
 
 
@@ -61,10 +68,10 @@ class StudentHomeController extends Controller
         $institution->subject= $request->subject;
         $institution->institution= $request->institution;
         $institution->passing_year= $request->passingyear;
-        $institution->during= $request->during;
+        //$institution->during= $request->during;
         $institution->result= $request->result;
-        $institution->start_date= date($request->startdate.'-'.$request->startmonth.'-01');
-        $institution->end_date= date($request->enddate.'-'.$request->endmonth.'-30');
+        //$institution->start_date= date($request->startdate.'-'.$request->startmonth.'-01');
+        //$institution->end_date= date($request->enddate.'-'.$request->endmonth.'-30');
         $institution->save();
         return redirect()->back()->with('Added successfully.');
     }

二进制
public/uploads/proposal/1684758903documentfile_.pdf


+ 1 - 1
resources/views/Q_apply_form.blade.php

@@ -272,7 +272,7 @@
                                                     </div>
                                                     <div class="alert" style="margin-bottom: 0px; color: #3c3d5b;">
                                                         <strong class="mb-2" style="font-size:19px; font-weight: 700;"> {{ $user->first_name }} {{ $user->last_name }}</strong></br>
-                                                        <span style="font-size:14px; font-weight:400;">{{ $user->email }} </span><br>
+                                                        {{-- <span style="font-size:14px; font-weight:400;">{{ $user->email }} </span><br> --}}
                                                         <span style="font-size:14px; font-weight:400;">{{ cn($user,'university.name','')}}</span>
                                                         <span> . </span>
                                                         <span style="font-size:14px; font-weight:400;">{{ cn($user,'department_name.name','')}}</span>

+ 97 - 0
resources/views/admin/sub_contents/edit_education_load.blade.php

@@ -0,0 +1,97 @@
+<div class="col-md-12 mb-4 mt-4 open_education_edit_info_div">
+    <div  style="width: 100%;">
+        <div class="panel-body" style="padding:10px; background-color: #4b4c6824;  border: 1px solid #e9e5e5; border-radius: 5px;">
+            <form method="POST" action="{{route('ajax-post', ['name'=>'update_education_history'])}}" class="edit_form"> 
+                <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+                <input type="hidden" name="edit_id" value="{{$edit_data->id}}">
+                <div class="row">
+                <div class="col-md-4">
+                    <div class="mb-1">
+                            <label class="form-label">Academic level <span class="text-danger">*</span></label>
+                        <div class="form-icon position-relative">
+                            <select name="academiclevel" id="academic level" class="form-control frm" required="">
+                                   <option disabled="" selected="" value="">Choose one....</option>
+                                @foreach($academic_level as $row)
+                                    <option value="{{$row->id}}" @if($edit_data->academic_level ==$row->id) selected @endif>{{$row->name}}</option>
+                                @endforeach                                                                                          
+                               
+                            </select>
+                        </div>
+                    </div>
+                </div> 
+
+                <div class="col-md-4">
+                    <div class="mb-1">
+                            <label class="form-label" for="subject">Subject <span class="text-danger">*</span></label>
+                        <div class="form-icon position-relative">
+                            <input type="text" for="subject" name="subject" value="{{$edit_data->subject}}" class="form-control ps-2" required="">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-4">
+                        <div class="mb-1">
+                            <label class="form-label" for="">Institution<span class="text-danger">*</span></label>
+                        <div class="form-icon position-relative">
+                            <input type="text"  for="institution" name="institution" value="{{$edit_data->institution}}" class="form-control ps-2" placeholder="" required="">
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-4">
+                    <div class="mb-1">
+                            <label class="form-label">Passing Year <span class="text-danger">*</span></label>
+                        <div class="form-icon position-relative">
+                            <select name="passingyear" id="passing year" class="form-control frm" required="">
+                                <option disabled="" selected="" value="">Year</option> 
+                                @foreach($passingyear as $row)
+                                <option value="{{$row}}" @if($edit_data->passing_year==$row) selected @endif>{{$row}}</option>
+                                @endforeach 
+                            </select>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="col-md-4">
+                    <div class="mb-1">
+                            <label class="form-label">Result <span class="text-danger">*</span></label>
+                        <div class="form-icon position-relative">
+                            <input type="text" class="form-control ps-2" name="result" value="{{$edit_data->result}}" placeholder="" required="">
+                        </div>
+                    </div>
+                </div>
+                </div>
+                <div class="col-md-12">
+                    <div class="text-end">
+                        <button type="button" class="btn cancel_button mr-1 btn-cancel close_form" style="background-color: #ffbd59 !important; border: 2px solid #ffbd59; color: white;border-radius: 18px; padding: 2px 6px;" >
+                            <i aria-hidden="true" class="fa fa-refresh"></i>
+                        </button>
+                        <button class="btn btn2">Update</button>                      
+                    </div>
+                </div>
+                
+            </form>  
+        </div>
+    </div>
+</div>
+ 
+
+<script>
+    $(function(){
+        $(function(){
+        $('.edit_form').on('submit', function(event){
+                event.preventDefault();
+                var self = $(this); 
+                ajax_form(self, function(self){
+                    $('.edit_education_load').empty();
+                    fetch_sub_content(
+                        '#education_history_load',
+                        "{{ route('sub-content', ['name'=>'education_history_load']) }}"
+                    );  
+                });
+        });
+    });
+
+    $('.cancel_button').on('click', function(){ 
+        $('.edit_edu_data').addClass('d-none')
+    });
+    });
+</script>

+ 114 - 0
resources/views/admin/sub_contents/edit_english_languge_proficiency_form.blade.php

@@ -0,0 +1,114 @@
+<div class="col-md-12 mb-4 mt-4 open_education_edit_info_div">
+    <div  style="width: 100%;">
+        <div class="panel-body" style="padding:10px; background-color: #4b4c6824;  border: 1px solid #e9e5e5; border-radius: 5px;">
+            <form method="POST" action="{{route('ajax-post', ['name'=>'update_english_languge_proficiency'])}}" class="edit_form"> 
+                <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+                <input type="hidden" name="edit_id" value="{{$edit_data->id}}">
+                <div class="row">
+                    <div class="col-md-4">
+                        <div class="mb-1">
+                                <label class="form-label" for="test date">Test Date</label>
+                            <div class="form-icon position-relative">
+                                <input name="testdate" value="@if($edit_data->test_date) {{date('d M Y',strtotime($edit_data->test_date))}} @else @endif" type="text" class="form-control date" placeholder="Test Date" autocomplete="off">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-4">
+                        <div class="mb-1">
+                                <label class="form-label" for="expiration date">Expiration Date</label>
+                            <div class="form-icon position-relative">
+                                <input name="expirationdate" value="@if($edit_data->expiration_date) {{date('d M Y',strtotime($edit_data->expiration_date))}} @else @endif" type="text" class="form-control date1" placeholder="Expiration Date" autocomplete="off">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-4">
+                        <div class="mb-1">
+                                <label class="form-label" for="test name">Test Name</label>
+                            <div class="form-icon position-relative">
+                                <input type="text"  for="test name" name="testname" value="{{$edit_data->test_name}}" class="form-control ps-2" id="testname" placeholder="IELTS" required="">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                 <div class="row">
+                        <div class="col-md-2 mt-2">
+                            <div class="mb-1">
+                                    <label class="form-label">Overall Score</label>
+                                <div class="form-icon position-relative">
+                                    <input type="text"  for="overall score" name="overallscore" value="{{$edit_data->overall_score}}" class="form-control ps-2" placeholder="Enter Score" required="">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="mb-1 mt-2">
+                                    <label class="form-label">Listening</label>
+                                <div class="form-icon position-relative">
+                                    <input type="text"  for="listening" name="listening" value="{{$edit_data->listening}}" class="form-control ps-2" placeholder="Enter Score" required="">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="mb-1 mt-2">
+                                    <label class="form-label">Speaking</label>
+                                <div class="form-icon position-relative">
+                                    <input type="text"  for="speaking" name="speaking" value="{{$edit_data->speaking}}" class="form-control ps-2" placeholder="Enter Score" required="">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="mb-1 mt-2">
+                                    <label class="form-label">Writing</label>
+                                <div class="form-icon position-relative">
+                                    <input type="text"  for="writing" name="writing" value="{{$edit_data->writing}}" class="form-control ps-2" placeholder="Enter Score" required="">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-2">
+                            <div class="mb-1 mt-2">
+                                    <label class="form-label">Reading</label>
+                                <div class="form-icon position-relative">
+                                    <input type="text"  for="reading" name="reading" value="{{$edit_data->reading}}" class="form-control ps-2" placeholder="Enter Score" required="">
+                                </div>
+                            </div>
+                        </div> 
+                </div>
+                <div class="col-md-12">
+                    <div class="text-end">
+                        <button type="button" class="btn cancel_button mr-1 btn-cancel close_form" style="background-color: #ffbd59 !important; border: 2px solid #ffbd59; color: white;border-radius: 18px; padding: 2px 6px;" >
+                            <i aria-hidden="true" class="fa fa-refresh"></i>
+                        </button>
+                        <button class="btn btn2">Update</button>                      
+                    </div>
+                </div>
+                
+            </form>  
+        </div>
+    </div>
+</div>
+ 
+
+<script>
+    $(function(){
+
+        $(".date,.date1").flatpickr({
+            dateFormat: "d M Y",
+        });
+        
+        $('.edit_form').on('submit', function(event){
+                event.preventDefault();
+                var self = $(this); 
+                ajax_form(self, function(self){
+                    $('.edit_english_languge_proficiency_form').empty();
+                    fetch_sub_content(
+                        '#english_languge_proficiency_load',
+                        "{{ route('sub-content', ['name'=>'english_languge_proficiency_load']) }}"
+                    );  
+                });
+        });
+   
+
+    $('.cancel_button').on('click', function(){ 
+        $('.edit_data').addClass('d-none')
+    });
+});
+</script>

+ 145 - 0
resources/views/admin/sub_contents/edit_work_experience_form.blade.php

@@ -0,0 +1,145 @@
+<div class="col-md-12 mb-4 mt-4 open_education_edit_info_div">
+    <div  style="width: 100%;">
+        <div class="panel-body" style="padding:10px; background-color: #4b4c6824;  border: 1px solid #e9e5e5; border-radius: 5px;">
+            <form method="POST" action="{{route('ajax-post', ['name'=>'update_work_experience'])}}" class="edit_form"> 
+                <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+                <input type="hidden" name="edit_id" value="{{$edit_data->id}}">
+                <div class="row">
+                    <div class="col-md-3">
+                        <div class="mb-1">
+                                <label class="form-label">Company Name <span class="text-danger">*</span></label>
+                            <div class="form-icon position-relative">
+                                    <input type="text" for="company name" name="companyname" value="{{$edit_data->company_name}}" class="form-control ps-2" placeholder="Company Name" required="">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-3">
+                        <div class="mb-1">
+                                <label class="form-label" for="designation">Designation <span class="text-danger">*</span></label>
+                        <div class="form-icon position-relative">
+                                <input type="text" for="designation" name="designation" value="{{$edit_data->designation}}" class="form-control ps-2" placeholder="Designation" required="">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-3">
+                        <div class="row">
+                            <div class="col-md-6">
+                                <div class="mb-1">
+                                        <label class="form-label">Start Date <span class="text-danger">*</span></label>
+                                    <div class="form-icon position-relative">
+                                        <select name="startdate" id="start date" class="form-control frm" required="">
+                                            <option disabled="" selected="" value="">Year</option> 
+                                            @foreach($years as $row)
+                                            <option value="{{$row}}" @if($edit_data->start_date==$row) selected @endif>{{$row}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="mb-1 mt-2">
+                                        <label class="form-label"></label>
+                                    <div class="form-icon position-relative">
+                                        <select name="startmonth" id="month" class="form-control frm" required="">
+                                            <option disabled="" selected="" value="">Month</option>
+                                            <option value="01">January</option>
+                                            <option value="02">February</option>
+                                            <option value="03">March</option>
+                                            <option value="04">April</option>
+                                            <option value="05">May</option>
+                                            <option value="06">June</option>
+                                            <option value="07">July</option>
+                                            <option value="08">August</option>
+                                            <option value="09">September</option>
+                                            <option value="10">October</option>
+                                            <option value="11">November</option>
+                                            <option value="12">December</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-3 mt-4 pt-2" style="display:flex; font-size:13px; font-weight:600; color: white;">
+                        Currently working in that company?
+                        <div class="form-check form-switch" id="checkCurrentlyWorking" style="margin-top: 14px;">
+                            <input class="form-check-input" type="checkbox" name="currently_working" @if($edit_data->currently_working =='1') checked @endif>
+                            <label class="form-check-label" for="checkCurrentlyWorking"></label>
+                        </div>
+                    </div>
+                    <div class="col-md-3" id="end_date_div">
+                        <div class="row">
+                            <div class="col-md-6">
+                                <div class="mb-1">
+                                        <label class="form-label">End Date <span class="text-danger">*</span></label>
+                                    <div class="form-icon position-relative">
+                                        <select name="enddate" id="end date" class="form-control frm">
+                                            <option disabled="" selected="" value="">Year</option> 
+                                            @foreach($years as $row)
+                                            <option value="{{$row}}" @if($edit_data->end_date==$row) selected @endif>{{$row}}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="mb-1 mt-2">
+                                        <label class="form-label"></label>
+                                    <div class="form-icon position-relative">
+                                        <select name="endmonth" id="month" class="form-control frm">
+                                            <option disabled="" selected="" value="">Month</option>
+                                            <option value="01">January</option>
+                                            <option value="02">February</option>
+                                            <option value="03">March</option>
+                                            <option value="04">April</option>
+                                            <option value="05">May</option>
+                                            <option value="06">June</option>
+                                            <option value="07">July</option>
+                                            <option value="08">August</option>
+                                            <option value="09">September</option>
+                                            <option value="10">October</option>
+                                            <option value="11">November</option>
+                                            <option value="12">December</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-12">
+                    <div class="text-end">
+                        <button type="button" class="btn cancel_button mr-1 btn-cancel close_form" style="background-color: #ffbd59 !important; border: 2px solid #ffbd59; color: white;border-radius: 18px; padding: 2px 6px;" >
+                            <i aria-hidden="true" class="fa fa-refresh"></i>
+                        </button>
+                        <button class="btn btn2">Update</button>                      
+                    </div>
+                </div>
+                
+            </form>  
+        </div>
+    </div>
+</div>
+ 
+
+<script>
+    $(function(){ 
+         
+        $('.edit_form').on('submit', function(event){
+                event.preventDefault();
+                var self = $(this); 
+                ajax_form(self, function(self){
+                    $('.edit_work_experience_form').empty();
+                    fetch_sub_content(
+                        '#work_experience_load',
+                        "{{ route('sub-content', ['name'=>'work_experience_load']) }}"
+                    );  
+                });
+        });
+   
+
+    $('.cancel_button').on('click', function(){ 
+        $('.edit_data').addClass('d-none')
+    });
+});
+</script>

+ 115 - 0
resources/views/admin/sub_contents/education_history_load.blade.php

@@ -0,0 +1,115 @@
+@extends('admin.sub_contents.base')  
+@section('main') 
+<div class="table-responsive mt-2">
+    @if(count($institution)>0)
+    <table class="table table-bordered list_table" style="margin-bottom:10px;">
+        <thead>
+            <tr>
+                <th style="width: 30%;">Institution</th>
+                <th style="width: 20%;">Academic level</th>
+                <th style="width: 30%;">Subject</th>
+                <th>Result</th>
+                <th style="width: 10%;">Passing Year</th>
+                {{-- @if(profile_permission($institution[0]->student_id)) --}}
+                <th style="width: 10%;">Action</th>
+                {{-- @endif --}}
+            </tr>
+        </thead>
+        <tbody>
+            @foreach($institution as $row)  
+                <tr>
+                    <td style="font-size: 11px;">{{$row->institution}}</td>
+                    <td style="font-size: 11px;">
+                        <span class="label_badge_radius" style="background-image: linear-gradient(90deg,rgba(46,17,83,.19),#f5f4fd) !important;">{{$row->academic_level_info->name}}</span>
+                    </td>
+                    <td style="font-size: 11px;">{{$row->subject}}</td> 
+                    <td style="font-size: 11px;">{{$row->result}}</td>
+                    <td style="font-size: 11px;">
+                        <span style="font-weight: 400; font-size: 12px;">{{$row->passing_year}}</span>
+                    </td>
+                    <!-- <td style="font-size: 11px;">{{date("d M, Y", strtotime($row->start_date)).' - '.date("d M, Y", strtotime($row->end_date))}}</td> -->
+                     
+                    <td class="text-center" style="width: 75px;"> 
+                            <div class="icon_bar" style="border: none;">  
+                                <span class="edit_education_info" data-id="{{$row->id}}" style="cursor: pointer; @if($is_freez_profile) pointer-events:none; @endif"><i class="fa fa-edit change_pass_btn" ></i></span>
+                                <span class="delete_education_info" data-id="{{$row->id}}" style="cursor: pointer; @if($is_freez_profile) pointer-events:none; @endif"><i class="fa fa-trash change_pass_btn ms-1" ></i></span>
+                            </div>
+                     </td>  
+                      
+                </tr>
+
+                <?php 
+                    $edit_cls_name = "edit_cls_".$row->id;
+                ?>
+                <tr class="edit_edu_data {{$edit_cls_name}} d-none">
+                    <td colspan="6">
+                        <div class="edit_education_load"></div>
+                    </td>
+                </tr>
+            @endforeach
+        </tbody>
+    </table>
+    @else
+    <div class="alert  mt-1 mb-3" style="border-color: #e9f0f3; font-size: 12px !important; color: #dc3545; border-radius: 30px; padding: 8px 15px;">
+        <span>No Education History available.</span>
+    </div> 
+    @endif
+</div>
+ 
+@endsection
+
+
+<script>
+    $(function(){
+        $('.edit_education_info').on('click', function(){  
+
+        $('.edit_education_load').empty();
+        var self = $(this);
+        var id = self.attr("data-id"); 
+        var edit_cls = "edit_cls_"+id; 
+        $('.edit_edu_data').addClass('d-none'); 
+        $("."+edit_cls).removeClass('d-none'); 
+        var edit_education_load = self.closest('tbody').find('.edit_education_load');
+
+        fetch_sub_content(
+            edit_education_load,
+            "{!! route('sub-content', ['name'=>'edit_education_load','action'=>'edit']) !!}&edit_id="+id
+        );                   
+    });
+
+    $('.delete_education_info').on('click', function(){ 
+        var id = $(this).attr("data-id"); 
+        var form_data={
+            _token: "{{ csrf_token() }}",  
+            delete_id: id,
+        }  
+        swal({
+            title: "Are you sure?",
+            text: "You will not be able to recover this data!",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonClass: "btn-danger",
+            cancelButtonClass: "btn-info",
+            confirmButtonText: "Yes, delete!",
+            cancelButtonText: "No, cancel!",
+
+        }, function(isConfirm){
+
+            if(isConfirm){  
+                $.post("{{ route('ajax-post', ['name'=>'delete_education_info']) }}",form_data
+                ).done(function(res){ 
+                    pop_up_msg(res.msg); 
+                    fetch_sub_content(
+                        '#education_history_load',
+                        "{{ route('sub-content', ['name'=>'education_history_load']) }}"
+                    );
+
+                }).fail(function(err){ 
+                    pop_up_msg(err_msg(err), 'error'); 
+                }); 
+            } 
+        }); 
+            
+    });
+});
+</script>

+ 123 - 0
resources/views/admin/sub_contents/english_languge_proficiency_load.blade.php

@@ -0,0 +1,123 @@
+@extends('admin.sub_contents.base')  
+@section('main') 
+<div class="table-responsive mt-2">
+    @if(count($score)>0)
+        <table class="table table-bordered list_table" style="margin-bottom:10px;">
+            <tbody>
+            @foreach($score as $row)
+                <tr>
+                    <td>
+                        <div class="institute_info">
+                            <div class="left">
+                                <i class="fa fa-align-center" style="padding: 7px;"></i>
+                            </div>
+                            <div class="right">
+                                <span class="main_title" style="font-size: 11px;font-weight: 600; display: flex;"> Testing System</span>
+                                <span class="label_badge_light test_score_level">{{$row->test_name}}</span>
+                                <span style="font-weight: 400; font-size: 12px;">Test Date: {{date("d M, Y", strtotime($row->test_date))}}</span>
+                            </div>
+                        </div>
+                    </td>
+                    <td class="text-center">
+                        <strong style="color: rgb(57, 59, 62); font-size: 12px;">{{$row->overall_score}}</strong><br>
+                        <strong style="color: rgb(57, 59, 62); font-size: 12px;">Overall</strong>
+                    </td>
+                    <td class="text-center">
+                        <strong style="color: rgb(57, 59, 62); font-size: 12px;">{{$row->listening}}</strong><br>
+                        <strong style="font-size: 12px;">Listening</strong>
+                    </td>
+                    <td class="text-center">
+                        <strong style="color: rgb(57, 59, 62); font-size: 12px;">{{$row->speaking}}</strong><br>
+                        <strong style="font-size: 12px;">Speaking</strong>
+                    </td>
+                    <td class="text-center">
+                        <strong style="color: rgb(57, 59, 62); font-size: 12px;">{{$row->writing}}</strong><br>
+                        <strong style="font-size: 12px;">Writing</strong>
+                    </td>
+                    <td class="text-center">
+                        <strong style="color: rgb(57, 59, 62); font-size: 12px;">{{$row->reading}}</strong><br>
+                        <strong style="font-size: 12px;">Reading</strong>
+                    </td>
+                    @if(profile_permission($row->student_id))
+                    <td class="text-center" style="width: 100px;">  
+                        <div class="icon_bar" style="border: none;">  
+                            <span class="edit_score_info" data-id="{{$row->id}}" style="cursor: pointer; @if($is_freez_profile) pointer-events:none; @endif"><i class="fa fa-edit change_pass_btn" ></i></span>
+                            <span class="delete_score_info" data-id="{{$row->id}}" style="cursor: pointer; @if($is_freez_profile) pointer-events:none; @endif"><i class="fa fa-trash change_pass_btn ms-1" ></i></span>
+                        </div> 
+                    </td>  
+                    @endif                                                     
+                </tr>
+                <?php 
+                    $edit_cls_name = "edit_cls_".$row->id;
+                ?>
+                <tr class="edit_data {{$edit_cls_name}} d-none">
+                    <td colspan="7">
+                        <div class="edit_english_languge_proficiency_form"></div>
+                    </td>
+                </tr>
+                @endforeach
+            </tbody>
+        </table>
+        @else
+            <div class="alert  mt-1 mb-3" style="border-color: #e9f0f3; font-size: 12px !important; color: #dc3545; border-radius: 30px; padding: 8px 15px;">
+                <span>No Test Score available.</span>
+            </div> 
+        @endif
+    </div>
+@endsection
+
+
+<script>
+    $(function(){
+        $('.edit_score_info').on('click', function(){  
+
+        $('.edit_english_languge_proficiency_form').empty();
+        var self = $(this);
+        var id = self.attr("data-id"); 
+        var edit_cls = "edit_cls_"+id; 
+        $('.edit_data').addClass('d-none'); 
+        $("."+edit_cls).removeClass('d-none'); 
+        var edit_english_languge_proficiency_form = self.closest('tbody').find('.edit_english_languge_proficiency_form');
+
+        fetch_sub_content(
+            edit_english_languge_proficiency_form,
+            "{!! route('sub-content', ['name'=>'edit_english_languge_proficiency_form','action'=>'edit']) !!}&edit_id="+id
+        );                   
+    });
+
+    $('.delete_score_info').on('click', function(){ 
+        var id = $(this).attr("data-id"); 
+        var form_data={
+            _token: "{{ csrf_token() }}",  
+            delete_id: id,
+        }  
+        swal({
+            title: "Are you sure?",
+            text: "You will not be able to recover this data!",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonClass: "btn-danger",
+            cancelButtonClass: "btn-info",
+            confirmButtonText: "Yes, delete!",
+            cancelButtonText: "No, cancel!",
+
+        }, function(isConfirm){
+
+            if(isConfirm){  
+                $.post("{{ route('ajax-post', ['name'=>'delete_score_info']) }}",form_data
+                ).done(function(res){ 
+                    pop_up_msg(res.msg); 
+                    fetch_sub_content(
+                        '#english_languge_proficiency_load',
+                        "{{ route('sub-content', ['name'=>'english_languge_proficiency_load']) }}"
+                    );
+
+                }).fail(function(err){ 
+                    pop_up_msg(err_msg(err), 'error'); 
+                }); 
+            } 
+        }); 
+            
+    });
+});
+</script>

+ 1 - 1
resources/views/admin/sub_contents/load_ref_no_available_info.blade.php

@@ -29,7 +29,7 @@
             </div>
 
             <div class="col-md-2 mt-3">
-                <span class="btn btn3 open_modal_page" data-url="{{route('modal-get',['name'=>'apply_student_proposal','id'=>$teacher->id])}}"  data-title="Submit your Proposal" style="margin-left: 1.1rem;">Apply</span>
+                <span class="btn btn3 open_modal_page" data-url="{{route('modal-get',['name'=>'apply_student_proposal','t_id'=>$teacher->id])}}"  data-title="Submit your Proposal" style="margin-left: 1.1rem;">Apply</span>
             </div>
         </div>
     </div>

+ 2 - 2
resources/views/admin/sub_contents/publication_list_load.blade.php

@@ -31,8 +31,8 @@
                         <div class="top_part_status" style="position: relative; width: fit-content;">
                     <td class="text-center" style="width: 75px;">
                         <div class="icon_bar" style="border: none;">  
-                            <span class="edit_publication_info" data-id="{{$row->id}}" style="cursor: pointer;"><i class="fa fa-edit change_pass_btn" ></i></span>
-                            <span class="delete_publication_info" data-id="{{$row->id}}" style="cursor: pointer;"><i class="fa fa-trash change_pass_btn ms-1" ></i></span>
+                            <span class="edit_publication_info" data-id="{{$row->id}}" style="cursor: pointer; @if($is_freez_profile) pointer-events:none; @endif"><i class="fa fa-edit change_pass_btn" ></i></span>
+                            <span class="delete_publication_info" data-id="{{$row->id}}" style="cursor: pointer; @if($is_freez_profile) pointer-events:none; @endif"><i class="fa fa-trash change_pass_btn ms-1" ></i></span>
                         </div>
                     </td>   
                 </tr>

+ 108 - 0
resources/views/admin/sub_contents/work_experience_load.blade.php

@@ -0,0 +1,108 @@
+@extends('admin.sub_contents.base')  
+@section('main') 
+<div class="table-responsive mt-2">
+    @if(count($work_experience)>0)
+        <table class="table table-bordered list_table" style="margin-bottom: 10px;">
+            <thead>
+                <tr>
+                    <th>Company Name</th>
+                    <th>Designation</th>
+                    <th>Currently working</th>
+                    <th>Start Date</th>
+                    <th>End Date</th>
+                    {{-- @if(profile_permission($work_experience[0]->student_id))  --}}
+                    <th>Action</th> 
+                    {{-- @endif --}}
+                </tr>
+            </thead>
+            <tbody>
+            @foreach($work_experience as $row)                                                               
+                    <tr>
+                        <td style="font-size: 11px;">{{$row->company_name}}</td>
+                        <td style="font-size: 11px;">{{$row->designation}}</td> 
+                        <td style="font-size: 11px;">{{$row->currently_working == 0 ? 'off' : 'on'}}</td> 
+                        <td style="font-size: 11px;">@if(!empty($row->start_date)){{date("d M, Y", strtotime($row->start_date))}} @else @endif</td>
+                        <td style="font-size: 11px;">@if(!empty($row->end_date)) {{date("d M, Y", strtotime($row->end_date))}} @else @endif</td>
+                         
+                        <td class="text-center" style="width: 100px;">
+                            <div class="icon_bar" style="border: none;"> 
+                                <span class="edit_work_experience_info" data-id="{{$row->id}}" style="cursor: pointer; @if($is_freez_profile) pointer-events:none; @endif"><i class="fa fa-edit change_pass_btn" ></i></span>
+                                <span class="delete_work_experience_info" data-id="{{$row->id}}" style="cursor: pointer; @if($is_freez_profile) pointer-events:none; @endif"><i class="fa fa-trash change_pass_btn ms-1" ></i></span> 
+                            </div>
+                        </td>   
+                    </tr> 
+                    <?php 
+                    $edit_cls_name = "edit_cls_".$row->id;
+                    ?>
+                    <tr class="edit_data {{$edit_cls_name}} d-none">
+                        <td colspan="7">
+                            <div class="edit_work_experience_form"></div>
+                        </td>
+                    </tr>
+                @endforeach                                                              
+            </tbody>
+        </table>
+        @else
+        <div class="alert  mt-1 mb-3" style="border-color: #e9f0f3; font-size: 12px !important; color: #dc3545; border-radius: 30px; padding: 8px 15px;">
+            <span>No Work Experience available.</span>
+        </div> 
+        @endif
+    </div>
+ 
+@endsection
+
+
+<script>
+    $(function(){
+        $('.edit_work_experience_info').on('click', function(){  
+
+        $('.edit_work_experience_form').empty();
+        var self = $(this);
+        var id = self.attr("data-id"); 
+        var edit_cls = "edit_cls_"+id; 
+        $('.edit_edu_data').addClass('d-none'); 
+        $("."+edit_cls).removeClass('d-none'); 
+        var edit_work_experience_form = self.closest('tbody').find('.edit_work_experience_form');
+
+        fetch_sub_content(
+            edit_work_experience_form,
+            "{!! route('sub-content', ['name'=>'edit_work_experience_form','action'=>'edit']) !!}&edit_id="+id
+        );                   
+    });
+
+    $('.delete_work_experience_info').on('click', function(){ 
+        var id = $(this).attr("data-id"); 
+        var form_data={
+            _token: "{{ csrf_token() }}",  
+            delete_id: id,
+        }  
+        swal({
+            title: "Are you sure?",
+            text: "You will not be able to recover this data!",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonClass: "btn-danger",
+            cancelButtonClass: "btn-info",
+            confirmButtonText: "Yes, delete!",
+            cancelButtonText: "No, cancel!",
+
+        }, function(isConfirm){
+
+            if(isConfirm){  
+                $.post("{{ route('ajax-post', ['name'=>'delete_work_experience_info']) }}",form_data
+                ).done(function(res){ 
+                    pop_up_msg(res.msg); 
+                    fetch_sub_content(
+                        '#work_experience_load',
+                        "{{ route('sub-content', ['name'=>'work_experience_load']) }}"
+                    );
+
+                }).fail(function(err){ 
+                    pop_up_msg(err_msg(err), 'error'); 
+                }); 
+            } 
+        }); 
+            
+    });
+});
+</script>

文件差异内容过多而无法显示
+ 215 - 736
resources/views/profile.blade.php


+ 8 - 0
sql/update.sql

@@ -164,3 +164,11 @@ ENGINE=InnoDB
 ALTER TABLE `users`
 	ADD COLUMN `is_attended_conference` INT(11) NULL DEFAULT NULL AFTER `admin_invite_id`;
 
+ALTER TABLE `users`
+	ADD COLUMN `is_publication` TINYINT(1) NULL DEFAULT NULL COMMENT '1=yes, 2=no' AFTER `is_test_score`;
+
+ALTER TABLE `users`
+	ADD COLUMN `is_education` TINYINT(1) NULL DEFAULT NULL COMMENT '1=yes, 2=no' AFTER `is_publication`;
+
+ALTER TABLE `users`
+	ADD COLUMN `freez_profile` TINYINT(4) NULL DEFAULT 0 AFTER `id`;

部分文件因为文件数量过多而无法显示