Mostafijur Rahman 1 year ago
parent
commit
0259b10796

+ 13 - 0
app/Http/Controllers/Admin/SubContentController.php

@@ -10,6 +10,7 @@ use App\Models\MarketCountry;
 use App\Models\Department;
 use App\Models\ResearchInterest;
 use App\Models\Requirement;
+use App\Models\Publication;
 use App\StudentProposal;
 use App\Proposal;
 use App\User;
@@ -100,6 +101,18 @@ class SubContentController extends Controller
 		}elseif($name=="edit_research_form"){
 			$data['edit_research'] =ResearchInterest::find($req->res_id);
 
+		}elseif($name=="publication_list_load"){
+			$student=Auth::user();
+            $data['publications'] = Publication::where(
+				'student_id',$student->id
+			)->orderBy(
+				'id','DESC'
+			)->get();
+
+		}elseif($name=="edit_publication_load"){
+
+			$data['edit_data']=Publication::find($req->edit_id);
+
 		}else $name='default';
 		//$data['page_sl']=new PageSL($data['chapter_details']);
 		return view("admin.sub_contents.{$name}", $data);

+ 77 - 0
app/Http/Controllers/AjaxController.php

@@ -11,6 +11,7 @@ use App\Models\Department;
 use App\Models\ReferUser;
 use App\Models\ResearchInterest;
 use App\Models\Requirement;
+use App\Models\Publication;
 use App\StudentProposal;
 use App\Proposal;
 use Session;
@@ -701,6 +702,82 @@ class AjaxController extends Controller
             return response([
                 'msg'=>'Successfully updated.'
             ]);
+        }elseif($name=="add_proposal_publication"){
+            $student=Auth::user(); 
+
+            $validator=\Validator::make($req->all(), [
+                'publication'=>'required',
+                'status'=>'required',
+            ]);
+
+            if($validator->fails()){
+                $errors=$validator->errors()->all();
+                return response(['msg'=>$errors[0]], 422);
+            }
+
+            $data =new Publication;
+            $data->student_id =$student->id;
+            $data->publication =$req->publication;
+            $data->status =$req->status;
+            $data->save();
+            return response([
+                'msg'=>'Successfully saved.'
+            ]);
+        }elseif($name=="update_publication"){
+            $student=Auth::user();
+
+            $validator=\Validator::make($req->all(), [
+                'publication'=>'required',
+                'status'=>'required',
+            ]);
+
+            if($validator->fails()){
+                $errors=$validator->errors()->all();
+                return response(['msg'=>$errors[0]], 422);
+            }
+
+            $data =Publication::find($req->edit_id);
+            $data->student_id  = $student->id;
+            $data->publication = $req->publication;
+            $data->status = $req->status;
+            $data->update();
+            return response([
+                'msg'=>'Successfully updated.'
+            ]);
+        }elseif($name=="delete_publication_info"){
+            $data =Publication::find($req->delete_id);
+            $data->delete();
+            return response([
+                'msg'=>'Successfully deleted.'
+            ]);
+        }elseif($name=="is_attended_conference_status"){ 
+
+            $data =User::find($req->uid);
+            if($req->checked =='yes'){
+                $data->is_attended_conference =1; // 1=yes
+            }else{
+                $data->is_attended_conference =2; // 2=no
+            }
+
+            $data->update();
+
+            return response([
+                'msg'=>'Successfully saved.'
+            ]);
+             
+        }elseif($name=="work_experience_status_update"){
+            $data =User::find($req->uid);
+            if($req->value =='yes'){
+                $data->is_work_experience =1; // 1=yes
+            }else{
+                $data->is_work_experience =2; // 2=no
+            }
+
+            $data->update();
+
+            return response([
+                'msg'=>'Successfully saved.'
+            ]);
         }
 	}
 }

+ 16 - 1
app/Http/Controllers/ModalController.php

@@ -12,6 +12,10 @@ use App\Models\ReferUser;
 use App\Models\Admin;
 use App\Models\Requirement;
 use App\Models\University;
+use App\Models\Publication;
+use App\Workexperience;
+use App\Institution;
+use App\Score;
 use Hash;
 use DB;
 use Session;
@@ -77,7 +81,7 @@ class ModalController extends Controller{
             ];
 
             $validator=\Validator::make($req->all(),$new_rules,[
-                'proposal_id.required'=>'No Proposal is selected.',
+                'proposal_id.required'=>'No Proposal available.',
                 'startdate'=>'required',
                 'startmonth'=>'required',
             ]);
@@ -93,6 +97,17 @@ 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();
+
+            if($publication || $worK_exp || $institution || $score){
+                return response(['msg'=>'you didn\'t complete your profile.'],403);
+            }
+
+             
+
             $student_proposal =new StudentProposal;
             $student_proposal->student_id =$req->student_id;
             $student_proposal->teacher_id =$req->teacher_id;

+ 10 - 0
app/Models/Publication.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Publication extends Model
+{
+    //
+}

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

@@ -56,7 +56,7 @@
                 </div>
                 <div class="col-md-12">
                     <div class="text-end">
-                        <button type="button" class="btn cancel_button mr-1 btn-cancel close_form" >
+                        <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>                      

+ 61 - 0
resources/views/admin/sub_contents/edit_publication_load.blade.php

@@ -0,0 +1,61 @@
+<form method="POST" action="{{route('ajax-post', ['name'=>'update_publication'])}}" class="edit_publication_info_form">  
+    <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+    <input type="hidden" name="edit_id" value="{{$edit_data->id}}">
+    <input type="hidden" name="action" value="edit"> 
+    <div class="panel-body" style="padding:10px; background-color: #4b4c6824; border: 1px solid #e9e5e5; border-radius: 5px;"> 
+    <div class="row">
+        <div class="col-md-5">
+            <div class="mb-1">
+                    <label class="form-label">Publication  <span class="text-danger">*</span></label>
+                <div class="form-icon position-relative">
+                    <input type="text" class="form-control ps-2" name="publication" value="{{$edit_data->publication}}" placeholder="" required="">
+                </div>
+            </div>
+        </div> 
+        <div class="col-md-5">
+            <div class="mb-1">
+                    <label class="form-label">Status<span class="text-danger">*</span></label>
+                <div class="form-icon position-relative">
+                    <select name="status" id="status" class="form-control frm" required="">
+                            <option disabled="" selected="" value="">Choose one....</option>
+                            <option value="1" @if($edit_data->status==1) selected @endif>Published</option>                                                                                    
+                            <option value="2" @if($edit_data->status==2) selected @endif>Under Review</option>                                                                                    
+                            <option value="3" @if($edit_data->status==3) selected @endif>Draft stage</option>                                                                                    
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-2">
+            <div class="mt-4 pt-3">
+                <div class="text-end"> 
+                    <button type="button" class="btn cancel_button mr-1" 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 icncl"></i>
+                    </button>
+                    <button class="btn btn2" id="publication_update">Update</button>                                                                                                                
+                </div>
+            </div>
+        </div>                                                                                                                                           
+    </div>
+    </div>
+</form>
+
+<script>
+    $(function(){
+        $('.edit_publication_info_form').on('submit', function(event){
+                event.preventDefault();
+                var self = $(this); 
+                ajax_form(self, function(self){
+                    $('#edit_publication_load').empty();
+                    fetch_sub_content(
+                        '#publication_load',
+                        "{{ route('sub-content', ['name'=>'publication_list_load']) }}"
+                    );  
+                });
+        });
+    });
+
+    $('.cancel_button').on('click', function(){ 
+        $('.edit_data').addClass('d-none')
+    });
+</script>
+    

+ 118 - 0
resources/views/admin/sub_contents/publication_list_load.blade.php

@@ -0,0 +1,118 @@
+@extends('admin.sub_contents.base')  
+@section('main') 
+<div class="table-responsive mt-2">
+    <table class="table table-bordered list_table" style="margin-bottom:10px;">
+        <thead>
+            <tr>
+                <th style="width: 8%">Sl</th>
+                <th style="width: 70%">Title</th>
+                <th style="width: 12%">Status</th>
+                <th style="width: 10%; text-align: center;">Action</th>
+            </tr>
+        </thead>
+        <tbody>
+            @if(count($publications) > 0)
+                @foreach($publications as $key=>$row)
+                <tr>
+                    <td style="font-size: 11px;">{{++$key}}</td>
+                    <td style="font-size: 11px;">{{$row->publication}}</td>
+                    <td style="font-size: 11px;">
+                        @if($row->status==1)
+                            <span>Published</span>
+                        @endif
+                        @if($row->status==2)
+                            <span>Under Review</span>
+                        @endif
+                        @if($row->status==3)
+                            <span>Draft stage</span>
+                        @endif
+                    
+                    </td>
+                        <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>
+                        </div>
+                    </td>   
+                </tr>
+                <?php 
+                    $edit_cls_name = "edit_cls_".$row->id;
+                ?>
+                <tr class="edit_data {{$edit_cls_name}} d-none">
+                    <td colspan="4">
+                        <div class="edit_publication_load"></div>
+                    </td>
+                </tr>
+                @endforeach
+                @else
+                <tr>
+                    <td colspan="4" class="text-center">
+                        <span class="text-danger">No publication available!</span>
+                    </td>
+                 </tr>
+                @endif
+        </tbody>
+    </table>
+</div>
+ 
+@endsection
+
+
+<script>
+    $(function(){
+        $('.edit_publication_info').on('click', function(){  
+
+            $('.edit_publication_load').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_publication_load = self.closest('tbody').find('.edit_publication_load');
+
+            fetch_sub_content(
+                edit_publication_load,
+                "{!! route('sub-content', ['name'=>'edit_publication_load','action'=>'edit']) !!}&edit_id="+id
+            );
+        });
+
+        $('.delete_publication_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_publication_info']) }}",form_data
+                    ).done(function(res){
+
+                        pop_up_msg(res.msg);
+                        
+                        $('#publication_load').empty();
+                        fetch_sub_content(
+                            '#publication_load',
+                            "{{ route('sub-content', ['name'=>'publication_list_load']) }}"
+                        ); 
+
+                    }).fail(function(err){ 
+                        pop_up_msg(err_msg(err), 'error'); 
+                    }); 
+                } 
+            }); 
+                        
+        });
+    });
+</script>

+ 13 - 3
resources/views/home.blade.php

@@ -123,9 +123,19 @@
                                                     <tr>
                                                         <td style="font-size: 12px;">{{++$key}}</td>
                                                         <td style="font-size: 12px;">{{$row->student_apply_ref}}</td>
-                                                        <td style="font-size: 12px;"><strong>{{ cn($row,'teacher_details.first_name','')}} {{ cn($row,'teacher_details.last_name','')}}</strong><br>
-                                                        <span>{{cn($row,'teacher_details.designation','')}}</span></td>
-                                                        <td style="font-size: 12px;">{{cn($row,'teacher_details.university_name','')}}</br>
+                                                        <td style="font-size: 12px;">
+                                                            <div class="d-flex">
+                                                                @if($row->teacher_details->university)
+                                                                    <img class="img-responsive listFlag mt-2" style="border-radius: 2px; padding: 0px;height: 35px; width: 35px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($row,'teacher_details.university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top"> 
+                                                                @endif
+                                                                <div class="alert" style="background-color:white; padding: 3px 7px; margin-bottom: 0px;">
+                                                                <strong class="ml-2">{{ cn($row,'teacher_details.first_name','')}} {{ cn($row,'teacher_details.last_name','')}}</strong><br>
+                                                                <span class="ml-2">{{cn($row,'teacher_details.designation','')}}</span>
+                                                                </div>
+                                                            </div>
+                                                        
+                                                        </td>
+                                                        <td style="font-size: 12px;">{{cn($row,'teacher_details.university.name','')}}</br>
                                                         <span>
                                                             @if(isset($row->teacher_details->department_name))
                                                             {{cn($row,'teacher_details.department_name.name','')}}

+ 5 - 5
resources/views/modal_pages/apply_student_proposal.blade.php

@@ -11,13 +11,13 @@
                     <input type="hidden" name="teacher_id" value="{{$teacher->id}}">
                     <input type="hidden" name="student_id" value="{{$student->id}}">
                     <div class="d-flex">
-                        {{-- @if($teacher->university) --}}
-                            {{-- <img class="img-responsive listFlag mt-2" style="border-radius: 2px; padding: 0px;height: 45px; width: 44px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($teacher,'university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
-                        @else --}}
+                        @if($teacher->university)
+                             <img class="img-responsive listFlag mt-2" style="border-radius: 2px; padding: 0px;height: 45px; width: 44px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($teacher,'university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+                        {{-- @else
                         <div class="inner_left mt-1" style="background-color: #141639c4; padding: 18px 0px 0px 0px; height: 47px; width: 56px; margin-top: 9px !important;">
                             <p style="color:white; font-weight:600 !important; letter-spacing: 2px; text-align: center; margin-top: -8px; font-size: 17px;">{{ name_initials($teacher->first_name, $teacher->last_name) }}</p>
-                        </div>
-                        {{-- @endif --}}
+                        </div> --}}
+                        @endif
                         <div class="alert" style="background-color:white; padding: 3px 7px; margin-bottom: 0px;">
                             <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
                             <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br>

+ 220 - 124
resources/views/profile.blade.php

@@ -13,14 +13,12 @@
                                             <div class="card rounded border-0 mb-4" style="background-color:white; padding:0px;">
                                                 <div class="row">
                                                     <div class="col-md-12">
-                                                        <div class="text-end" style="margin:1.4rem !important;">
-                                                            <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
-                                                                <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo15">Add New Proposal</button>
-                                                            </a>
+                                                        <div class="text-end" style="margin:1.4rem !important;"> 
+                                                            <button type="button" class="btn btn2 btn-proposal-open">Add New Proposal</button> 
                                                         </div>
                                                             <!-- Proposal Tab -->
                                                         <div class="col-md-12 mb-4">
-                                                            <div id="demo15" class="collapse" style="width: 96%; margin-left: 21px;">
+                                                            <div id="demo15" class="proposal_info" style="width: 96%; margin-left: 21px; display:none;">
                                                                 <div class="panel-body" style="padding:10px; background-color: #16183f69; border: 1px solid #e9e5e5; border-radius: 5px;">
                                                                     <form method="POST" action="{{ route('proposal-save') }}"  enctype="multipart/form-data">
                                                                         @csrf
@@ -77,7 +75,7 @@
                                                                             <div class="col-md-2">
                                                                                 <div class="mt-4 pt-3">
                                                                                     <div class="text-end">
-                                                                                        <a href="" class="btn btncl"><i class="fa fa-refresh icncl"></i></a> 
+                                                                                        <span class="btn btncl btn-proposal-cancel"><i class="fa fa-refresh icncl"></i></span> 
                                                                                         <button class="btn btn2">Save</button>                                                                                                                
                                                                                     </div>
                                                                                 </div>
@@ -140,9 +138,11 @@
                                                                                 <i class="fa fa-edit change_pass_btn" style="font-size: 13px !important; padding: 4px;"></i>
                                                                             </a> 
                                                                             @endif
+                                                                            @if($row->document_file)
                                                                             <span class="open_modal_page hand" data-title="View Proposal" data-url="{{route('modal-get',['name'=>'view_student_proposal','id'=>$row->id])}}">
                                                                                 <i class="fa fa-eye change_pass_btn" style="font-size: 13px !important; padding: 4px;"></i>
                                                                             </span>
+                                                                            @endif
                                                                             
                                                                             @if(student_proposal($row->student_id, $row->id))
                                                                             <i class="fa fa-trash change_pass_btn delete_proposal" style="font-size: 13px !important; padding: 4px;"  data-id="{{ $row->id }}"></i>                                                                          
@@ -153,7 +153,7 @@
                                                             </div>
                                                             @else
                                                             <div style="padding: 0px 22px;">
-                                                                <div class="alert mt-2" style="border-color: #e9f0f3; font-size: 12px !important; color: #dc3545; border-radius: 30px; padding: 8px 15px;">
+                                                                <div class="alert mt-2 text-center" style="border-color: #e9f0f3; font-size: 12px !important; color: #dc3545; border-radius: 30px; padding: 8px 15px;">
                                                                     <span>No Proposal available.</span>
                                                                 </div>
                                                             </div> 
@@ -176,16 +176,19 @@
                                                                         Have you ever attended any conferences to present your papers?
                                                                     </div>
                                                                     <div class="col-md-6" style="text-align: end;">
-                                                                        <div class="form-check-inline ps-3">
-                                                                            <label class="form-check-label" for="radio1">
-                                                                                <input type="radio" class="form-check-input" name="" value="yes"  style="font-size: 12px;"> Yes
-                                                                            </label>
+                                                                        
+                                                                        <div class="pretty p-default p-round">
+                                                                            <input type="radio" class="is_attended_conference" data-id="{{$user_info->id}}" name="is_attended_conference" value="yes" @if($user_info->is_attended_conference ==1) {{'checked'}} @endif>
+                                                                            <div class="state p-primary">
+                                                                                <label class="form-check-label" style="font-size: 12px;">Yes</label>
                                                                             </div>
-                                                                        <div class="form-check-inline">
-                                                                            <label class="form-check-label" for="radio2">
-                                                                                <input type="radio" class="form-check-input" name="" value="no"  style="font-size: 12px;"> No
-                                                                            </label>
                                                                         </div>
+                                                                        <div class="pretty p-default p-round">
+                                                                            <input type="radio" class="is_attended_conference" data-id="{{$user_info->id}}" name="is_attended_conference" value="no" @if($user_info->is_attended_conference ==2) {{'checked'}} @endif>
+                                                                            <div class="state p-primary">
+                                                                                <label class="form-check-label" style="font-size: 12px;">No</label>
+                                                                            </div>
+                                                                        </div> 
                                                                     </div>
                                                                 </div>
                                                                 
@@ -207,25 +210,24 @@
                                                                         </div>
                                                                     </div>
                                                                                                 
-                                                                    <div class="col-md-6 mt-2" id="add_div" style="display:none;">
-                                                                        <div class="text-end" style="margin:0px !important;">
-                                                                            <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse11" aria-expanded="true" aria-controls="collapse11">
-                                                                                <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo17">Add</button>
-                                                                            </a>
+                                                                    <div class="col-md-6 mt-2">
+                                                                        <div class="text-end" style="margin:0px !important;"> 
+                                                                             <button type="button" class="btn btn2 btn-publication-open">Add</button>
+                                                                            
                                                                         </div>
                                                                     </div>
                                                                 </div>
                                                             </div> <!--box-end-->
                                                             <div class="col-md-12 mt-1">
-                                                                <div id="demo17" class="collapse">
-                                                                    <div class="panel-body" style="padding:10px; background-color: #16183f69;  border: 1px solid #e9e5e5; border-radius: 5px;">
-                                                                        <form method="" action="">
+                                                                <div id="demo17">
+                                                                    <div class="panel-body publication_info" style="padding:10px; background-color: #16183f69;  border: 1px solid #e9e5e5; border-radius: 5px; display:none;">
+                                                                        {{-- <form method="" action=""> --}}
                                                                            <div class="row">
                                                                                 <div class="col-md-5">
                                                                                     <div class="mb-1">
                                                                                             <label class="form-label" for="publication">Publication <span class="text-danger">*</span></label>
                                                                                         <div class="form-icon position-relative">
-                                                                                            <input type="text" for="publication" name="publication" class="form-control ps-2" required="">
+                                                                                            <input type="text" for="publication" name="publication" id="publication" class="form-control ps-2" required="">
                                                                                         </div>
                                                                                     </div>
                                                                                 </div>
@@ -233,11 +235,11 @@
                                                                                     <div class="mb-1">
                                                                                             <label class="form-label">Status<span class="text-danger">*</span></label>
                                                                                         <div class="form-icon position-relative">
-                                                                                            <select name="status" id="status" class="form-control frm" required="">
+                                                                                            <select name="status" id="publication_status" class="form-control frm" required="">
                                                                                                     <option disabled="" selected="" value="">Choose one....</option>
-                                                                                                    <option value="">Published</option>                                                                                    
-                                                                                                    <option value="">Under Review</option>                                                                                    
-                                                                                                    <option value="">Draft stage</option>                                                                                    
+                                                                                                    <option value="1">Published</option>                                                                                    
+                                                                                                    <option value="2">Under Review</option>                                                                                    
+                                                                                                    <option value="3">Draft stage</option>                                                                                    
                                                                                             </select>
                                                                                         </div>
                                                                                     </div>
@@ -245,85 +247,19 @@
                                                                                 <div class="col-md-2">
                                                                                     <div class="mt-4 pt-3">
                                                                                         <div class="text-end">
-                                                                                            <a href="" class="btn btncl"><i class="fa fa-refresh icncl"></i></a> 
-                                                                                            <button class="btn btn2">Save</button>                                                                                                                
+                                                                                            <span class="btn btncl"><i class="fa fa-refresh icncl btn-publication-cancel"></i></span> 
+                                                                                            <button class="btn btn2" id="submit_publication">Save</button>                                                                                                                
                                                                                         </div>
                                                                                     </div>
                                                                                 </div>                                                                                                                                           
                                                                             </div>
-                                                                        </form>
+                                                                        {{-- </form> --}}
                                                                     </div>
                                                                 </div>
                                                             </div><!--end col-->                               
                                                         </div>
                                                     </div>
-                                                    <div class="table-responsive mt-2">
-                                                        <table class="table table-bordered list_table" style="margin-bottom:10px;">
-                                                            <thead>
-                                                                <tr>
-                                                                    <th style="width: 8%">Sl</th>
-                                                                    <th style="width: 70%">Title</th>
-                                                                    <th style="width: 12%">Status</th>
-                                                                    <th style="width: 10%; text-align: center;">Action</th>
-                                                                </tr>
-                                                            </thead>
-                                                            <tbody>
-                                                                    <tr>
-                                                                        <td style="font-size: 11px;">1</td>
-                                                                        <td style="font-size: 11px;">sub</td>
-                                                                        <td style="font-size: 11px;">Published</td>
-                                                                            <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;"> 
-                                                                                <a role="" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse11" aria-expanded="true" aria-controls="collapse11">
-                                                                                    <i class="fa fa-edit change_pass_btn" data-toggle="collapse" data-target="#demo16"></i>
-                                                                                </a>
-                                                                                <i class="fa fa-trash change_pass_btn" data-id=""></i>
-                                                                            </div>
-                                                                        </td>   
-                                                                    </tr>
-                                                            </tbody>
-                                                        </table>
-                                                    </div>
-                                                    <div class="col-md-12">
-                                                        <div id="demo16" class="collapse">
-                                                            <div class="panel-body mb-2" style="padding:10px; background-color: #16183f69;  border: 1px solid #e9e5e5; border-radius: 5px;">
-                                                                <form method="" action="" id="">
-                                                                    <div class="row">
-                                                                        <div class="col-md-5">
-                                                                            <div class="mb-1">
-                                                                                    <label class="form-label">Publication  <span class="text-danger">*</span></label>
-                                                                                <div class="form-icon position-relative">
-                                                                                    <input type="text" class="form-control ps-2" name="publication " placeholder="" required="">
-                                                                                </div>
-                                                                            </div>
-                                                                        </div> 
-                                                                        <div class="col-md-5">
-                                                                            <div class="mb-1">
-                                                                                    <label class="form-label">Status<span class="text-danger">*</span></label>
-                                                                                <div class="form-icon position-relative">
-                                                                                    <select name="status" id="status" class="form-control frm" required="">
-                                                                                            <option disabled="" selected="" value="">Choose one....</option>
-                                                                                            <option value="">Published</option>                                                                                    
-                                                                                            <option value="">Under Review</option>                                                                                    
-                                                                                            <option value="">Draft stage</option>                                                                                    
-                                                                                    </select>
-                                                                                </div>
-                                                                            </div>
-                                                                        </div>
-                                                                        <div class="col-md-2">
-                                                                            <div class="mt-4 pt-3">
-                                                                                <div class="text-end">
-                                                                                    <a href="" class="btn btncl"><i class="fa fa-refresh icncl"></i></a> 
-                                                                                    <button class="btn btn2">Update</button>                                                                                                                
-                                                                                </div>
-                                                                            </div>
-                                                                        </div>                                                                                                                                           
-                                                                    </div>
-                                                                </form>
-                                                            </div>
-                                                        </div>
-                                                    </div><!--end col-->                                                               
+                                                    <div id="publication_load"></div>                        
                                                 </div>
                                             </div>
                                         </div>
@@ -342,17 +278,16 @@
                                                                         </div>
                                                                     </div>
                                                                     <div class="col-md-6">
-                                                                        <div class="text-end mt-2 pt-1">
-                                                                            <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
-                                                                                <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo">Add</button>
+                                                                        <div class="text-end mt-2 pt-1"> 
+                                                                                <button type="button" class="btn btn2 btn-education-open" >Add</button>
                                                                             </a>
                                                                         </div>
                                                                     </div>
                                                                 </div>
                                                             </div> <!--box-end-->
                                                             <div class="col-md-12 mt-1">
-                                                                <div id="demo" class="collapse">
-                                                                    <div class="panel-body" style="padding:10px; background-color: #16183f69;  border: 1px solid #e9e5e5; border-radius: 5px;">
+                                                                <div id="demo">
+                                                                    <div class="panel-body education_info" style="padding:10px; background-color: #16183f69;  border: 1px solid #e9e5e5; border-radius: 5px; display:none;">
                                                                         <form method="POST" action="{{ route('institution-save') }}">
                                                                         @csrf
                                                                            <div class="row">
@@ -510,7 +445,7 @@
                                                                                 <div class="col-md-4">
                                                                                     <div class="mt-4 pt-3">
                                                                                         <div class="text-end">
-                                                                                            <a href="{{url()->current()}}" class="btn btncl"><i class="fa fa-refresh icncl"></i></a> 
+                                                                                            <span class="btn btncl"><i class="fa fa-refresh icncl btn-education-cancel"></i></span> 
                                                                                             <button class="btn btn2">Save</button>                                                                                                                
                                                                                         </div>
                                                                                     </div>
@@ -754,7 +689,7 @@
                                                             <div class="col-md-6 mt-2">
                                                                 <div style="margin:0px !important; font-size:12px;font-weight: 600;">
                                                                     Do you have any Work Experience?
-                                                                    <div class="form-check-inline ps-3">
+                                                                    {{-- <div class="form-check-inline ps-3">
                                                                         <label class="form-check-label" for="radio1">
                                                                             <input type="radio" {{ Auth::user()->is_work_experience == 1 ? 'checked' : ''}} class="form-check-input" name="work_experience" value="Yes"  style="font-size: 12px;" onclick="checkWorkExperience('1')"> Yes
                                                                         </label>
@@ -763,21 +698,31 @@
                                                                         <label class="form-check-label" for="radio2">
                                                                             <input type="radio" {{ Auth::user()->is_work_experience == 2 ? 'checked' : ''}} class="form-check-input" name="work_experience" value="No"  style="font-size: 12px;" onclick="checkWorkExperience('2')"> No
                                                                         </label>
+                                                                    </div> --}}
+                                                                    <div class="pretty p-default p-round">
+                                                                        <input type="radio" class="work_experience" data-id="{{$user_info->id}}" name="work_experience" value="yes" {{ Auth::user()->is_work_experience == 1 ? 'checked' : ''}}>
+                                                                        <div class="state p-primary">
+                                                                            <label class="form-check-label" style="font-size: 12px;font-weight:bold;">Yes</label>
+                                                                        </div>
                                                                     </div>
+                                                                    <div class="pretty p-default p-round">
+                                                                        <input type="radio" class="work_experience" data-id="{{$user_info->id}}" name="work_experience" value="no" {{ Auth::user()->is_work_experience == 2 ? 'checked' : ''}}>
+                                                                        <div class="state p-primary">
+                                                                            <label class="form-check-label" style="font-size: 12px; font-weight:bold;">No</label>
+                                                                        </div>
+                                                                    </div> 
                                                                 </div>
                                                             </div>
                                                                                         
-                                                            <div class="col-md-6 mt-2" id="add_div" style="display:none;">
-                                                                <div class="text-end" style="margin:0px !important;">
-                                                                    <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
-                                                                        <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo1">Add</button>
-                                                                    </a>
+                                                            <div class="col-md-6 mt-2" id="add_work" @if(Auth::user()->is_work_experience == 2 || Auth::user()->is_work_experience == NULL) style="display:none;" @endif>
+                                                                <div class="text-end" style="margin:0px !important;"> 
+                                                                        <button type="button" class="btn btn2 btn-workexp-open" >Add</button> 
                                                                 </div>
                                                             </div>
                                                         </div>
                                                         <div class="col-md-12 mt-2">
-                                                            <div id="demo1" class="collapse">
-                                                                <div class="panel-body" style="padding:10px; background-color: #16183f69;  border: 1px solid #e9e5e5; border-radius: 5px;">
+                                                            <div id="demo1">
+                                                                <div class="panel-body workexp_info" style="padding:10px; background-color: #16183f69;  border: 1px solid #e9e5e5; border-radius: 5px; display: none;">
                                                                     <form method="POST" action="{{ route('work-save') }}">
                                                                             @csrf
                                                                         <div class="row">
@@ -900,7 +845,7 @@
                                                                         <div class="col-md-12">
                                                                             <div class="mt-2">
                                                                                 <div class="text-end">
-                                                                                    <a href="{{url()->current()}}" class="btn btncl"><i class="fa fa-refresh icncl"></i></a>  
+                                                                                    <span class="btn btncl btn-workexp-cancel"><i class="fa fa-refresh icncl"></i></span>  
                                                                                     <button class="btn btn2" type="submit">Save</button>                                                                                                              
                                                                                 </div>
                                                                             </div>
@@ -1112,14 +1057,14 @@
                                                                 </div>
                                                                 <div class="col-md-6 mt-2" id="add_test_div" style="display:none;">
                                                                     <div class="text-end" style="margin:0px !important;">
-                                                                        <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
-                                                                            <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo2">Add</button>
-                                                                        </a>
+                                                                         
+                                                                            <button type="button" class="btn btn2 btn-score-open">Add</button>
+                                                                        
                                                                     </div>
                                                                 </div>
                                                             </div>
                                                             <div class="col-md-12">
-                                                                <div id="demo2" class="collapse">
+                                                                <div id="demo2" class="score_info" style="display: none;">
                                                                     <div class="col-md-12">
                                                                                                                         
                                                                     <div class="col-md-2">
@@ -1203,12 +1148,12 @@
                                                                                     <div class="col-md-2">
                                                                                         <div class="mt-4 pt-4">
                                                                                             <div class="text-end">
-                                                                                                <a href="{{url()->current()}}" class="btn btncl"><i class="fa fa-refresh icncl"></i></a> 
-                                                                                                <button class="btn btn2">Save</button>                                                                                                                
+                                                                                                <span class="btn btncl"><i class="fa fa-refresh icncl btn-score-cancel"></i></span> 
+                                                                                                <button class="btn btn2">Save</button>                
                                                                                             </div>
                                                                                         </div>
                                                                                     </div>     
-                                                                                </div>                                                                                                                                                                                                                                                                     
+                                                                                </div>                  
                                                                         </div>
                                                                     </form>
                                                                     </div> 
@@ -1275,7 +1220,7 @@
                                                             </div>
                                                     <div class="col-md-12">
                                                         <div id="demo13" class="collapse">
-                                                            <div class="col-md-12">                                                                                                                                                                                             
+                                                            <div class="col-md-12">                                                  
                                                                 <div class="panel-body mb-2" style="padding:10px; background-color: #16183f69;  border: 1px solid #e9e5e5; border-radius: 5px;">
                                                                         <form method="POST" action="{{ route('score-save') }}" id="edit-score">
                                                                              @csrf
@@ -1349,11 +1294,11 @@
                                                                                         <div class="mt-4 pt-4">
                                                                                             <div class="text-end">
                                                                                                 <a href="{{url()->current()}}" class="btn btncl"><i class="fa fa-refresh icncl"></i></a> 
-                                                                                                <button class="btn btn2">Update</button>                                                                                                                
+                                                                                                <button class="btn btn2">Update</button>           
                                                                                             </div>
                                                                                         </div>
                                                                                     </div>     
-                                                                                </div>                                                                                                                                                                                                                                                                     
+                                                                                </div>                  
                                                                             </div>
                                                                          </form>
                                                                     </div> 
@@ -1404,7 +1349,10 @@
             ); 
              
         });
-    });    
+    }); 
+
+      
+
     $('.delete_education').on('click', function(e) {
         e.preventDefault();  
         var delete_url="{{ url('education-remove') }}/"+$(this).data('id');
@@ -1509,6 +1457,154 @@
             }
         });
     });
+
+    $('.is_attended_conference').on('change', function(){
+        var self =$(this);
+        var checked =self.val(); 
+        var uid= self.data('id');
+
+        var form_data={
+            _token :"{{csrf_token()}}",
+            'checked':checked,
+            'uid':uid,
+            }
+
+        swal({
+            title: "Are you sure you want to change status?",
+            text: "Please check before submitting!",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonClass: "btn-danger",
+            cancelButtonClass: "btn-info",
+            confirmButtonText: "Yes",
+            cancelButtonText: "No",
+            closeOnConfirm: true,
+            closeOnCancel: true
+        }, function(isConfirm){
+
+            if(isConfirm){
+                $.post("{{ route('ajax-post', ['name'=>'is_attended_conference_status']) }}", form_data, function(res){
+                    pop_up_msg(res.msg);
+                    //window.location.reload();
+
+                }).fail(function(err){
+
+                    pop_up_msg(err_msg(err), 'error');
+
+                });
+            }else{
+                window.location.reload();
+            }
+        });
+    });
+
+    $('#submit_publication').on('click', function(){
+
+        var publication =$('#publication').val();
+        var status =$('#publication_status option:selected').val(); 
+
+        var form_data={
+            _token: "{{ csrf_token() }}",
+            publication: publication,
+            status: status, 
+        }
+
+        $.post("{{ route('ajax-post', ['name'=>'add_proposal_publication']) }}", form_data, function(res){
+            pop_up_msg(res.msg);
+
+            $('#publication').val('');
+            $('#publication_status').val('');
+
+            fetch_sub_content(
+                '#publication_load',
+                "{{ route('sub-content', ['name'=>'publication_list_load']) }}"
+            );
+
+        }).fail(function(err){
+
+            pop_up_msg(err_msg(err), 'error');
+
+        });
+    });
+
+    fetch_sub_content(
+        '#publication_load',
+        "{{ route('sub-content', ['name'=>'publication_list_load']) }}"
+    );
+
+    $(".work_experience").on('click',function(){ 
+        var self =$(this);
+        var value =self.val();
+        var uid= self.data('id');
+        var form_data={
+            _token :"{{csrf_token()}}",
+            'value':value,
+            'uid':uid,
+            }
+
+        $.post("{{ route('ajax-post', ['name'=>'work_experience_status_update']) }}", form_data, function(res){
+            pop_up_msg(res.msg);
+            //window.location.reload();
+
+        }).fail(function(err){
+
+            pop_up_msg(err_msg(err), 'error');
+
+        });
+
+        if(value=="yes"){ 
+            $('#add_work').css("display", "block");
+        }else{
+            $('#add_work').css("display", "none");
+        }
+       
+    });
+
+    $('.btn-proposal-open').on('click', function(){ 
+        $('.proposal_info').show();
+    });
+
+
+    $('.btn-proposal-cancel').on('click', function(){ 
+        $('.proposal_info').hide();
+    });
+
+    $('.btn-publication-open').on('click', function(){ 
+        $('.publication_info').show();
+    });
+
+
+    $('.btn-publication-cancel').on('click', function(){ 
+        $('.publication_info').hide();
+    });
+
+    $('.btn-education-open').on('click', function(){ 
+        $('.education_info').show();
+    });
+
+
+    $('.btn-education-cancel').on('click', function(){ 
+        $('.education_info').hide();
+    });
+
+    $('.btn-workexp-open').on('click', function(){ 
+        $('.workexp_info').show();
+    });
+
+
+    $('.btn-workexp-cancel').on('click', function(){ 
+        $('.workexp_info').hide();
+    });
+
+    $('.btn-score-open').on('click', function(){ 
+        $('.score_info').show();
+    });
+
+
+    $('.btn-score-cancel').on('click', function(){ 
+        $('.score_info').hide();
+    });
+
     function editInstitute(row){       
         $('#edit-institute').attr("action","{{ url('institution-update') }}/"+row.id);
         $('#edit-institute').find('select[name="academiclevel"]').val(row.academic_level).trigger('change'); 

+ 16 - 19
resources/views/web/layouts/bottom.blade.php

@@ -157,11 +157,7 @@
         } //End of ajax form definition
 
 
-            @if(Auth::user()->is_work_experience == 1)
-                $(document).ready(function(){
-                    $('#add_div').show();
-                });
-            @endif
+             
             @if(Auth::user()->is_test_score == 1)
                 $(document).ready(function(){
                     $('#add_test_div').show();
@@ -182,22 +178,23 @@
                 }                
             }
 
-            function checkWorkExperience(value){
-                $.ajax({
-                    type:'get',
-                    url:"{{ url('change_work_experience') }}/"+value,
-                    success:function(data) {
-                        $("#msg").html(data.msg);
-                    }
-                });
+            // function checkWorkExperience(value){
+                
+            //     $.ajax({
+            //         type:'get',
+            //         url:"{{ url('change_work_experience') }}/"+value,
+            //         success:function(data) {
+            //             $("#msg").html(data.msg);
+            //         }
+            //     });
 
 
-                if(value=='1'){
-                    $("#add_div").show();   
-                } else{
-                    $("#add_div").hide();
-                }                
-            }
+            //     if(value=='1'){ 
+            //         $("#add_div").show();   
+            //     } else{
+            //         $("#add_div").hide();
+            //     }                
+            // }
 
             function checkTestScore(value){
                 if(value=='yes'){

+ 1 - 0
resources/views/web/layouts/top.blade.php

@@ -55,6 +55,7 @@
         <link href="{{ asset('css/noty/lib/themes/sunset.css') }}" rel="stylesheet" type="text/css">
         <link href="{{ asset('css/flatpickr/dist/flatpickr.min.css') }}" rel="stylesheet" type="text/css">
         <link href="{{ asset('css/wait-me/waitMe.min.css')}}"  rel="stylesheet" type="text/css"> 
+        <link href="{{ asset('css/pretty-checkbox/pretty-checkbox.min.css')}}"  rel="stylesheet" type="text/css"> 
     
     </head>
 <style>

+ 18 - 0
sql/update.sql

@@ -146,3 +146,21 @@ ALTER TABLE `users`
 ALTER TABLE `users`
 	ADD COLUMN `invitation_date` DATETIME NULL DEFAULT NULL AFTER `landing_register`,
 	ADD COLUMN `registered_date` DATETIME NULL DEFAULT NULL AFTER `invitation_date`;
+
+
+CREATE TABLE `publications` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`student_id` INT(11) NULL DEFAULT NULL,
+	`publication` VARCHAR(255) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
+	`status` INT(10) NULL DEFAULT NULL,
+	`created_at` TIMESTAMP NULL DEFAULT NULL,
+	`updated_at` TIMESTAMP NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
+)
+COLLATE='utf8mb4_general_ci'
+ENGINE=InnoDB
+;
+
+ALTER TABLE `users`
+	ADD COLUMN `is_attended_conference` INT(11) NULL DEFAULT NULL AFTER `admin_invite_id`;
+