Browse Source

Modified issue

Shah Rakibur Rahaman 1 year ago
parent
commit
45564342b4

+ 1 - 9
app/Http/Controllers/HomeController.php

@@ -30,14 +30,6 @@ class HomeController extends Controller
      */
     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',$user->id)->get(); 
-        $proposal= Proposal::where('student_id',$user->id)->orderBy('id','DESC')->get();
-        $user_info= User::find($user->id);
-        $academic_level= AcademicLevel::all();
-        $proposal_files= StudentProposalUpload::where('student_id',$user->id)->get(); 
-        return view('profile',compact('institution','academic_level','work_experience','score','user_info','proposal','proposal_files'));
+       
     }
 }

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

@@ -32,7 +32,11 @@ class ModalController extends Controller{
             $data['std_proposal'] =StudentProposal::find($req->id); 
 
         }elseif($name=="view_student_proposal"){
-            $data['proposal']= Proposal::where('student_id',$user->id)->get(); 
+            $data['proposal']= Proposal::where(
+                    'student_id',$user->id
+                )->where(
+                    'id',$req->id
+                )->first(); 
 
         }elseif($name=="add_destination"){
 

+ 16 - 0
app/Http/Controllers/StudentHomeController.php

@@ -10,6 +10,8 @@ use App\User;
 use App\Proposal;
 use App\StudentProposalUpload;
 use App\StudentProposal;
+use App\AcademicLevel;
+use App\Models\Department;
 use Auth;
 use Carbon\Carbon;
 
@@ -34,6 +36,20 @@ class StudentHomeController extends Controller
       return view('application',compact('student_proposal'));
    }
 
+   public function profile()
+    { 
+        $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',$user->id)->get(); 
+        $proposal= Proposal::where('student_id',$user->id)->orderBy('id','DESC')->get();
+        $user_info= User::find($user->id);
+        $academic_level= AcademicLevel::all();
+        $proposal_files= StudentProposalUpload::where('student_id',$user->id)->get(); 
+        $departments = Department::where('status',1)->orderBy('name','ASC')->get();
+        return view('profile',compact('institution','academic_level','work_experience','score','user_info','proposal','proposal_files','departments'));
+    }
+
 
 
 

+ 4 - 0
app/Proposal.php

@@ -7,4 +7,8 @@ use Illuminate\Database\Eloquent\Model;
 class Proposal extends Model
 {
     protected $table = 'proposal';
+
+    public function department(){
+        return $this->belongsTo(Department::class,'department');
+    }
 }

BIN
public/uploads/proposal/1680602701documentfile_.pdf


+ 8 - 6
resources/views/modal_pages/view_student_proposal.blade.php

@@ -1,11 +1,13 @@
 @extends('modal_pages.base')
 
-@section('main')
- 
-    <!-- @foreach($proposal as $row)
-        {{ $row->title}}
-    @endforeach -->
-    <embed src="web/files/CRM.pdf" type="application/pdf" width="100%" height="560px"/>
+@section('main') 
+     
+    @if(file_exists( public_path().'/uploads/proposal/'.$proposal->document_file ) && $proposal->document_file != null)
+        <iframe src ="{{url(asset('/uploads/proposal').'/'.$proposal->document_file) }}" type="application/pdf"  width="100%" height="560px"></iframe>
+    @else 
+        <iframe src ="web/files/CRM.pdf" type="application/pdf"  width="100%" height="560px"></iframe>
+    @endif
+       
 
 <script>
     $(function(){

+ 14 - 4
resources/views/profile.blade.php

@@ -47,8 +47,13 @@
                                                                             <div class="col-md-4">
                                                                                 <div class="mb-2">
                                                                                     <label class="form-label">Department</label>
-                                                                                    <div class="form-icon position-relative">
-                                                                                        <input type="text" class="form-control" placeholder="Department" name="department" required="">
+                                                                                    <div class="form-icon position-relative"> 
+                                                                                        <select class="form-control" name="department" required="">
+                                                                                            <option selected disabled>Select one</option>
+                                                                                            @foreach($departments as $row)
+                                                                                                <option value="{{$row->id}}">{{$row->name}}</option>
+                                                                                            @endforeach
+                                                                                        </select>
                                                                                     </div>
                                                                                 </div>
                                                                             </div>
@@ -181,7 +186,12 @@
                                                                                     <div class="mb-1">
                                                                                         <label class="form-label">Department</label>
                                                                                         <div class="form-icon position-relative">
-                                                                                            <input type="text" class="form-control" placeholder="Department" name="department" required="">
+                                                                                            <select class="form-control" name="department" required="">
+                                                                                                <option selected disabled>Select one</option>
+                                                                                                @foreach($departments as $row)
+                                                                                                    <option value="{{$row->id}}">{{$row->name}}</option>
+                                                                                                @endforeach
+                                                                                            </select>
                                                                                         </div>
                                                                                     </div>
                                                                                 </div>                                                            
@@ -1405,7 +1415,7 @@
         $('#edit-proposal').attr("action","{{ url('proposal-update') }}/"+row.id); 
         $('#edit-proposal').find('input[name="title"]').val(row.title);
         $('#edit-proposal').find('select[name="methology"]').val(row.methology).trigger('change');
-        $('#edit-proposal').find('input[name="department"]').val(row.department);
+        $('#edit-proposal').find('input[name="department"]').val(row.department.name).trigger('change');
         $('#edit-proposal').find('select[name="status"]').val(row.status).trigger('change');
      }
 </script>

+ 5 - 5
routes/web.php

@@ -33,9 +33,9 @@ Route::get('/dashboard', function () {
      return view('register_teacher_email');
  });
 
-Route::get('/profile', function () {
-    return view('profile');
-});
+// Route::get('/profile', function () {
+//     return view('profile');
+// });
 
 Route::get('/explore', function () {
     return view('explore');
@@ -50,8 +50,7 @@ Route::get('/title', function () {
 
 
 Auth::routes();
-
-Route::get('/profile', 'HomeController@index')->name('profile');
+//Route::get('/profile', 'HomeController@index')->name('profile');
 Route::get('/email-verification/{id}', [App\Http\Controllers\RegisterController::class,'email_verification'])->name('/email-verification');
 
 // Student
@@ -61,6 +60,7 @@ Route::get('/email-verification/{id}', [App\Http\Controllers\RegisterController:
 Route::group(['middleware' => ['auth']], function() {
 Route::get('/home', [App\Http\Controllers\StudentHomeController::class,'index']);
 Route::get('/application', [App\Http\Controllers\StudentHomeController::class,'application']);
+Route::get('/profile', [App\Http\Controllers\StudentHomeController::class,'profile'])->name('profile');
 Route::post('std-logout', [App\Http\Controllers\StudentHomeController::class,'logout'])->name('std-logout');
 Route::get('/save-as-complete', [App\Http\Controllers\StudentHomeController::class,'save_as_complete'])->name('save-as-complete');
 Route::post('/institution_save', [App\Http\Controllers\StudentHomeController::class,'institution_save'])->name('institution-save');