Browse Source

Error Solved

Shah Rakibur Rahaman 1 year ago
parent
commit
91ddda1a92

+ 10 - 4
app/Http/Controllers/Admin/SubContentController.php

@@ -7,22 +7,23 @@ use Illuminate\Http\Request;
 use \App\Helpers\PageSL;
 use App\Models\University;
 use App\Models\MarketCountry;
+use App\StudentProposal;
 use Auth;
 
 class SubContentController extends Controller
 {
     public function get(Request $req, $name){
 
-		$user=Auth::guard('admin')->user();
+		
 		$carbon=new \Carbon\Carbon;
 
-		$data=[
-			'user'=>$user,
+		$data=[ 
 			'carbon'=>$carbon,
 			'name'=>$name
 		];
 
 		if($name=="load_market_countries"){
+			$user=Auth::guard('admin')->user();
 			$data['market_countries'] = MarketCountry::where( 
                 'status', 1
             )->select(
@@ -30,9 +31,14 @@ class SubContentController extends Controller
             )->orderBy('sort')->get();
 			
 		}elseif($name=='country_wise_university'){ 
-
+			$user=Auth::guard('admin')->user();
 			$data['universities'] =University::orderBy('name','ASC')->get(); 
 		 
+		}elseif($name=="load_profile_info"){
+			$tuser=Auth::guard('teacher')->user();
+			$data['tuser'] =$tuser;
+			$data['students'] = StudentProposal::where('teacher_id',$tuser->id)->get(); 
+			
 		}else $name='default'; 
 		//$data['page_sl']=new PageSL($data['chapter_details']); 
 		return view("admin.sub_contents.{$name}", $data);

+ 0 - 32
app/Http/Controllers/Teacher/SubContentController.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Teacher;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use \App\Helpers\PageSL; 
-use App\StudentProposal;
-use Auth;
-
-class SubContentController extends Controller
-{
-    public function get(Request $req, $name){
-
-		$user=Auth::guard('teacher')->user();
-		$carbon=new \Carbon\Carbon;
-
-		$data=[
-			'user'=>$user,
-			'carbon'=>$carbon,
-			'name'=>$name
-		];
-
-		if($name=="load_profile_info"){
-			$data['students'] = StudentProposal::where('teacher_id',$user->id)->get(); 
-			
-		}else $name='default'; 
-		//$data['page_sl']=new PageSL($data['chapter_details']); 
-		return view("teacher.sub_contents.{$name}", $data);
-
-	}
-}

+ 3 - 3
resources/views/admin/admin_profile.blade.php

@@ -1063,7 +1063,7 @@ tbody, td, tfoot, th, thead, tr {
 
             fetch_sub_content(
                 '#country_wise_university',
-                "{{ route('admin.sub-content', ['name'=>'country_wise_university']) }}"
+                "{{ route('sub-content', ['name'=>'country_wise_university']) }}"
             );
 
 
@@ -1085,7 +1085,7 @@ tbody, td, tfoot, th, thead, tr {
 
                     fetch_sub_content(
                         '#country_wise_university',
-                        "{{ route('admin.sub-content', ['name'=>'country_wise_university']) }}"
+                        "{{ route('sub-content', ['name'=>'country_wise_university']) }}"
                     );
 
                 }).fail(function(err){
@@ -1110,7 +1110,7 @@ tbody, td, tfoot, th, thead, tr {
 
                     fetch_sub_content(
                         '#load_department',
-                        "{{ route('admin.sub-content', ['name'=>'load_department']) }}"
+                        "{{ route('sub-content', ['name'=>'load_department']) }}"
                     );
 
                 }).fail(function(err){

+ 7 - 7
resources/views/teacher/sub_contents/load_profile_info.blade.php → resources/views/admin/sub_contents/load_profile_info.blade.php

@@ -1,25 +1,25 @@
-@extends('teacher.sub_contents.base')  
+@extends('admin.sub_contents.base')  
 @section('main') 
 <div class="single_glance_row mt-5">
     <span class="title" style="font-size:11px; font-weight: 600;">Name :</span>
     <span class="tbl2 mb-2">
-        {{$user->first_name}} {{$user->last_name}}
+        {{$tuser->first_name}} {{$tuser->last_name}}
     </span>
 </div>
 <div class="single_glance_row mt-1">
     <span class="title" style="font-size:11px; font-weight: 600;">Email :</span>
-    <span style="font-size: 11px; color: #868e96;">{{$user->email}}</span>
+    <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;"> {{$user->university_name }}</span>
+    <span style="font-size: 11px; color: #868e96;"> {{$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>
-    @if(isset($user->department))
-        <span style="font-size: 11px; color: #868e96;"> {{ cn($user,'department_name.name','')}}</span>
+    @if(isset($tuser->department))
+        <span style="font-size: 11px; color: #868e96;"> {{ cn($tuser,'department_name.name','')}}</span>
     @else
-        <span style="font-size: 11px; color: #868e96;"> {{ $user->others_department }}</span>
+        <span style="font-size: 11px; color: #868e96;"> {{ $tuser->others_department }}</span>
     @endif
 </div>        
  

+ 0 - 7
resources/views/teacher/sub_contents/base.blade.php

@@ -1,7 +0,0 @@
-@yield('main')
-
-<script>
-$(function(){
-	$('.tooltips').tooltip();
-});
-</script>

+ 2 - 2
resources/views/teacher_profile.blade.php

@@ -1110,7 +1110,7 @@ tbody, td, tfoot, th, thead, tr {
 
             fetch_sub_content(
                 '#load_profile_info',
-                "{{ route('teacher.sub-content', ['name'=>'load_profile_info']) }}"
+                "{{ route('sub-content', ['name'=>'load_profile_info']) }}"
             );
 
             $('.update_profile').on('click', function(){  
@@ -1135,7 +1135,7 @@ tbody, td, tfoot, th, thead, tr {
 
                     fetch_sub_content(
                         '#load_profile_info',
-                        "{{ route('teacher.sub-content', ['name'=>'load_profile_info']) }}"
+                        "{{ route('sub-content', ['name'=>'load_profile_info']) }}"
                     ); 
 
                 }).fail(function(err){

+ 7 - 5
routes/web.php

@@ -91,6 +91,7 @@ Route::post('teacher-logout', [App\Http\Controllers\TeacherAuth\LoginController:
 
 Route::group(['middleware' => ['teacher']], function() {
     Route::get('/teacher_profile', [App\Http\Controllers\TeacherHomeController::class,'teacher_profile'])->name('teacher_profile');
+   
     
 });
 
@@ -102,12 +103,12 @@ Route::post('admin-logout', [App\Http\Controllers\AdminAuth\LoginController::cla
 Route::group(['middleware' => ['admin']], function() {
     Route::get('/admin/dashboard', [App\Http\Controllers\Admin\AdminController::class,'dashboard']);
     Route::get('/admin/dashboard/load_country_list/{text}', [App\Http\Controllers\Admin\AdminController::class,'load_country_list']);
-    Route::get(
-        'sub-content/{name}', [App\Http\Controllers\Admin\SubContentController::class, 'get']
-    )->name('admin.sub-content');
+   
+
 });
 
 
+
 Route::get(
     'modal/{name}',
      'ModalController@get'
@@ -128,7 +129,8 @@ Route::post(
 )->name('ajax-post');
 
 Route::get(
-    'sub-content/{name}', [App\Http\Controllers\Teacher\SubContentController::class, 'get']
-)->name('teacher.sub-content');
+    'sub-content/{name}', [App\Http\Controllers\Admin\SubContentController::class, 'get']
+)->name('sub-content');
+