Modified

app/Http/Controllers/Admin/SubContentController.php

@@ -175,6 +175,9 @@ class SubContentController extends Controller
 			$student=Auth::user();
 			$data['edit_data']= Workexperience::find($req->edit_id);
 			$data['years']= range((int)date('Y')-20,(int)date('Y'));
+		}elseif($name=="edit_feedback_msg_form"){
+			$data['edit'] =StudentProposal::find($req->std_propsal_id);
+
 		}else $name='default';
 		//$data['page_sl']=new PageSL($data['chapter_details']);
 		return view("admin.sub_contents.{$name}", $data);

app/Http/Controllers/AjaxController.php

@@ -427,23 +427,8 @@ class AjaxController extends Controller
             if($validator->fails()){
                 $errors=$validator->errors()->all();
                 return response(['msg'=>$errors[0]], 422);
-            }
-
-
-            $old_user =User::where(
-                'email',$req->email
-            )->where(
-                'user_type',1
-            )->where(
-                'sign_up',1
-            )->exists();
-
-            if($old_user){
-                return response(
-                    ['msg'=>'Already an account associated with this email ID.','action'=>'old_user']
-                );
-            }
-
+            } 
+            
             $new_user =User::where(
                 'email',$req->email
             )->where(
@@ -468,53 +453,86 @@ class AjaxController extends Controller
             $user =User::where('email',$req->email)->where('user_type',1)->first();
 
             if($user){
-                $student_proposal =new StudentProposal;
-                $student_proposal->student_id =$user->id;
-                $student_proposal->teacher_id =$req->id;
-                $student_proposal->save();
-            }  
-
-            $refer =new ReferUser;
-            $refer->name =$req->name;
-            $refer->email =$req->email;
-            $refer->refer_by =$user->id;
-            $refer->teacher_id =$req->id;
-            $refer->q_form_status =1;
-            $refer->save();
-
-            if($refer->save()){
-                $teacher = User::find($refer->teacher_id);
-
-                if($teacher->others_department){
-                    $department =$teacher->others_department;
-                }else{
-                    $department = cn($teacher,'department_name.name','');
-                }
-
-                if($teacher->university_name){
-                    $university =$teacher->university_name;
+                $student_proposal_applyed =StudentProposal::where(
+                    'teacher_id',$req->id
+                )->where(
+                    'student_id',$user->id
+                )->whereIn(
+                    'proposal_status',[1,2,3,4] // 1 =New; 2 =In Review; 3=Push; 4=Hold;
+                )->exists();
+
+                dd($student_proposal_applyed);
+
+                if($student_proposal_applyed){
+                    return response(
+                        ['msg'=>'Already pending a proposal']
+                    );
                 }else{
-                    $university = cn($teacher,'university.name','');
-                }
-
-
-                $data['name'] = $refer->name;
-                $data['student_id'] = $user->id;
-                $data['teacher'] = $user_teacher->first_name.' '.$user_teacher->last_name;
-                $data['designation'] = $teacher->designation;
-                $data['department'] = $department;
-                $data['university'] = $university;
-                $data['email'] =$refer->email;
-                $data['receive_email']=$refer->email;
-                $user_mail = $refer->email;
-                $from = 'asraful@revinr.com';
-
-                Mail::send('email.q_form_email',$data, function ($message) use ($user_mail,$from) {
-                    $message->from($from);
-                    $message->to($user_mail)->subject('Invitation to submit your doctoral application');
-                });
-            }
 
+                    $student_proposal =new StudentProposal;
+                    $student_proposal->student_id =$user->id;
+                    $student_proposal->teacher_id =$req->id;
+                    $student_proposal->save();
+
+                    $refer =new ReferUser;
+                    $refer->name =$req->name;
+                    $refer->email =$req->email;
+                    $refer->refer_by =$user->id;
+                    $refer->teacher_id =$req->id;
+                    $refer->q_form_status =1;
+                    $refer->save();
+
+                    $old_user =User::where(
+                        'email',$req->email
+                    )->where(
+                        'user_type',1
+                    )->where(
+                        'sign_up',1
+                    )->exists();
+        
+                    if($old_user){
+                        return response(
+                            ['msg'=>'Already an account associated with this email ID.','action'=>'old_user']
+                        );
+                    }
+
+                    if($refer->save()){
+                        $teacher = User::find($refer->teacher_id);
+    
+                        if($teacher->others_department){
+                            $department =$teacher->others_department;
+                        }else{
+                            $department = cn($teacher,'department_name.name','');
+                        }
+    
+                        if($teacher->university_name){
+                            $university =$teacher->university_name;
+                        }else{
+                            $university = cn($teacher,'university.name','');
+                        }
+    
+    
+                        $data['name'] = $refer->name;
+                        $data['student_id'] = $user->id;
+                        $data['teacher'] = $teacher->first_name.' '.$teacher->last_name;
+                        $data['designation'] = $teacher->designation;
+                        $data['department'] = $department;
+                        $data['university'] = $university;
+                        $data['email'] =$refer->email;
+                        $data['receive_email']=$refer->email;
+                        $user_mail = $refer->email;
+                        $from = 'asraful@revinr.com';
+    
+                        Mail::send('email.q_form_email',$data, function ($message) use ($user_mail,$from) {
+                            $message->from($from);
+                            $message->to($user_mail)->subject('Invitation to submit your doctoral application');
+                        });
+                    }
+                } 
+     
+
+                
+            }   
             return response(
                 ['msg'=>'Saved successfully. Please check your email for register.']
             );
@@ -1083,6 +1101,19 @@ class AjaxController extends Controller
                 'msg'=>'Successfully delete.'
             ]);
 
+        }elseif($name=="update_feedback_msg"){
+            $data =StudentProposal::find($req->edit_id);
+            $data->feedback_msg =$req->feedback_msg;
+            $data->update();
+
+            return response(['msg'=>'Updated successfully.']);
+            
+        }elseif($name=="delete_student_feedback_msg"){
+            $data =StudentProposal::find($req->delete_id);
+            $data->feedback_msg =NULL;
+            $data->update();
+
+            return response(['msg'=>'Deleted successfully.']);
         }
 
 

resources/views/admin/admin_profile.blade.php

@@ -586,21 +586,21 @@ tbody, td, tfoot, th, thead, tr {
                                             </td>
                                             <td style="font-size: 11px;">@if(!empty($row->created_at)){{date('d M Y', strtotime($row->created_at))}} @endif</td>
                                             <td style="font-size: 11px;">
-                                                @if($row->proposal_status==NULL)
-                                                   Hold
-                                                @endif
-                                                @if($row->proposal_status==1)
-                                                    In Review
-                                                @endif
                                                 @if($row->proposal_status==2)
-                                                    Pause
+                                                    Reviewing
                                                 @endif
                                                 @if($row->proposal_status==3)
-                                                    Rejected
+                                                    Push
                                                 @endif
                                                 @if($row->proposal_status==4)
+                                                    Hold
+                                                @endif
+                                                @if($row->proposal_status==5) 
                                                     Interested
                                                 @endif
+                                                @if($row->proposal_status==6)
+                                                    Rejected
+                                                @endif
                                             </td>
                                         </tr>
                                         @endforeach

resources/views/admin/sub_contents/edit_feedback_msg_form.blade.php

@@ -0,0 +1,37 @@
+<form method="POST" action="{{route('ajax-post', ['name'=>'update_feedback_msg'])}}" class="update_feedback"> 
+    <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+    <input type="hidden" name="edit_id" value="{{$edit->id}}">
+    <div class="col-md-12">
+        <div class="mb-2">
+            <label class="form-label config"></label>
+            <div class="form-icon position-relative">
+                <textarea class="form-control" name="feedback_msg" id="message" required="">{{$edit->feedback_msg }}</textarea>
+            </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" >
+                <i aria-hidden="true" class="fa fa-refresh"></i>
+            </button>
+            <button class="btn btn2">Update</button>                      
+        </div>
+    </div> 
+</form>  
+
+<script>
+    $(function(){
+        $('.update_feedback').on('submit', function(event){
+            event.preventDefault();
+            var self = $(this); 
+            ajax_form(self, function(self){
+                window.location.reload(); 
+            });
+        });
+         
+
+        $('.btn-cancel').on('click', function(){ 
+            $('.open_feedback_msg_edit_info_div_inner').addClass('d-none')
+        });
+    });
+</script>

resources/views/application.blade.php

@@ -17,16 +17,14 @@
                             </div> -->
                         </div>
                     </div>
-                    @if(count($student_proposal) > 0 )
                     <div class="col-md-12">
+                        @if(count($student_proposal) > 0 )
                         <div class="scrolled_content_part">
                             @foreach($student_proposal as $key=>$row)
                             <div class="single_ad_pref_item mb-4">
                                 <div class="p-2" style="display:flex;">
                                     <div class="left" style="width:50%;">
-                                        <div class="uni_details" style="display:flex;">
-
-
+                                        <div class="uni_details" style="display:flex;"> 
                                             @if(cn($row,'teacher_details.university'))
                                             <img class="img-responsive listFlag" style="border-radius: 20px; padding: 0px;height: 37px;width: 37px;" 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">
                                             @else
@@ -38,13 +36,17 @@
                                                 <strong style="font-size:13px;">{{ cn($row,'teacher_details.first_name','')}} {{ cn($row,'teacher_details.last_name','')}}</strong></br>
                                                     <span style="font-size:12px; font-weight:400;"> {{cn($row,'teacher_details.designation','')}} </span>
                                                     <span>.</span>
-                                                    @if(isset($row->teacher_details->department_name))
-                                                        <span style="font-size:12px; font-weight:400;"> {{cn($row,'teacher_details.department_name.name','')}}</span>
-                                                    @else
+                                                    @if(isset($row->teacher_details->others_department))
                                                         <span style="font-size:12px; font-weight:400;">{{cn($row,'teacher_details.others_department','')}}</span>
+                                                    @else
+                                                        <span style="font-size:12px; font-weight:400;"> {{cn($row,'teacher_details.department_name.name','')}}</span>
                                                     @endif
                                                     <span>.</span>
-                                                    <span style="font-size:12px; font-weight:400;"> {{cn($row,'teacher_details.university.name','')}} </span>
+                                                    @if($row->teacher_details->university_name)
+                                                        <span style="font-size:12px; font-weight:400;"> {{cn($row,'teacher_details.university_name','')}} </span>
+                                                    @else
+                                                        <span style="font-size:12px; font-weight:400;"> {{cn($row,'teacher_details.university.name','')}} </span>
+                                                    @endif
                                             </div>
                                         </div>
                                     </div>
@@ -87,31 +89,51 @@
                                     <div class="left" style="width:50%;">
                                         <div class="uni_details" style="display:flex;">
                                             <div class="inner_right ms-5">
-                                                <span style="font-size:12px;">Preferred Start Date : <br><strong style="font-size:13px;">@if(!empty($row->submitted_date)){{ date('M Y', strtotime($row->submitted_date))}} @else @endif</strong></span><br>
+                                                <span style="font-size:12px;">Preferred Start Date : <br><strong style="font-size:13px;">@if(!empty($row->submitted_date)){{ date('M Y', strtotime($row->submitted_date))}} @else {{'N/A'}} @endif</strong></span><br>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="text-end" style="width:50%;">
                                         <span style="font-size:12px;">Application Status </span><br>
-                                        @if($row->proposal_submit_status==1)
+                                        @if($row->proposal_submit_status==1 && $row->proposal_status ==1)
                                             <span class="label_badge_radius" style="background-color: #d8fdd8; color: green; border-radius: 5px; font-weight: bold;">Applied</span>
-                                           
+                                        @elseif($row->proposal_submit_status==1 && $row->proposal_status ==2 || $row->proposal_submit_status==1 && $row->proposal_status ==3)
+                                            <span class="label_badge_radius" style="background-color: #d8fdd8; color: green; border-radius: 5px; font-weight: bold;">In Review</span>
+                                        @elseif($row->proposal_submit_status==1 && $row->proposal_status ==4)
+                                            <span class="label_badge_radius" style="background-color: #d8fdd8; color: green; border-radius: 5px; font-weight: bold;">Hold</span>
+                                        @elseif($row->proposal_submit_status==1 && $row->proposal_status ==5)
+                                            <span class="label_badge_radius" style="background-color: #d8fdd8; color: green; border-radius: 5px; font-weight: bold;">Interested</span>
+                                        @elseif($row->proposal_submit_status==1 && $row->proposal_status ==6)
+                                            <span class="label_badge_radius" style="background-color: #d8fdd8; color: green; border-radius: 5px; font-weight: bold;">Rejected</span>
                                         @elseif($proposal =='true' || $publication =='true' || $worK_exp =='true'|| $institution =='true'|| $score =='true')   
                                           <span class="label_badge_radius" style="background-color: #d8fdd8; color: green; border-radius: 5px; font-weight: bold; cursor: pointer;">Draft</span>
                                         @else
                                             <span class="label_badge_radius open_modal_page" data-url="{{ route('modal-get',['name'=>'update_student_proposal','id'=>$row->id,'student_id'=>$row->student_id,'teacher_id'=>$row->teacher_id]) }}" data-title="Submit your Proposal" style="background-color: #f2d0a4; color: #dc3545; border-radius: 5px; font-weight: bold; cursor: pointer;">Submit</span>
                                         @endif
                                     </div>
-                                </div>
-                                 <div class="p-2" style="display:flex; border-top: 1px solid #eee;">
-                                    <div class="left">
-                                        <div class="uni_details" style="display:flex;">
-                                            <div class="inner_right ms-5">
-                                                <span style="font-size:12px; color: red;">{{ $row->feedback_msg ?? ""}}</span><br>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
+                                </div> 
+                                   
+                                <div class="p-2" style="display:flex; border-top: 1px solid #eee;"> 
+                                    @if($row->proposal_submit_status==1 && $row->proposal_status ==6 && $row->feedback_msg)    
+                                    <span class="alert mt-3" role="alert" style="font-size: 12px !important; border-radius: .55rem; padding: 8px 12px; margin-top: 6px; background: #fff0d6; color: rgb(237, 14, 14); border-color: #ffebca; border-width: 3px; border-style: double;"> 
+                                        <i class="fa fa-warning" style="font-size: 11px; margin-right: 5px; color: rgb(237, 14, 14) !important; top: 0px; position: relative;"></i>  
+                                        Rejected, {{ $row->feedback_msg }} 
+                                    </span>
+                                    @elseif($row->proposal_submit_status==1 && $row->proposal_status ==4)
+                                    <span class="alert mt-3" role="alert" style="font-size: 12px !important; border-radius: .55rem; padding: 8px 12px; margin-top: 6px; background: #fff0d6; color: rgb(237, 14, 14); border-color: #ffebca; border-width: 3px; border-style: double;"> 
+                                        <i class="fa fa-warning" style="font-size: 11px; margin-right: 5px; color: rgb(237, 14, 14) !important; top: 0px; position: relative;"></i>  
+                                            
+                                        {{'Hold, Further document/information needed'}}
+                                    </span>
+                                    @elseif($row->proposal_submit_status==1 && $row->proposal_status ==5)
+                                    <span class="alert mt-3" role="alert" style="font-size: 12px !important; border-radius: .55rem; padding: 8px 12px; margin-top: 6px; background: #fff0d6; color: rgb(237, 14, 14); border-color: #ffebca; border-width: 3px; border-style: double;"> 
+                                        <i class="fa fa-warning" style="font-size: 11px; margin-right: 5px; color: rgb(237, 14, 14) !important; top: 0px; position: relative;"></i>  
+                                            
+                                        {{'Interested, please submit application'}}
+                                    </span>
+                                    @endif 
+                                
+                               </div>
                             </div>
                             @endforeach
                         </div>

resources/views/teacher/student_proposal_details.blade.php

@@ -810,6 +810,10 @@ element.style {
   .pro_top_rating > input:checked ~ label:hover ~ label {
     color: #FECE31;
   }
+
+  .hand{
+    cursor: pointer;
+  }
 </style>
 <body>
         <header id="" class="defaultscroll sticky">
@@ -971,11 +975,15 @@ element.style {
                                                                     <span class="title" style="font-size:11px; font-weight: 600;">Concept :</span>
                                                                     <div class="top_part_status" style="position: relative; width: fit-content; margin-left: 10px; float: right;">
                                                                         @if($proposal_details->concept==1)
-                                                                            <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
+                                                                            <span class="top_part_status_name" style="background: #bcfaca; color: #0a9652;">
                                                                                 Good
                                                                             </span>
+                                                                        @elseif($proposal_details->concept==2)
+                                                                            <span class="top_part_status_name" style="background: #ffca84; color: #ee8414;">
+                                                                                Average
+                                                                            </span>
                                                                         @else
-                                                                            <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
+                                                                            <span class="top_part_status_name" style="background: #f8c8c8; color: #db390c;">
                                                                                 Poor
                                                                             </span>
                                                                         @endif
@@ -983,7 +991,8 @@ element.style {
                                                                                 <i class="fa fa-caret-down dropdown-toggle add_hover tooltips" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-original-title="Change Status" style="color: #8c9094;"></i>
                                                                             <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; transform: translate3d(10px, 13px, 0px); top: 0px; left: 0px; will-change: transform; margin-left: -75px; z-index: 2; margin-top: 10px;">
                                                                                 <a class="dropdown-item concept_change" data-val="1" @if($proposal_details->concept==1) {{'activate'}} @endif" data-id="{{$proposal_details->id}}"  name="concept">Good</a>
-                                                                                <a class="dropdown-item concept_change" data-val="2" @if($proposal_details->concept==2) {{'activate'}} @endif" data-id="{{$proposal_details->id}}" name="concept">Poor</a>
+                                                                                <a class="dropdown-item concept_change" data-val="2" @if($proposal_details->concept==2) {{'activate'}} @endif" data-id="{{$proposal_details->id}}" name="concept">Average</a>
+                                                                                <a class="dropdown-item concept_change" data-val="3" @if($proposal_details->concept==3) {{'activate'}} @endif" data-id="{{$proposal_details->id}}" name="concept">Poor</a>
                                                                             </div>
                                                                         </div>
                                                                     </div>
@@ -991,38 +1000,46 @@ element.style {
                                                                 <div class="single_glance_row mt-1" style="border-bottom: none;">
                                                                         <span class="title" style="font-size:11px; font-weight: 600;">Status :</span>
                                                                     <div class="top_part_status" style="position: relative; width: fit-content; margin-left: 10px; float: right;">
-                                                                        @if($proposal_details->proposal_status==NULL)
-                                                                        <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
-                                                                            Hold
-                                                                        </span>
-                                                                        @endif
                                                                         @if($proposal_details->proposal_status==1)
                                                                         <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
-                                                                            In Review
+                                                                            New
                                                                         </span>
                                                                         @endif
                                                                         @if($proposal_details->proposal_status==2)
                                                                         <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
-                                                                            Pause
+                                                                            Reviewing
                                                                         </span>
                                                                         @endif
                                                                         @if($proposal_details->proposal_status==3)
                                                                         <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
-                                                                            Rejected
+                                                                            Pause
                                                                         </span>
                                                                         @endif
                                                                         @if($proposal_details->proposal_status==4)
+                                                                        <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
+                                                                           Hold
+                                                                        </span>
+                                                                        @endif
+                                                                        @if($proposal_details->proposal_status==5)
                                                                         <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
                                                                             Interested
                                                                         </span>
                                                                         @endif
+                                                                         
+                                                                        @if($proposal_details->proposal_status==6)
+                                                                        <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
+                                                                            Rejected
+                                                                        </span>
+                                                                        @endif
                                                                         <div class="dropdown" style="top: -2px; position: absolute; right: 9px;">
                                                                                 <i class="fa fa-caret-down dropdown-toggle add_hover tooltips" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-original-title="Change Status" style="color: #8c9094;"></i>
                                                                             <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; transform: translate3d(10px, 13px, 0px); top: 0px; left: 0px; will-change: transform; margin-left: -75px; z-index: 2; margin-top: 10px;">
-                                                                                <a class="dropdown-item status_change hand" data-val="1" data-id="{{$proposal_details->id}}" name="proposal_status">In Review</a>
-                                                                                <a class="dropdown-item status_change hand" data-val="2" data-id="{{$proposal_details->id}}" name="proposal_status">Pause</a>
-                                                                                <a class="dropdown-item status_change hand" data-val="3" data-id="{{$proposal_details->id}}" name="proposal_status">Rejected</a>
-                                                                                <a class="dropdown-item status_change hand" data-val="4" data-id="{{$proposal_details->id}}" name="proposal_status">Interested</a>
+                                                                                {{-- <a class="dropdown-item status_change hand" data-val="1" data-id="{{$proposal_details->id}}" name="proposal_status">New</a> --}}
+                                                                                <a class="dropdown-item status_change hand" data-val="2" data-id="{{$proposal_details->id}}" name="proposal_status">In Review</a>
+                                                                                <a class="dropdown-item status_change hand" data-val="3" data-id="{{$proposal_details->id}}" name="proposal_status">Pause</a> <!--Push means less than 2 seconds does one thing -->
+                                                                                <a class="dropdown-item status_change hand" data-val="4" data-id="{{$proposal_details->id}}" name="proposal_status">Hold</a>  <!--holding it for longer does something-->
+                                                                                <a class="dropdown-item status_change hand" data-val="5" data-id="{{$proposal_details->id}}" name="proposal_status">Interested</a>
+                                                                                <a class="dropdown-item status_change hand" data-val="6" data-id="{{$proposal_details->id}}" name="proposal_status">Rejected</a>
                                                                             </div>
                                                                         </div>
                                                                     </div>
@@ -1038,257 +1055,71 @@ element.style {
                             </div>
                         </div>
                     </div>
-                    <div class="col-md-3 mt-4" style="padding: 0px 0px 0px 23px;">
-                            <!-- <div class="card shadow p-3 rounded border-0 mb-4" style="background-color: white;">
-                                <div class="info-palate mt-0" style="margin:0px;">
-                                    <div class="left">
-                                        <div>
-                                            <div class="single_glance_row mt-1">
-                                                <span class="title" style="font-size:11px; font-weight: 600;">Proposal Quality :</span>
-                                                <span class="tbl2 mb-2 pro_top_rating" style="float:right;">
-                                                    <input type="radio" class="rate_star_update" data-id="{{$proposal_details->id}}" id="star5" name="rate" value="5" @if($proposal_details->proposal_quality ==5) checked @endif/>
-                                                    <label class="rate_star hand tooltips" for="star5" title="5 stars"></label>
-                                                    <input type="radio" class="rate_star_update" data-id="{{$proposal_details->id}}" id="star4" name="rate" value="4" @if($proposal_details->proposal_quality ==4) checked @endif/>
-                                                    <label class="rate_star hand tooltips" for="star4" title="4 stars"></label>
-                                                    <input type="radio" class="rate_star_update" data-id="{{$proposal_details->id}}" id="star3" name="rate" value="3" @if($proposal_details->proposal_quality ==3) checked @endif/>
-                                                    <label class="rate_star hand tooltips" for="star3" title="3 stars"></label>
-                                                    <input type="radio" class="rate_star_update" data-id="{{$proposal_details->id}}" id="star2" name="rate" value="2" @if($proposal_details->proposal_quality ==2) checked @endif/>
-                                                    <label class="rate_star hand tooltips" for="star2" title="2 stars"></label>
-                                                    <input type="radio" class="rate_star_update" data-id="{{$proposal_details->id}}" id="star1" name="rate" value="1"  @if($proposal_details->proposal_quality ==1) checked @endif/>
-                                                    <label class="rate_star hand tooltips" for="star1" title="1 star"></label> 
-                                                </span>
-                                            </div>
-                                            <div class="single_glance_row mt-1">
-                                                <span class="title" style="font-size:11px; font-weight: 600;">Concept :</span>
-                                                <div class="top_part_status" style="position: relative; width: fit-content; margin-left: 10px; float: right;">
-                                                    @if($proposal_details->concept==1)
-                                                        <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
-                                                            Good
-                                                        </span>
-                                                    @else
-                                                        <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
-                                                            Poor
-                                                        </span>
-                                                    @endif
-                                                    <div class="dropdown" style="top:-2px; position: absolute; right: 9px;">
-                                                            <i class="fa fa-caret-down dropdown-toggle add_hover tooltips" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-original-title="Change Status" style="color: #8c9094;"></i>
-                                                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; transform: translate3d(10px, 13px, 0px); top: 0px; left: 0px; will-change: transform; margin-left: -75px; z-index: 2; margin-top: 10px;">
-                                                            <a class="dropdown-item concept_change" data-val="1" @if($proposal_details->concept==1) {{'activate'}} @endif" data-id="{{$proposal_details->id}}"  name="concept">Good</a>
-                                                            <a class="dropdown-item concept_change" data-val="2" @if($proposal_details->concept==2) {{'activate'}} @endif" data-id="{{$proposal_details->id}}" name="concept">Poor</a>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="single_glance_row mt-1">
-                                                    <span class="title" style="font-size:11px; font-weight: 600;">Status :</span>
-                                                <div class="top_part_status" style="position: relative; width: fit-content; margin-left: 10px; float: right;">
-                                                    @if($proposal_details->proposal_status==NULL)
-                                                    <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
-                                                        Hold
-                                                    </span>
-                                                    @endif
-                                                    @if($proposal_details->proposal_status==1)
-                                                    <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
-                                                        In Review
-                                                    </span>
-                                                    @endif
-                                                    @if($proposal_details->proposal_status==2)
-                                                    <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
-                                                        Pause
-                                                    </span>
-                                                    @endif
-                                                    @if($proposal_details->proposal_status==3)
-                                                    <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
-                                                        Rejected
-                                                    </span>
-                                                    @endif
-                                                    @if($proposal_details->proposal_status==4)
-                                                    <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
-                                                        Interested
-                                                    </span>
-                                                    @endif
-                                                    <div class="dropdown" style="top: 0.4px; position: absolute; right: 9px;">
-                                                            <i class="fa fa-caret-down dropdown-toggle add_hover tooltips" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" data-original-title="Change Status" style="color: #8c9094;"></i>
-                                                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; transform: translate3d(10px, 13px, 0px); top: 0px; left: 0px; will-change: transform; margin-left: -75px; z-index: 2; margin-top: 10px;">
-                                                            <a class="dropdown-item status_change hand" data-val="1" data-id="{{$proposal_details->id}}" name="proposal_status">In Review</a>
-                                                            <a class="dropdown-item status_change hand" data-val="2" data-id="{{$proposal_details->id}}" name="proposal_status">Pause</a>
-                                                            <a class="dropdown-item status_change hand" data-val="3" data-id="{{$proposal_details->id}}" name="proposal_status">Rejected</a>
-                                                            <a class="dropdown-item status_change hand" data-val="4" data-id="{{$proposal_details->id}}" name="proposal_status">Interested</a>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                                
-                                            <div class="single_glance_row mt-1 d-none" id="feedback" style="border-bottom: none;">
-                                                <span class="title" style="font-size:11px; font-weight: 600;">Feedback :</span>
-                                                <span class="tbl2"> 
-                                                    <div class="mb-2">
-                                                        <div class="form-icon position-relative">
-                                                            <input type="hidden" name="p_status" id="p_status" value="">
-                                                            <textarea class="form-control" name="message" id="message" required="">{{$proposal_details->feedback_msg ?? ''}}</textarea>
-                                                        </div>
-                                                    </div>
-                                                    <div class="text-end">
-                                                        <button class="btn btn2 feedback_btn" data-id="{{$proposal_details->id}}">Save</button>                                                                                                                
-                                                    </div>                                
-                                                </span>     
-                                            </div>                                        
-                                        </div>
-                                    </div>     
-                                </div>
-                            </div> -->
-                         <!-- <div class="card shadow p-3 rounded border-0 mb-4" style="background-color: white;">
-                            <div class="info-palate mt-0">
-                                <div class="left">
-                                    <div class="ad_pref_item_header mb-2">
-                                        <div class="Feedback">Applicante Profile</div>
-                                    </div>
-                                     
-                                    @if(count($education_history))
-                                        @foreach($education_history as $row)
-                                            <div class="summary_edu_part mt-1">
-                                                <div class="education_head">
-                                                    <div class="left">
-                                                        <span class="edu_title">{{cn($row,'academic_level_info.name','')}}</span>
-                                                    </div>
-                                                    <div class="right">
-                                                        <span class="label_badge_radius" style="font-weight: 600; background: #fff;">{{$row->result}}  </span>
-                                                    </div>
-                                                </div>
-                                                <div class="education_body mt-3">
-                                                    <ul>
-                                                        <li>{{$row->subject}}</li>
-                                                        <li>{{$row->institution}}</li>
-                                                        <li>{{date('M Y', strtotime($row->start_date))}} - {{date('M Y', strtotime($row->end_date))}}</li>
-                                                    </ul>
-                                                </div>
-                                            </div>
-                                        @endforeach
-                                    @endif
-                                    <div class="summary_ielts_part">
-                                        <div class="education_head">
-                                            <div class="left">
-                                                <span class="edu_title">{{cn($proposal_details,'scores.test_name','')}}</span>
-                                                    <div class="expiration">
-                                                        <span class="tooltips" style="font-size: 11px; color: #868e96;" data-original-title="Expiration">
-                                                            <i class="fa fa-calendar-check-o mr-1" style="color: #908f8f;"></i> 
-                                                            {{ date('d M Y', strtotime(cn($proposal_details,'scores.test_date','')))}}
-                                                        </span>
-                                                    </div>
-                                                <span class="label_badge_radius" style="position: absolute; right: 0; font-weight: 600; background-image: linear-gradient(to right, rgb(46 17 83 / 19%), rgb(245, 244, 253)); color: rgb(46, 17, 83);">{{cn($proposal_details,'scores.overall_score','')}}</span>
-                                            </div>
-                                        </div>
-                                        <div class="education_body mt-3" style="border-bottom: 1px solid #e8eef1;padding: 8px 0px">
-                                            <div class="result" style="display: flex;">
-                                                <div class="result-part" style="font-size: 11px;">
-                                                    <span class="single_point">Speaking: 
-                                                        <span class="point_number" style="font-weight: 700;">{{cn($proposal_details,'scores.speaking','')}} ,
-                                                        </span>
-                                                    </span>
-                                                 </div>
-                                                <div class="result-part" style="font-size: 11px;">
-                                                    <span class="single_point">Listening: 
-                                                        <span class="point_number" style="font-weight: 700;">{{cn($proposal_details,'scores.listening','')}} ,
-                                                        </span>
-                                                    </span>
-                                                </div>
-                                                <div class="result-part" style="font-size: 11px;">
-                                                    <span class="single_point">Writing: 
-                                                        <span class="point_number" style="font-weight: 700;">{{cn($proposal_details,'scores.writing','')}} ,
-                                                        </span>
-                                                    </span>
-                                                </div>
-                                                <div class="result-part" style="font-size: 11px;">
-                                                    <span class="single_point">Reading: 
-                                                        <span class="point_number" style="font-weight: 700;">{{cn($proposal_details,'scores.reading','')}} ,
-                                                        </span>
-                                                    </span>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="single_glance_row mt-1">
-                                        <span class="title" style="font-size:11px; font-weight: 600;">Work Exp:</span>
-                                        <span class="label_badge_radius" style="background: #e7f3ea !important; color: #0ba52e; margin-left: 3px;">{{work_experience($start_date ?? NULL, $end_date ?? NULL)}}</span>
-                                        <span style="font-size: 11px; color: #868e96;">@if(isset($start_date) && is_null($end_date))({{date('d M Y', strtotime($start_date))}} - Continue)@endif</span>
-                                    </div>
-                                </div>
-                            </div>
-                            
-                        </div>  -->
+                    <div class="col-md-3 mt-4" style="padding: 0px 0px 0px 23px;"> 
                         <div class="card shadow p-3 rounded border-0 mb-4" style="background-color: white;">
                             <div class="info-palate mt-0">
                                 <div class="left">
                                     <div class="mb-2">
                                         <div class="Feedback" style="font-size: 17px; font-weight: 700;">Applicante Profile</div>
                                     </div>
+                                    @if(count($education_history) > 0)
+                                    @foreach($education_history as $row)
                                     <div class="summary_edu_part mt-1">
                                         <div class="education_head">
                                             <div class="left">
-                                                <span class="edu_title">Masters</span>
+                                                <span class="edu_title">{{cn($row,'academic_level_info.name','')}}</span>
                                             </div>
                                             <div class="right">
-                                                <span class="label_badge_radius" style="font-weight: 600; background: #1416398a; color: white;">3</span>
+                                                <span class="label_badge_radius" style="font-weight: 600; background: #1416398a; color: white;">{{$row->result}}</span>
                                             </div>
                                         </div>
                                         <div class="education_body mt-2">
                                             <ul>
-                                                <li>subject</li>
-                                                <li>institution</li>
-                                                <li>passing date</li>
+                                                <li>{{$row->subject}}</li>
+                                                <li>{{$row->institution}}</li>
+                                                <li>{{$row->passing_year}}</li>
                                             </ul>
                                         </div>
-                                    </div>                                    
-                                    <!-- <div class="summary_edu_part mt-3">
-                                        <div class="education_head">
-                                            <div class="left">
-                                                <span class="edu_title">Publication</span>
-                                            </div>
-                                            <div class="right"></div>
-                                        </div>
-                                        <div class="education_body mt-2">
-                                            <ul>
-                                                <li>Title</li>
-                                                <li>status</li>
-                                            </ul>
-                                        </div>
-                                    </div> -->
+                                    </div>  
+                                    @endforeach
+                                    @endif
+                                    
                                     <div class="summary_ielts_part mt-2 ms-2">
                                         <div class="education_head">
                                             <div class="left">
-                                                <span class="edu_title">IELTS</span>
+                                                <span class="edu_title">{{cn($proposal_details,'scores.test_name','')}}</span>
                                                     <div class="expiration">
                                                         <span class="tooltips" style="font-size: 11px; color: #868e96;" data-original-title="Expiration">
                                                             <i class="fa fa-calendar-check-o mr-1" style="color: #908f8f;"></i> 
-                                                            1 May 2023
+                                                            @if(!empty($proposal_details->scores->expiration_date)) {{ date('d M Y', strtotime(cn($proposal_details,'scores.expiration_date','')))}} @else @endif
                                                         </span>
                                                     </div>
-                                                <span class="label_badge_radius" style="position: absolute; right: 10px; font-weight: 600; background: #1416398a; color: white;">7</span>
+                                                <span class="label_badge_radius" style="position: absolute; right: 10px; font-weight: 600; background: #1416398a; color: white;">{{cn($proposal_details,'scores.overall_score','')}}</span>
                                             </div>
                                         </div>
                                         <div class="education_body mt-1" style="border-bottom: 1px solid #e8eef1;padding: 8px 0px">
                                             <div class="result" style="display: flex;">
                                                 <div class="result-part" style="font-size: 11px;">
                                                     <span class="single_point">Speaking: 
-                                                        <span class="point_number" style="font-weight: 700;">3 ,
+                                                        <span class="point_number" style="font-weight: 700;">{{cn($proposal_details,'scores.speaking','')}} ,
                                                         </span>
                                                     </span>
                                                  </div>
                                                 <div class="result-part" style="font-size: 11px;">
                                                     <span class="single_point ms-2">Listening: 
-                                                        <span class="point_number" style="font-weight: 700;">1 ,
+                                                        <span class="point_number" style="font-weight: 700;">{{cn($proposal_details,'scores.listening','')}} ,
                                                         </span>
                                                     </span>
                                                 </div>
                                                 <div class="result-part" style="font-size: 11px;">
                                                     <span class="single_point ms-2">Writing: 
-                                                        <span class="point_number" style="font-weight: 700;">2 ,
+                                                        <span class="point_number" style="font-weight: 700;">{{cn($proposal_details,'scores.writing','')}} ,
                                                         </span>
                                                     </span>
                                                 </div>
                                                 <div class="result-part" style="font-size: 11px;">
                                                     <span class="single_point ms-2">Reading: 
-                                                        <span class="point_number" style="font-weight: 700;">3 
+                                                        <span class="point_number" style="font-weight: 700;">{{cn($proposal_details,'scores.reading','')}} 
                                                         </span>
                                                     </span>
                                                 </div>
@@ -1297,17 +1128,29 @@ element.style {
                                     </div>
                                     <div class="single_glance_row mt-1">
                                         <span class="title" style="font-size:11px; font-weight: 600;">Work Experience:</span>
-                                        <span class="label_badge_radius" style="background: #e7f3ea !important; color: #0ba52e; margin-left: 3px;">no</span>
+                                        @if($proposal_details->student_details->is_work_experience ==1)
+                                            <span class="label_badge_radius" style="background: #e7f3ea !important; color: #0ba52e; margin-left: 3px;">yes</span>
+                                        @else
+                                            <span class="label_badge_radius" style="background: #f1ac93 !important; color: #f80707; margin-left: 3px;">no</span>
+                                        @endif
                                         <span style="font-size: 11px; color: #868e96;"></span>
                                     </div>
                                     <div class="single_glance_row mt-1">
                                         <span class="title" style="font-size:11px; font-weight: 600;">Have you ever attended any conferences<br> to present your papers?</span>
-                                        <span class="label_badge_radius" style="background: #e7f3ea !important; color: #0ba52e; margin-left: 3px;">no</span>
+                                        @if($proposal_details->student_details->is_attended_conference ==1)
+                                            <span class="label_badge_radius" style="background: #e7f3ea !important; color: #0ba52e; margin-left: 3px;">yes</span>
+                                        @else
+                                            <span class="label_badge_radius" style="background: #f1ac93 !important; color: #f80707; margin-left: 3px;">no</span>
+                                        @endif
                                         <span style="font-size: 11px; color: #868e96;"></span>
                                     </div>
                                     <div class="single_glance_row mt-1">
                                         <span class="title" style="font-size:11px; font-weight: 600;">Do you have any Publication?</span>
-                                        <span class="label_badge_radius" style="background: #e7f3ea !important; color: #0ba52e; margin-left: 3px;">no</span>
+                                        @if($proposal_details->student_details->is_publication ==1)
+                                            <span class="label_badge_radius" style="background: #e7f3ea !important; color: #0ba52e; margin-left: 3px;">yes</span>
+                                        @else
+                                            <span class="label_badge_radius" style="background: #f1ac93 !important; color: #f80707; margin-left: 3px;">no</span>
+                                        @endif
                                         <span style="font-size: 11px; color: #868e96;"></span>
                                     </div>
                                     
@@ -1321,8 +1164,8 @@ element.style {
                         <div class="card border-0" style="border-radius:6px !important;">
                             <div class="container-fluid">
                                 <div class="row">
-                                    <div class="col-md-12" style="width: 99%; background-color:white; border-radius: 6px; padding: 10px;">
-                                        <div class="single_glance_row mt-1 d-none" id="feedback" style="border-bottom: none;">
+                                    <div class="col-md-12 d-none" id="feedback"  style="width: 99%; background-color:white; border-radius: 6px; padding: 10px;">
+                                        <div class="single_glance_row mt-1"  style="border-bottom: none;">
                                             <span class="title" style="font-size:11px; font-weight: 600;">Feedback :</span>
                                             <span class="tbl2"> 
                                                 <div class="mb-2">
@@ -1337,6 +1180,29 @@ element.style {
                                             </span>     
                                         </div> 
                                     </div>  
+                                    @if($proposal_details->feedback_msg)
+                                    <div class="col-md-12" style="width: 99%;font-size: 12px !important; background-color:#fff0d6; border-radius: 6px; padding: 10px;color: rgb(237, 14, 14);">
+                                        <div class="single_glance_row mt-1 single_edit_item">
+                                            
+                                            <div class="row" style="display: flex;">
+                                                <div class="col-md-10" style="width: 90%;">
+                                                    <span class="title" style="font-size:11px; font-weight: 600; color: rgb(237, 14, 14) !important;"> <i class="fa fa-warning" style="font-size: 11px; margin-right: 5px; color: rgb(237, 14, 14) !important; top: 0px; position: relative;"></i>
+                                                    Feedback :  {{$proposal_details->feedback_msg}} </span> 
+                                                </div>
+
+                                                <div class="col-md-2" style="width: 10%;">
+                                                    <span class="title" style="font-size:11px; font-weight: 600;">
+                                                        <button type="button" class="btn btn2 edit_feedback mb-1" data-id="{{$proposal_details->id}}" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-pencil"></i></button> 
+                                                    </span>
+                                                    <span class="title" style="font-size:11px; font-weight: 600;">
+                                                        <button type="button" class="btn btn2 delete_feedback mb-1" data-id="{{$proposal_details->id}}" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-trash" style="margin-left:2px;"></i></button>
+                                                    </span>
+                                                </div>
+                                            </div>
+                                           
+                                        </div> 
+                                    </div>  
+                                    @endif
                                 </div>
                             </div>   
                         </div> 
@@ -1588,6 +1454,62 @@ element.style {
 
         $(function(){
 
+            var form_row_added=false;
+
+            $('.edit_feedback').on('click', function(){
+                if(form_row_added){
+                    $('.open_feedback_msg_info_div').remove();
+                    form_row_added=false;
+                }
+                var self=$(this);
+                var self_tr=self.closest('.single_edit_item');
+
+                var std_propsal_id=self.data('id');
+
+                form_row_added=true;
+
+                self_tr.after(
+                "<div class='open_feedback_msg_info_div'><div class='open_feedback_msg_edit_info_div_inner'></div></div>"
+                );
+
+                fetch_sub_content(
+                    '.open_feedback_msg_edit_info_div_inner',
+                    "{{ route('sub-content', ['name'=>'edit_feedback_msg_form']) }}?std_propsal_id="+std_propsal_id
+                );
+
+            });
+
+            $('.delete_feedback').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_student_feedback_msg']) }}",form_data
+                    ).done(function(res){ 
+                        pop_up_msg(res.msg);  
+                        window.location.reload();
+                    }).fail(function(err){
+                        pop_up_msg(err_msg(err), 'error');
+                    });
+                }
+            });
+
+        });
+
             $('.rate_star_update').on('click', function(){
                 var self =$(this);
                 var id =self.data('id');
@@ -1610,6 +1532,7 @@ element.style {
                 }); 
                 
             });
+
             $('.concept_change').on('click', function(){
                 var self =$(this);
                 var id =self.data('id');
@@ -1660,8 +1583,8 @@ element.style {
                     'value':value
                  }
                  
-                 if(value==1 || value==2){
-
+                 if(value==2 || value ==3  || value ==4  || value ==5){  // 2 =Reviewing; 3 =Push; 4 =Hold; 5 =Interested
+                    $("#feedback").addClass('d-none');
                     swal({
                         title: "Are you sure you want to change status?",
                         text: "Please check before submitting!",
@@ -1688,21 +1611,24 @@ element.style {
                             });
                         } 
                     }); 
+                 }else if(value == 6){
+                    $("#feedback").removeClass('d-none');
+                    $('input[name="p_status"]').val(value);
                  }
 
                  
             });
 
-            $('.status_change').on('click', function(){
-                var value = $(this).data('val');
-                if(value ==3 || value ==4){
-                    $("#feedback").removeClass('d-none');
-                    $('input[name="p_status"]').val(value);
+            // $('.status_change').on('click', function(){
+            //     var value = $(this).data('val');
+            //     if(value == 6){
+            //         $("#feedback").removeClass('d-none');
+            //         $('input[name="p_status"]').val(value);
                      
-                }else{
-                    $("#feedback").addClass('d-none'); 
-                } 
-            });
+            //     }else{
+            //         $("#feedback").addClass('d-none'); 
+            //     } 
+            // });
 
             $('.feedback_btn').click(function(){
 

resources/views/teacher_profile.blade.php

@@ -645,27 +645,43 @@ tbody, td, tfoot, th, thead, tr {
                                                     <a href="{{ url('teacher/student-proposal-details') }}/{{$row->id}}"><strong style="font-size:11px; color:black;">{{cn($row,'proposal.title','')}}</strong></a></br>
                                                     <span style="color:black;">{{cn($row,'proposal.methology','')}}</span>
                                                     <span>.</span>
-                                                    <span style="color:black;">{{cn($row,'proposal.department.name','')}}</span>
+                                                    @php
+                                                       $proposal =\DB::table('proposal')->where(
+                                                        'student_id',$row->student_id
+                                                       )->first();
+
+                                                       $department =\DB::table('departments')->where(
+                                                        'id',$proposal->department
+                                                       )->first();
+                                                    @endphp
+                                                    <span style="color:black;">{{ $department->name ?? ''}}</span>
                                                     <span>.</span>
                                                     <span style="color:black;">{{cn($row,'proposal.status','')}}</span>
                                                 </div>
                                             </td>
                                             <td style="font-size: 11px; text-align:center;">
 
-                                                <div class="top_part_status">
-                                                    {{-- @if($row->proposal_status ==1)
-                                                        <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">In Review</button>
-                                                    @elseif($row->proposal_status ==2)
-                                                        <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Pause</button>
-                                                    @elseif($row->proposal_status ==3)
-                                                        <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Rejected</button>
-                                                    @elseif($row->proposal_status ==4)
+                                                <div class="top_part_status"> 
+                                                    @if($row->accepted_status==1 && $row->proposal_status ==1)
+                                                         <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Reviewing</button>
+                                                    @elseif($row->accepted_status==1 && $row->proposal_status ==2)
+                                                        <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Reviewing</button>
+                                                    @elseif($row->accepted_status==1 && $row->proposal_status ==3)
+                                                        <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Push</button>
+                                                    @elseif($row->accepted_status==1 && $row->proposal_status ==4)
+                                                        <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Hold</button>
+                                                    @elseif($row->accepted_status==1 && $row->proposal_status ==5)
                                                         <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Interested</button>
-                                                    @else --}}
-                                                    @if($row->accepted_status==1)
-                                                    <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">In Review</button>
+                                                    @elseif($row->accepted_status==1 && $row->proposal_status ==6)
+                                                        <button class="btn btn2" style="padding: 1px 10px !important; font-size: 11px;">Rejected</button>  
                                                     @else
-                                                    <button class="btn btn2 accept_status_update" data-id="{{$row->id}}" style="padding: 1px 10px !important; font-size: 11px;">Accept</button>
+                                                        <button class="btn btn2 accept_status_update" data-id="{{$row->id}}" style="padding: 1px 10px !important; font-size: 11px;">Accept</button>
+                                                    @endif
+
+                                                    @if($row->proposal_status_date)
+                                                       <br>
+                                                      <span style="font-size:11px; font-weight: bold;">{{date('d M Y H:i:A', strtotime($row->proposal_status_date))}}</span> 
+
                                                     @endif
                                                 </div>
                                             </td>

sql/update.sql

@@ -211,4 +211,10 @@ ALTER TABLE `users`
 	CHANGE COLUMN `register_type` `register_type` TINYINT(4) NULL DEFAULT '0' COMMENT '1=teacher_invitation, 2=teacher_wishlist/landing, 3=q-form,4=student_wishlist; 5= normal_register_student; 6= student_refer_friend' AFTER `sign_up`;
 
 ALTER TABLE `users`
-	CHANGE COLUMN `apply_status` `apply_status` TINYINT(4) NULL DEFAULT '0' COMMENT '1=approved, 2=declined, 3=suspend' AFTER `registered_date`;
+	CHANGE COLUMN `apply_status` `apply_status` TINYINT(4) NULL DEFAULT '0' COMMENT '1=approved, 2=declined, 3=suspend' AFTER `registered_date`;
+
+
+ALTER TABLE `student_proposals`
+	CHANGE COLUMN `concept` `concept` TINYINT(4) NULL DEFAULT '1' COMMENT '1=Good; 2=Averagre; 3=Poor' AFTER `proposal_quality`;
+ALTER TABLE `student_proposals`
+	CHANGE COLUMN `proposal_status` `proposal_status` TINYINT(4) NULL DEFAULT '1' COMMENT '1=New,2=Reviewing,3=Pause, 4=Hold, , 5=Interested ,6=Rejected' AFTER `concept`;