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

app/Http/Controllers/AjaxController.php

@@ -21,17 +21,7 @@ class AjaxController extends Controller
 	public function post($name, Request $req)
 	{
 		if($name =='send_apply_student_teacher_email') {  
-			  
-			 $user =User::find($req->id);
-			 if($user){
-				$data['name'] = $user->first_name.' '.$user->last_name;  
-				$user_mail =$user->email;
-				$from = 'test@mail.com'; 
-				Mail::send('email.send_apply_student_teacher_email',$data, function ($message) use ($user_mail,$from) {
-					$message->from($from);
-					$message->to($user_mail)->subject('New Email Send to you');
-				});
-			 }
+			 
 
             return ['msg'=>'Email send successfully.'];
 

app/Http/Controllers/HomeController.php

@@ -9,7 +9,7 @@ use App\Score;
 use App\User;
 use App\Proposal;
 use App\AcademicLevel;
-use App\StudentProposalUpload;
+use App\StudentProposalUpload; 
 use Auth;
 class HomeController extends Controller
 {
@@ -29,14 +29,15 @@ class HomeController extends Controller
      * @return \Illuminate\Contracts\Support\Renderable
      */
     public function index()
-    {
+    { 
+        $user = Auth::user();
         $institution= Institution::where('student_id',Auth::user()->id)->get();
         $work_experience= Workexperience::where('student_id',Auth::user()->id)->get();
-        $score= Score::where('student_id',Auth::user()->id)->get(); 
-        $proposal= Proposal::where('student_id',Auth::user()->id)->get();
-        $user_info= User::find(Auth::user()->id);
+        $score= Score::where('student_id',$user->id)->get(); 
+        $proposal= Proposal::where('student_id',$user->id)->get();
+        $user_info= User::find($user->id);
         $academic_level= AcademicLevel::all();
-        $proposal_files= StudentProposalUpload::where('student_id',Auth::user()->id)->get();
+        $proposal_files= StudentProposalUpload::where('student_id',$user->id)->get(); 
         return view('profile',compact('institution','academic_level','work_experience','score','user_info','proposal','proposal_files'));
     }
 }

app/Http/Controllers/ModalController.php

@@ -4,15 +4,19 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller; 
-use App\Models\Admin;
+use App\Proposal;
+use App\User;
+use App\StudentProposal;
 use Hash;
 use DB;
 use Session;
+use Auth;
+use Mail;
 
 class ModalController extends Controller{
 
     public function get(Request $req, $name){
-       // $user = \Auth::guard('admin')->user();
+        $user = Auth::user();
         $carbon=new \Carbon\Carbon;
 
         $data=[
@@ -21,7 +25,9 @@ class ModalController extends Controller{
         ];
 
         if($name=="apply_student_proposal"){
-            
+            $data['teacher'] = User::find($req->id); 
+            $data['student'] = User::find($user->id); 
+            $data['proposal']= Proposal::where('student_id',$user->id)->get(); 
         } else $name='default';
 
         return view("modal_pages.{$name}", $data);
@@ -32,21 +38,42 @@ class ModalController extends Controller{
         $user=\Auth::user();
         $carbon=new \Carbon\Carbon;
 
-        if($name=='admin_change_password'){
+        if($name=='apply_student_proposal'){
 
             $validator=\Validator::make($req->all(), [
-                'password'=>'min:4|required_with:confirm_password|same:confirm_password',
-                'confirm_password'=>'min:4',
+                'proposal_id'=>'required',
+                'startdate'=>'required',
+                'startmonth'=>'required',
+                
             ]);
 
             if($validator->fails()){
 
                 $errors=$validator->errors()->all();
                 return response(['msg'=>$errors[0]], 422);
-            }
-
+            } 
+
+            $student_proposal =new StudentProposal; 
+            $student_proposal->student_id =$req->student_id;
+            $student_proposal->teacher_id =$req->teacher_id;
+            $student_proposal->proposal_id =$req->proposal_id;
+            $student_proposal->start_year =$req->startdate;
+            $student_proposal->start_month =$req->startmonth;
+            $student_proposal->created_by =$user->id;
+            $student_proposal->save(); 
+
+            $user =User::find($req->id);
+			 if($user){
+				$data['name'] = $user->first_name.' '.$user->last_name;  
+				$user_mail =$user->email;
+				$from = 'test@mail.com'; 
+				Mail::send('email.send_apply_student_teacher_email',$data, function ($message) use ($user_mail,$from) {
+					$message->from($from);
+					$message->to($user_mail)->subject('New Email Send to you');
+				});
+			 }
            
-            return response(['msg'=>'Password saved successfully']);
+            return response(['msg'=>'Proposal send successfully.']);
 
         } 
 

app/Http/Controllers/StudentHomeController.php

@@ -9,6 +9,7 @@ use App\Score;
 use App\User;
 use App\Proposal;
 use App\StudentProposalUpload;
+use App\StudentProposal;
 use Auth;
 use Carbon\Carbon;
 
@@ -22,8 +23,9 @@ class StudentHomeController extends Controller
    }
 
    public function index(){
-
-      return view('home');
+      $user = Auth::user();
+      $student_proposal =StudentProposal::where('student_id',$user->id)->get();
+      return view('home',compact('student_proposal'));
    }
 
 

app/Http/Controllers/TeacherHomeController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use App\User;
+use App\StudentProposal;
 use Auth;
 
 class TeacherHomeController extends Controller
@@ -14,7 +15,7 @@ class TeacherHomeController extends Controller
    } 
     public function teacher_profile(Request $request)
     {   $user = Auth::guard('teacher')->user();
-        $students = User::where('user_type',1)->get();
+        $students = StudentProposal::where('teacher_id',$user->id)->get(); 
         return view('teacher_profile',compact('students'));
     }
 

app/StudentProposal.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class StudentProposal extends Model
+{
+    public function teacher_details(){
+        return $this->belongsTo('App\User','teacher_id');
+    }
+    public function student_details(){
+        return $this->belongsTo('App\User','student_id');
+    }
+
+    public function institutes()
+    {
+        return $this->belongsTo('App\Institution', 'student_id','student_id');
+    } 
+    public function scores()
+    {
+        return $this->belongsTo('App\Score', 'student_id','student_id');
+    } 
+    public function work_experience()
+    {
+        return $this->belongsTo(Workexperience::class, 'student_id','student_id');
+    } 
+}

app/User.php

@@ -53,5 +53,8 @@ class User extends Authenticatable
     public function country_name()
     {
         return $this->belongsTo(Country::class, 'nationality', 'id');
-    }
+    } 
+
+    
+     
 }

resources/views/home.blade.php

@@ -31,8 +31,13 @@
                                         <div class="mb-1">
                                             <div class="form-icon position-relative" style="display:flex;">
                                                 <input type="text" class="form-control search-box" id="teacher_ref_no" placeholder="Please type your Supervisor's ARN here" name="teacher_ref_no" required="">
+<<<<<<< HEAD
+                                                <sapn class="search_button hand search-btn"><span style="display:block;margin-left:18px; margin-top:8px; cursor: pointer;">Search</span></span>
+                                            </div> 
+=======
                                                 <sapn class="search_button hand search-btn"><span style="display:block; margin-left:16px; margin-top:4px; cursor: pointer;">Search</span></span>
                                             </div>
+>>>>>>> 041b3021e266602dd32cbb0a12a41e209bcf30f0
                                             <div id="load_data"></div> 
                                         </div> 
                                     </div>  
@@ -91,6 +96,7 @@
                                     <div class="col-md-12">
                                             <h6 style="font-weight:bold !important; color: #141639c4;">Application you have submitted that are currently awaiting decisions</h6>                            
                                         <div class="table-responsive">
+                                            @if(count($student_proposal) > 0 )
                                             <table class="table table-bordered list_table">
                                                 <thead>
                                                     <tr>
@@ -104,17 +110,20 @@
                                                     </tr>
                                                 </thead>
                                                 <tbody>
-                                                    <tr>
-                                                        <td style="font-size: 11px;">test</td>
-                                                        <td style="font-size: 11px;">test</td> 
-                                                        <td style="font-size: 11px;">test</td> 
-                                                        <td style="font-size: 11px;">102</td>
-                                                        <td style="font-size: 11px;">test</td>
+                                                    @foreach($student_proposal as $key=>$row)
+                                                    <tr> 
+                                                        <td style="font-size: 11px;">{{++$key}}</td>
+                                                        <td style="font-size: 11px;"><strong>{{ cn($row,'teacher_details.first_name','')}} {{ cn($row,'teacher_details.last_name','')}}</strong></td> 
+                                                        <td style="font-size: 11px;">{{cn($row,'teacher_details.university_name','')}}</td> 
+                                                        <td style="font-size: 11px;"><strong>{{cn($row,'teacher_details.ref_no','')}}</strong></td>
+                                                        <td style="font-size: 11px;"></td> 
                                                         <td style="font-size: 11px;">test</td>
                                                         <td style="font-size: 11px;">test</td>
                                                     </tr>
+                                                    @endforeach
                                                 </tbody>
                                             </table>
+                                            @endif
                                         </div>                                    
                                     </div>
                                 </div>
@@ -122,10 +131,7 @@
                         </div>
                     </div>
                     <div class="w3-container mt-5">
-                        
-
-                            
-                        </div>
+                    </div>
                 </div><!--end container-->
             </div>
         </section>
@@ -157,7 +163,7 @@
                     }
                 });
             }else{
-                pop_up_error_msg('Please type a Teacher Reference No.')
+                pop_up_error_msg('Please type a Teacher Reference No.');
             }
           
         } 

resources/views/modal_pages/apply_student_proposal.blade.php

@@ -3,6 +3,38 @@
 @section('main')
 <form class="ajax-form" action="{{ url()->current() }}" method="POST" enctype="multipart/form-data">
     {{ csrf_field() }}
+    <div class="container mt-3">
+        <div class="col-md-12">
+            <div class="alert p-3" style="background-color:white;">
+                <input type="hidden" name="teacher_id" value="{{$teacher->id}}">
+                <input type="hidden" name="student_id" value="{{$student->id}}">
+                <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
+                <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br>
+                <span class="text-muted" style="font-weight: 500;">{{$teacher->department}}</span>
+                <span>.</span>
+                <span class="text-muted" style="font-weight: 500;">{{$teacher->university_name}}</span>
+            </div>
+        </div>
+
+        <div class="middle p-3" style="background-color:white; border-radius:6px;">
+            <p class="mb-3" style="font-size:14px;">Please select which proposal you want to send</p>
+            <div class="alert mt-1 mb-3 propose" style="padding: 0px;">
+                <div style="width:100%;">
+                    @foreach($proposal as $row)
+                    <div class="mt-2 p-2" style="border-bottom:2px solid #eee;">
+                        <div class="custom-control custom-radio custom-control-inline">
+                            <div class="form-check mb-0">
+                                <input class="form-check-input" type="radio" name="proposal_id" value="{{$row->id}}" id="flexRadioDefault1">
+                                <label class="form-check-label" for="flexRadioDefault1">{{$row->title}}</label>
+                            </div>
+                        </div>
+                    </div>
+                    @endforeach
+                   
+                </div>
+            </div> 
+        </div>
+    </div>
     <div class="container mt-4">
         <div class="col-md-12 p-3" style="background-color:white; border-radius:6px;">
             <p style="margin:0px; font-size:14px;">Select propose start date</p>

resources/views/ref_search_load.blade.php

@@ -11,8 +11,9 @@
                 <span class="text-muted" style="font-weight: 500;">{{$row->university_name}}</span>
             </div>
 
-            <div class="col-md-2 mt-3">
-                <span class="btn btn3 open_modal_page" data-url="{{route('modal-get',['name'=>'apply_student_proposal','id'=>$row->id])}}"  data-title="Edit Circular" style="margin-left: 1.1rem;">Apply</span>  
+            <div class="col-md-2 mt-3"> 
+                <span class="btn btn3 open_modal_page" data-url="{{route('modal-get',['name'=>'apply_student_proposal','id'=>$row->id])}}"  data-title="Submit your Proposal" style="margin-left: 1.1rem;">Apply</span>
+                
                 {{-- <span class="btn btn3 apply_student" data-id="{{ $row->id }}" style="margin-left: 1.1rem;" onclick="document.getElementById('id01').style.display='block'">Apply</span>   --}}
                 {{-- <div id="id01" class="apply-modal mt-2">
                     <div class="apply-modal-content apply-animate-top apply-card-4 mb-4">
@@ -140,58 +141,38 @@
 
 @endif
 
-@include('web.layouts.modal')
+{{-- @include('web.layouts.modal') --}}
 <script>
-    $(function(){
-
-        // $('.open_modal_page').on('click', function(){ 
-             
-
-        //     let url=$(this).data('url'); 
-
-        //     let title=$(this).data('title');
-        //     alert(title);
-
-        //     if(!title) title='Modal Form';
-
-        //     $('#modal_page_title').html(title); 
-        //     $('.modal_page').modal({show:true});
-
-        //     $('#modal_page_body').load(url, null, function(){
-        //         alert('load');
-        //         $('.tooltips').tooltip();
-        //     }); 
+    $(function(){ 
+        // $('.apply_student').on('click', function(e){
+        //     e.preventDefault();
+        //     var id = $(this).data('id');
+        //     var form_data={
+        //         _token: "{{ csrf_token() }}",
+        //         id: id
+        //     }
+        //     swal(
+        //     //     {
+        //     //     title: "Are you sure?",
+        //     //     text: "Do you want to send email!",
+        //     //     type: "warning",
+        //     //     showCancelButton: true,
+        //     //     confirmButtonClass: "btn-success",
+        //     //     cancelButtonClass: "btn-danger",
+        //     //     confirmButtonText: "Yes",
+        //     //     cancelButtonText: "No"
+        //     // },
+        //     function(isConfirm){
+        //         if(isConfirm){
+        //             $.post("{{ route('ajax-post', ['name'=>'send_apply_student_teacher_email']) }}", form_data, function(res){
+
+        //             if(res.msg) pop_up_msg(res.msg); 
+
+        //             }).fail(function(err){
+
+        //             }); 
+        //         }
+        //     });
         // });
-
-        $('.apply_student').on('click', function(e){
-            e.preventDefault();
-            var id = $(this).data('id');
-            var form_data={
-                _token: "{{ csrf_token() }}",
-                id: id
-            }
-            swal(
-            //     {
-            //     title: "Are you sure?",
-            //     text: "Do you want to send email!",
-            //     type: "warning",
-            //     showCancelButton: true,
-            //     confirmButtonClass: "btn-success",
-            //     cancelButtonClass: "btn-danger",
-            //     confirmButtonText: "Yes",
-            //     cancelButtonText: "No"
-            // },
-            function(isConfirm){
-                if(isConfirm){
-                    $.post("{{ route('ajax-post', ['name'=>'send_apply_student_teacher_email']) }}", form_data, function(res){
-
-                    if(res.msg) pop_up_msg(res.msg); 
-
-                    }).fail(function(err){
-
-                    }); 
-                }
-            });
-        });
     });
 </script>

resources/views/teacher_profile.blade.php

@@ -519,29 +519,29 @@ tbody, td, tfoot, th, thead, tr {
                                             <td style="font-size: 11px;">{{$key+1}}</td>
                                             <td>
                                                 <div style="font-size: 11px; font-weight: 900; display:block;">
-                                                    <span>{{$row->first_name}}</span>
+                                                    <span>{{cn($row,'student_details.first_name','')}} {{cn($row,'student_details.last_name','')}}</span>
                                                 </div>
                                                 <div style="font-size: 11px; font-weight: 600; display:block;">
-                                                    <a href="" class="">0111301 <span style="color:#626262 !important;">(Apply Ref.)</span></a>
+                                                    <a href="" class="">{{cn($row,'teacher_details.ref_no','')}}<span style="color:#626262 !important;">(Apply Ref.)</span></a>
                                                 </div>
                                                 <div style="font-size: 11px; font-weight: 600; display:block;">
-                                                    <span>{{date("d M, Y", strtotime($row->dob))}}</span>
+                                                    <span>{{ date("d M, Y", strtotime(cn($row,'student_details.dob','')))}}</span>
                                                 </div>
                                             </td>
                                             <td style="font-size: 11px;">
                                                 <div style="font-size: 11px; font-weight: 600; display:block;">
-                                                    <span>Civil Technology</span>
+                                                    <span>{{cn($row,'institutes.institution','')}}</span>
                                                 </div>
                                                 <div style="font-size: 11px; font-weight: 600; display:block;">
-                                                    <span>Sep 2023 - aug 2023</span>
+                                                    <span>{{date('M Y',strtotime(cn($row,'institutes.start_date','')))}} - {{date('M Y',strtotime(cn($row,'institutes.end_date','')))}}</span>
                                                 </div>
                                                 <div class="mt-1" style="font-size: 11px; display:block;">
-                                                    <span class="label_badge_gpa">2.88 (GPA)</span>
+                                                    <span class="label_badge_gpa">{{cn($row,'institutes.result','')}} (GPA)</span>
                                                 </div>
                                             </td>
-                                            <td style="font-size: 11px; font-weight: 600; text-align:center;">IELTS
+                                            <td style="font-size: 11px; font-weight: 600; text-align:center;">{{cn($row,'scores.test_name','')}}
                                                 <div style="font-size: 11px;">
-                                                    <span>6</span>
+                                                    <span>{{cn($row,'scores.overall_score','')}}</span>
                                                 </div>
                                             </td>
                                             <td style="font-size: 11px; text-align:center;">

resources/views/web/layouts/bottom.blade.php

@@ -60,9 +60,9 @@
                     $('#add_test_div').show();
                 });
             @endif
-            $('.dob').datepicker({
-                dateFormat: 'yy-mm-dd',
-            }); 
+            // $('.dob').datepicker({
+            //     dateFormat: 'yy-mm-dd',
+            // }); 
             function changeTestName(name){
                 $("#testname").attr("placeholder", name);
             }

resources/views/web/layouts/master.blade.php

@@ -7,5 +7,5 @@
 @include('web.layouts.footer')
 </body>
 @include('web.layouts.bottom')
-{{-- @include('web.layouts.modal') --}}
+@include('web.layouts.modal')
 </html>

resources/views/web/layouts/modal.blade.php

@@ -1,56 +1,101 @@
- <div class="modal modal-slide-in sidebar-todo-modal fade modal_page" id="modal_page1">
-  <div class="modal-dialog sidebar-lg">
-      <div class="modal-content p-0">
-        <div class="modal-header align-items-center mb-1">
-          <h5 class="modal-title change-password-title" id="modal_page_title"></h5>
-          <div class="todo-item-action d-flex align-items-center justify-content-between ms-auto"> 
-              <i data-feather="x" class="cursor-pointer" data-bs-dismiss="modal" stroke-width="3"></i>
+<div class="modal fade" id="modal_page" aria-hidden="true" aria-labelledby="exampleModalLabel" tabindex="-1">
+  <div class="modal-dialog modal-lg">
+      <!-- Modal content-->
+      <div class="modal-content">
+          <div class="modal-header">
+              <h5 class="modal-title" id="exampleModalLabel"></h5>
+              <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
           </div>
-        </div>
-        <div class="modal-body flex-grow-1 pb-sm-0 pb-3" id="modal_page_body">
-        </div> 
+          <div class="modal-body"></div>
+          
       </div>
   </div>
-</div> 
+</div>
+ 
 
+ 
+<script>  
+//Start of jquery
+function wait_me(selector, config=null){
 
-{{-- <div class="apply-modal modal_page mt-2">
-  <div class="apply-modal-content apply-animate-top apply-card-4 mb-4">
-      <header class="container apply-teal mb-3 mt-4"> 
-          <span class="w3-button w3-display-topright">&times;</span>
-          <h5 class="mt-3 p-3" style="font-weight: bold;" id="modal_page_title"></h5>
-      </header>
-      <div id="modal_page_body">
-      </div> 
-  </div>
-</div> --}}
+  if(config){
 
+    selector.waitMe(config);
 
-@push('js')  
-<script type="text/javascript">  
-//Start of jquery
-$(function(){ 
+  }else{
 
-  $('.open_modal_page').on('click', function(){  
-    let url=$(this).data('url');
- 
-    let title=$(this).data('title');
+    selector.waitMe({
+      effect: 'facebook',
+      //color: '#000',
+      text: 'Please! Wait ...'
+    });
 
-    if(!title) title='Modal Form';
+  }
 
-    $('#modal_page_title').html(title); 
-    $('.modal_page').modal({show:true});
+}
 
-    $('#modal_page_body').load(url, null, function(){
-      $('.tooltips').tooltip();
-    });
+$(function(){   
+   
+    $('#modal_page').on('submit', '.ajax-form', function(event){
 
-  });
+        event.preventDefault();
+        ajax_form(this, function(form){
+
+          var replace_content=$(form).find('input[name=replace_content]').val();
+
+          if(replace_content){
+
+            url=$(form).find("input[name='replace_content']").data('replace');
+
+            $(replace_content).waitMe({
+              effect: 'facebook',
+              text: 'Please! Wait ...'
+            });
+                          
+            $(replace_content).load(url, null, function(){
+
+              $(replace_content).waitMe('hide');
+
+            });
+
+            $('#modal_page').modal('hide');
+
+          }else window.location.reload();
+
+        });
+
+        });
+    $(document).on('click', '.open_modal_page', function(){ 
+        let url=$(this).data('url');  
+        let title=$(this).data('title'); 
+        if(!title) title='Modal Form'; 
+        $('.modal-title').html(title); 
+        //$('#modal_page').modal({show:true});
+
+        let open_modal = new bootstrap.Modal('#modal_page', {
+          keyboard: false
+        });
+
+        open_modal.show(); 
+        $('.modal-body').load(url, null, function(){ 
+          $('.tooltips').tooltip();
+        });
+
+    }); 
    
   $('.tooltips').tooltip();
+
+  $('#modal_page').on('show.bs.modal', function(e){
+      $('.modal-body').html("<h1 class='text-center mt-3'><i class='fa fa-refresh fa-spin fa-2x'></i></h1>");
+  });
+
+  $('#modal_page').on('hidden.bs.modal', function (e){
+      $('.modal-body').empty();
+  });
+
  
 
 });
 //End of jquery
 </script>
-@endpush
+