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

app/Http/Controllers/Admin/SubContentController.php

@@ -8,6 +8,7 @@ use \App\Helpers\PageSL;
 use App\Models\University;
 use App\Models\MarketCountry;
 use App\Models\Department;
+use App\Models\ResearchInterest;
 use App\StudentProposal;
 use Auth;
 
@@ -42,6 +43,10 @@ class SubContentController extends Controller
 			
 		}elseif($name=="load_department"){
 			$data['departments'] =Department::where('status',1)->orderBy('name','ASC')->get();
+		 
+		}elseif($name=="load_research_interest"){
+			$tuser=Auth::guard('teacher')->user();
+			$data['resarch'] =ResearchInterest::where('teacher_id',$tuser->id)->orderBy('id','DESC')->get();
 		}else $name='default';  
 		//$data['page_sl']=new PageSL($data['chapter_details']); 
 		return view("admin.sub_contents.{$name}", $data);

app/Http/Controllers/AjaxController.php

@@ -9,6 +9,7 @@ use App\Models\MarketCountry;
 use App\Models\University;
 use App\Models\Department;
 use App\Models\ReferUser;
+use App\Models\ResearchInterest;
 use App\StudentProposal;
 use Session;
 use Mail;
@@ -152,7 +153,7 @@ class AjaxController extends Controller
             ); 
              
         }elseif($name=="update_profile"){
-            info($req->all());
+             
             $validator=\Validator::make($req->all(), [
                 'first_name'=>'required', 
                 'last_name'=>'required', 
@@ -217,6 +218,25 @@ class AjaxController extends Controller
             return response(
                 ['msg'=>'Refer saved successfully.']
             ); 
+        }elseif($name=="research_interest"){
+
+            $validator=\Validator::make($req->all(), [
+                'research'=>'required', 
+            ]); 
+
+            if($validator->fails()){
+                $errors=$validator->errors()->all();
+                return response(['msg'=>$errors[0]], 422);
+            }
+
+            $data = new ResearchInterest; 
+            $data->teacher_id =$req->id; 
+            $data->research =$req->research; 
+            $data->save();
+
+            return response(
+                ['msg'=>'Saved successfully.']
+            );
         }  
 	}
 }

app/Http/Controllers/TeacherHomeController.php

@@ -7,6 +7,7 @@ use App\User;
 use App\StudentProposal;
 use App\Models\Department;
 use App\Models\ReferUser;
+use App\Models\University;
 use Auth;
 
 class TeacherHomeController extends Controller
@@ -20,7 +21,8 @@ class TeacherHomeController extends Controller
         $students = StudentProposal::where('teacher_id',$user->id)->get(); 
         $departments =Department::where('status',1)->orderBy('name','ASC')->get();
         $refer_users =ReferUser::where('teacher_id',$user->id)->orderBy('id','DESC')->get();
-        return view('teacher_profile',compact('students','user','departments','refer_users'));
+        $universities =University::orderBy('name','ASC')->get();
+        return view('teacher_profile',compact('students','user','departments','refer_users','universities'));
     }
 
     

app/Models/ResearchInterest.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ResearchInterest extends Model
+{
+    protected $guarded=['id']; 
+
+    public $timestamps = FALSE;
+}

app/User.php

@@ -61,6 +61,11 @@ class User extends Authenticatable
         return $this->belongsTo('App\Models\Department', 'department');
     } 
 
+    public function university()
+    {
+        return $this->belongsTo('App\Models\University', 'university_name');
+    } 
+
     
      
 }

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

@@ -11,8 +11,8 @@
     <span style="font-size: 11px; color: #868e96;">{{$tuser->email}}</span>
 </div>
 <div class="single_glance_row mt-1" style="display: flex;">
-    <span class="title" style="font-size:11px; font-weight: 600;">University Name :</span>
-    <span style="font-size: 11px; color: #868e96;"> {{$tuser->university_name }}</span>
+    <span class="title" style="font-size:11px; font-weight: 600;">University Name : </span>
+    <span style="font-size: 11px; color: #868e96;"> {{cn($tuser,'university.name','') }}</span>
 </div>
 <div class="single_glance_row mt-1" style="display: flex;">
     <span class="title" style="font-size:11px; font-weight: 600;">Department : </span>

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

@@ -0,0 +1,8 @@
+@extends('admin.sub_contents.base')  
+@section('main') 
+
+@foreach($resarch as $row)
+<span class="title" style="font-size:11px;" id="interest" contenteditable="true" style="padding: 5px;">{{$row->research}}</span>
+@endforeach
+ 
+@endsection

resources/views/auth/login.blade.php

@@ -189,8 +189,7 @@
                                     <div class="card login-page border-0" style="z-index: 1">
                                         <div class="card-body p-0">
                                             <h6 class="card-title text-start" style="color: #141639c4;">Please log-in to your account</h6>  
-                                            <form method="POST" action="{{ route('student-login') }}">
-
+                                            <form method="POST" action="{{ route('student-login') }}"> 
                                                     @csrf
                                                     @if ($message = Session::get('error'))
                                                     <div class="row">

resources/views/profile.blade.php

@@ -658,7 +658,7 @@
                                                                     </div>
                                                                     <div class="form-check-inline">
                                                                         <label class="form-check-label" for="radio2">
-                                                                            <input type="radio" {{ Auth::user()->is_work_experience == 0 ? 'checked' : ''}} class="form-check-input" name="work_experience" value="No"  style="font-size: 12px;" onclick="checkWorkExperience('0')"> No
+                                                                            <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>
@@ -1002,7 +1002,7 @@
                                                                         </div>
                                                                         <div class="form-check-inline">
                                                                             <label class="form-check-label" for="radio2">
-                                                                                <input type="radio" {{ Auth::user()->is_test_score == 0 ? 'checked' : ''}} class="form-check-input" name="test_score" value="no"  style="font-size: 12px;"  onclick="checkTestScore('0')"> No
+                                                                                <input type="radio" {{ Auth::user()->is_test_score == 2 ? 'checked' : ''}} class="form-check-input" name="test_score" value="no"  style="font-size: 12px;"  onclick="checkTestScore('2')"> No
                                                                             </label>
                                                                         </div>
                                                                     </div>

resources/views/teacher_profile.blade.php

@@ -819,7 +819,15 @@ tbody, td, tfoot, th, thead, tr {
                                                                             <div class="mb-2">
                                                                                 <label class="form-label config">University Name</label>
                                                                                 <div class="form-icon position-relative">
-                                                                                    <input type="text" class="form-control" placeholder="University Name" id="university_name" name="university_name" value="{{$user->university_name}}" required="" style="font-size: 13px;">
+                                                                                    {{-- <input type="text" class="form-control" placeholder="University Name" id="university_name" name="university_name" value="{{$user->university_name}}" required="" style="font-size: 13px;"> --}}
+                                                                                    <select class="form-control" name="university_name" id="university_name">
+                                                                                        <option value="" disabled selected>Choose one..</option>
+                                                                                        @foreach($universities as $row)
+                                                                                            <option value="{{$row->id}}" @if($user->university_name ==$row->id) selected @endif>{{ $row->name}}</option>
+                                                                                        @endforeach
+
+                                                                                    </select>
+                                                                               
                                                                                 </div>
                                                                             </div>
                                                                         </div> 
@@ -882,14 +890,16 @@ tbody, td, tfoot, th, thead, tr {
                                                 <div class="col-md-12 mt-2">
                                                     <div class="mb-2">
                                                         <div class="form-icon position-relative p-2" style="display: flex;">
-                                                            <input type="text" class="form-control" placeholder="" name="" required="">
-                                                            <button class="btn btn2" style="margin-left: -3.4rem; border-radius: 0px 6px 6px 0px">Add</button>
+                                                            <input type="hidden" name="user_id" value="{{$user->id}}" id="res_user_id">
+                                                            <input type="text" class="form-control" placeholder="" name="research" id="research" required="">
+                                                            <button class="btn btn2 research_interest" style="margin-left: -3.4rem; border-radius: 0px 6px 6px 0px">Add</button>
                                                         </div>
                                                     </div>
                                                     <div class="single_glance_row mt-4">
                                                         <div style="display: flex;">
                                                             <div class="left" style="width: 90%;">
-                                                                <span class="title" style="font-size:11px;" id="interest" contenteditable="true" style="padding: 5px;">Business 1</span>
+                                                                <div id="load_research_interest"></div>
+                                                                {{-- <span class="title" style="font-size:11px;" id="interest" contenteditable="true" style="padding: 5px;">Business 1</span> --}}
                                                             </div>
                                                             <!-- <div class="right" style="width: 10%;">
                                                                 <span class="title" style="font-size:11px;">
@@ -1042,6 +1052,11 @@ tbody, td, tfoot, th, thead, tr {
                 "{{ route('sub-content', ['name'=>'load_profile_info']) }}"
             );
 
+            fetch_sub_content(
+                '#load_research_interest',
+                "{{ route('sub-content', ['name'=>'load_research_interest']) }}"
+            );
+
             $('.update_profile').on('click', function(){  
 
                 var id =$('#u_id').val(); 
@@ -1097,9 +1112,35 @@ tbody, td, tfoot, th, thead, tr {
 
                 }); 
             });
+
+            $('.research_interest').on('click', function(){
+                var id =$('#res_user_id').val();
+                var research =$('#research').val();  
+
+                var form_data={
+                    _token: "{{ csrf_token() }}",
+                    id: id,
+                    research: research, 
+                }
+
+                $.post("{{ route('ajax-post', ['name'=>'research_interest']) }}", form_data, function(res){ 
+                    pop_up_msg(res.msg);
+                    fetch_sub_content(
+                        '#load_research_interest',
+                        "{{ route('sub-content', ['name'=>'load_research_interest']) }}"
+                    );
+
+                }).fail(function(err){
+
+                    pop_up_msg(err_msg(err), 'error');
+
+                }); 
+            });
         });
-        let answer = document.getElementById("interest").contentEditable;
-        document.getElementById("demo").innerHTML = answer;
+
+
+        // let answer = document.getElementById("interest").contentEditable;
+        // document.getElementById("demo").innerHTML = answer;
       </script>