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

app/Http/Controllers/Admin/AdminController.php

@@ -26,14 +26,7 @@ class AdminController extends Controller
 
     public function dashboard()
     {
-        $admin = Auth::guard('admin')->user();
-        $register_teachers_list =User::where(
-                'status',0
-            )->where(
-                'user_type',2
-            )->orderBy(
-                'name','ASC'
-            )->get();
+        $admin = Auth::guard('admin')->user(); 
 
         $active_teachers_list =User::whereIn(
                 'status',[1,2,3]
@@ -68,8 +61,7 @@ class AdminController extends Controller
 
         $application = StudentProposal::orderBy('id','DESC')->get(); 
 
-        $data =[
-          'register_teachers_list'=>$register_teachers_list ,
+        $data =[ 
           'active_teachers_list'=>$active_teachers_list,
           'register_student_list'=>$register_student_list ,
           'market_countries'=>$market_countries,

app/Http/Controllers/Admin/SubContentController.php

@@ -84,6 +84,19 @@ class SubContentController extends Controller
 			$data['proposal'] =Proposal::find($req->p_id);
 			$data['departments'] =Department::where('status',1)->orderBy('name','ASC')->get();
 
+		}elseif($name=="register_pending_teacher_load"){
+			$data['register_teachers_list'] =User::where(
+                'status',0
+            )->where(
+                'user_type',2
+            )->orderBy(
+                'name','ASC'
+            )->get();
+		}elseif($name=="edit_teacher_load"){
+			$user=Auth::guard('admin')->user();
+			$data['departments'] =Department::where('status',1)->orderBy('name','ASC')->get();
+            $data['universities'] =University::orderBy('name','ASC')->get();
+			$data['edit_data'] =User::find($req->edit_id);
 		}else $name='default';
 		//$data['page_sl']=new PageSL($data['chapter_details']);
 		return view("admin.sub_contents.{$name}", $data);

app/Http/Controllers/AjaxController.php

@@ -517,8 +517,7 @@ class AjaxController extends Controller
                 }
 
                 $user_data->first_name =$req->first_name;
-                $user_data->last_name =$req->last_name;
-                $user_data->first_name =$req->first_name;
+                $user_data->last_name =$req->last_name; 
                 $user_data->university_name =$req->university;
                 $user_data->ref_no = name_initials($req->first_name,$req->last_name).''.teacherRefNoGenerate();
                 $user_data->department =$req->department;
@@ -530,6 +529,17 @@ class AjaxController extends Controller
                 $user_data->invited_registered_at = now();
                 $user_data->update();
 
+                if($user_data->update()){
+                    $data['name'] = $user_data->first_name .''.$user_data->last_name;  
+                    $user_mail = $user_data->email;
+                    $from = 'test@mail.com';
+
+                    Mail::send('email.register_teacher_email',$data, function ($message) use ($user_mail,$from) {
+                        $message->from($from);
+                        $message->to($user_mail)->subject('We’re excited to have you as a member of our community');
+                    });
+                }
+
                 return response(
                     ['msg'=>'Registration successfully saved.You can login now.']
                 );
@@ -614,6 +624,33 @@ class AjaxController extends Controller
             return response([
                 'msg'=>'Successfully updated.'
             ]);
+        }elseif($name=="edit_register_teacher_save"){
+            $validator=\Validator::make($req->all(), [
+                'first_name'=>'required',
+                'last_name'=>'required', 
+                'university'=>'required',
+                //'department'=>'required',
+                'designation'=>'required',
+                 
+            ]);
+
+            if($validator->fails()){
+                $errors=$validator->errors()->all();
+                return response(['msg'=>$errors[0]], 422);
+            }
+
+            $user_data = User::find($req->edit_id);
+            $user_data->first_name =$req->first_name;
+            $user_data->last_name =$req->last_name; 
+            $user_data->university_name =$req->university;
+            $user_data->department =$req->department;
+            $user_data->others_department =$req->others_department;
+            $user_data->designation =$req->designation;
+            $user_data->uni_website =$req->uni_website;
+            $user_data->update();
+            return response(
+                ['msg'=>'Successfully updated.']
+            );
         }
 	}
 }

resources/views/admin/admin_profile.blade.php

@@ -796,73 +796,8 @@ tbody, td, tfoot, th, thead, tr {
                                                             <div class="card border-0 tab-pane fade show active" id="pend" role="tabpanel" aria-labelledby="pending">
                                                                 <div class="row align-items-center">
                                                                     <div class="col-md-12">
-                                                                        <div class="table-responsive">
-                                                                            <table class="table table-bordered list_table" style="margin: 0px;">
-                                                                                <thead>
-                                                                                    <tr>
-                                                                                        <th>Sl</th>
-                                                                                        <th>Name</th>
-                                                                                        <th>University Name</th>
-                                                                                        <th>Department</th>
-                                                                                        <th class="text-center">Status</th>
-                                                                                        <th class="text-center">Action</th>
-                                                                                    </tr>
-                                                                                </thead>
-                                                                                <tbody>
-                                                                                    @if(count($register_teachers_list)  > 0)
-                                                                                    @foreach($register_teachers_list as $key=>$row)
-                                                                                    <tr>
-                                                                                        <td style="font-size: 11px;">{{++$key}}</td>
-                                                                                        <td style="font-size: 11px;"><span style="font-weight: bold !important;">{{$row->first_name }} {{$row->last_name }}</span><br>
-                                                                                            <span>{{$row->designation}}</span><br>
-                                                                                            <span>{{$row->email}}</span>
-                                                                                        </td>
-                                                                                        <td style="font-size: 11px;">{{$row->university_name}}<br>
-                                                                                            <span>{{$row->uni_website}}</span>
-                                                                                        </td>
-                                                                                        <td style="font-size: 11px;">
-                                                                                            @if(isset($row->department))
-                                                                                                {{ cn($row, 'department_name.name','') }}
-                                                                                            @else
-                                                                                              {{ $row->others_department }}
-                                                                                            @endif
-                                                                                        </td>
-                                                                                        <td style="font-size: 11px; width: 9%;">
-                                                                                            <div class="single_glance_row mt-1" style="display: flex;">
-                                                                                                <div class="top_part_status" style="position: relative; width: fit-content; margin-left: 10px;">
-                                                                                                    <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
-                                                                                                        @if($row->status==0)
-                                                                                                            Pending
-                                                                                                        @endif
-                                                                                                    </span>
-                                                                                                    <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" data-value="1" data-id={{$row->id}}>Active</a>
-                                                                                                            <a class="dropdown-item status_change" data-value="2" data-id={{$row->id}}>In active</a>
-                                                                                                            <a class="dropdown-item status_change" data-value="3" data-id={{$row->id}}>Suspend</a>
-                                                                                                        </div>
-                                                                                                    </div>
-                                                                                                </div>
-                                                                                            </div>
-                                                                                        </td>
-                                                                                        <td class="text-center">
-                                                                                            <i class="fa fa-search icon-view"></i>
-                                                                                        </td>
-                                                                                    </tr>
-                                                                                    @endforeach
-                                                                                    @else
-
-                                                                                     <tr>
-                                                                                        <td colspan="5" class="text-center">
-                                                                                            <span class="text-danger">No data found!</span>
-                                                                                        </td>
-                                                                                     </tr>
-
-                                                                                    @endif
-                                                                                </tbody>
-                                                                            </table>
-                                                                        </div>
+                                                                        <div id="pending_teacher_load"></div>
+                                                                        
                                                                     </div><!--end col-->
                                                                 </div><!--end row-->
                                                             </div><!--end teb pane-->
@@ -1330,6 +1265,11 @@ tbody, td, tfoot, th, thead, tr {
 
         $(function(){
 
+            fetch_sub_content(
+                '#pending_teacher_load',
+                "{{ route('sub-content', ['name'=>'register_pending_teacher_load']) }}"
+            ); 
+
             $('.status_change').on('click', function(e){
                 var self =$(this);
                 var id =$(this).data('id');

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

@@ -0,0 +1,118 @@
+<form method="POST" action="{{route('ajax-post', ['name'=>'edit_register_teacher_save'])}}" class="edit_register_pending_teacher_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-4">
+                <div class="mb-2">
+                    <label class="form-label config">First Name</label>
+                    <div class="form-icon position-relative">
+                        <input type="text" class="form-control" placeholder="First Name" id="first_name" name="first_name" value="{{$edit_data->first_name}}" required="" style="font-size: 13px;">
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-4">
+                <div class="mb-2">
+                    <label class="form-label config">Last Name</label>
+                    <div class="form-icon position-relative">
+                        <input type="text" class="form-control" placeholder="Last Name" id="last_name" name="last_name" value="{{$edit_data->last_name}}" required="" style="font-size: 13px;">
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-4">
+                <div class="mb-2">
+                    <label class="form-label config">Designation</label>
+                    <div class="form-icon position-relative">
+                        <input type="text" class="form-control" placeholder="Designation" id="designation" name="designation" value="{{$edit_data->designation}}" required="" style="font-size: 13px;">
+                    </div>
+                </div>
+            </div>
+            
+            <div class="col-md-4">
+                <div class="mb-2">
+                    <label class="form-label config">University</label>
+                    <div class="form-icon position-relative"> 
+                        <select name="university" id="university" class="form-control" required="" style="font-size: 13px;">
+                            <option selected disabled>Select University</option>
+                            @foreach($universities as $row)
+                                <option value="{{$row->id}}" @if($row->id==$edit_data->university_name) selected @endif>{{$row->name}}</option>
+                            @endforeach 
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-4">
+                <div class="mb-2">
+                    <label class="form-label config">Department</label>
+                    <div class="form-icon position-relative"> 
+                        <select name="department" class="form-control department_id" required="" style="font-size: 13px;">
+                            <option selected disabled>Select Department</option>
+                            @foreach($departments as $row)
+                              <option value="{{$row->id}}" @if($row->id==$edit_data->department) selected @endif>{{$row->name}}</option>
+                            @endforeach
+                            <option value="">Others</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-4 others_department" style="display: none;">
+                <div class="mb-2">
+                    <label class="form-label config" >Others Department</label>
+                    <div class="form-icon position-relative">
+                        <input type="text" class="form-control" placeholder="Others Department" id="others_department" name="others_department" value="{{$edit_data->others_department}}" style="font-size: 13px;">
+                    </div>
+                </div>
+            </div> 
+            <div class="col-md-4">
+                <div class="mb-2">
+                    <label class="form-label config">Website</label>
+                    <div class="form-icon position-relative">
+                        <input type="text" class="form-control" placeholder="www.xyz.com" id="uni_website" name="uni_website" value="{{$edit_data->uni_website}}"  style="font-size: 13px;">
+                    </div>
+                </div>
+            </div>
+        </div>  
+        <div class="row">
+            <div class="col-md-12">
+                <div class="text-end">
+                    <button type="button" class="btn cancel_button mr-1 btn-cancel close_form" style="background-color: #ffbd59 !important; border: 2px solid #ffbd59; color: white;border-radius: 18px; padding: 2px 6px;">
+                        <i aria-hidden="true" class="fa fa-refresh"></i>
+                    </button>
+                    <button class="btn btn2">Update</button>                                                                                                                
+                </div>
+            </div> 
+        </div>  
+    </div>
+      
+</form>
+
+<script>
+    $(function(){
+        $('.department_id').change(function() { 
+            var value = $(this).attr('selected','selected').val();
+            if (value == "" ) {
+                $('.others_department').show();
+            } else {
+                $('.others_department').removeClass('display:none');
+                $('.others_department').hide();
+            }
+        });
+
+        $('.edit_register_pending_teacher_form').on('submit', function(event){
+            event.preventDefault();
+            var self = $(this); 
+            ajax_form(self, function(self){ 
+                fetch_sub_content(
+                    '#pending_teacher_load',
+                    "{{ route('sub-content', ['name'=>'register_pending_teacher_load']) }}"
+                ); 
+            });
+        });
+    });
+
+    $('.btn-cancel').on('click', function(){ 
+        $('.edit_data').addClass('d-none')
+    });
+</script>

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

@@ -0,0 +1,103 @@
+@extends('admin.sub_contents.base')  
+@section('main')  
+<div class="table-responsive">
+    <table class="table table-bordered list_table" style="margin: 0px;">
+        <thead>
+            <tr>
+                <th>Sl</th>
+                <th>Name</th>
+                <th>University Name</th>
+                <th>Department</th>
+                <th class="text-center">Status</th>
+                <th class="text-center">Action</th>
+            </tr>
+        </thead>
+        <tbody>
+            @if(count($register_teachers_list)  > 0)
+            @foreach($register_teachers_list as $key=>$row)
+            <tr>
+                <td style="font-size: 11px;">{{++$key}}</td>
+                <td style="font-size: 11px;"><span style="font-weight: bold !important;">{{$row->first_name }} {{$row->last_name }}</span><br>
+                    <span>{{$row->designation}}</span><br>
+                    <span>{{$row->email}}</span>
+                </td>
+                <td style="font-size: 11px;"> {{ cn($row, 'university.name','') }}<br>
+                    <span>{{$row->uni_website}}</span>
+                </td>
+                <td style="font-size: 11px;">
+                    @if(isset($row->department))
+                        {{ cn($row, 'department_name.name','') }}
+                    @else
+                      {{ $row->others_department }}
+                    @endif
+                </td>
+                <td style="font-size: 11px; width: 9%;">
+                    <div class="single_glance_row mt-1" style="display: flex;">
+                        <div class="top_part_status" style="position: relative; width: fit-content; margin-left: 10px;">
+                            <span class="top_part_status_name" style="background: #dcdcdc; color: #8c9094;">
+                                @if($row->status==0)
+                                    Pending
+                                @endif
+                            </span>
+                            <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" data-value="1" data-id={{$row->id}}>Active</a>
+                                    <a class="dropdown-item status_change" data-value="2" data-id={{$row->id}}>In active</a>
+                                    <a class="dropdown-item status_change" data-value="3" data-id={{$row->id}}>Suspend</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </td>
+                <td class="text-center">
+                    <span class="edit_info" data-id="{{$row->id}}"><i class="fa fa-edit"></i></span>
+                </td>
+            </tr>
+
+            <?php 
+                $edit_cls_name = "edit_cls_".$row->id;
+            ?>
+            <tr class="edit_data {{$edit_cls_name}} d-none">
+                <td colspan="6">
+                    <div class="edit_teacher_load"></div>
+                </td>
+            </tr>
+            @endforeach
+            @else
+
+             <tr>
+                <td colspan="6" class="text-center">
+                    <span class="text-danger">No data found!</span>
+                </td>
+             </tr>
+
+            @endif
+        </tbody>
+    </table>
+</div>  
+ 
+@endsection
+
+<script>
+    $(function(){
+        
+        $('.edit_info').on('click', function(){  
+
+            $('.edit_teacher_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_teacher_load = self.closest('tbody').find('.edit_teacher_load');
+
+            fetch_sub_content(
+                edit_teacher_load,
+                "{!! route('sub-content', ['name'=>'edit_teacher_load','action'=>'edit']) !!}&edit_id="+id
+            );
+        });
+
+       
+    });
+</script>