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

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'));
+       
     }
 }

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"){
 

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'));
+    }
+
 
 
 
@@ -240,7 +256,7 @@ class StudentHomeController extends Controller
      public function ref_search(Request $req){
          $data['teacher'] =[];
          if($req->teacher_ref_no){
-            $data['teacher'] =User::where('ref_no','like','%'. trim($req->teacher_ref_no) .'%')->get();
+            $data['teacher'] =User::where('ref_no',$req->teacher_ref_no)->get();
          }
 
         return view('ref_search_load',$data);

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');
+    }
 }

resources/views/email/approve_teacher_email.blade.php

@@ -92,7 +92,7 @@
                         <div class="col-md-9 ms-3">
                             <div class="card rounded border-0 shadow p-5" style="background-color:white;">
                                 <h3 style="text-align: center; font-family:Ubuntu !important; color: #3c4858 !important; font-size: 30px !important;">Research Admission</h3>
-                                <p class="mt-5">Dear Applicant,</p>
+                                <p class="mt-5">Dear {{$name}},</p>
                                     <p class="mt-3">We are writing to inform you that your account has been successfully activated on our platform. We are excited to have you on board with us.</p>
                                     <p class="mt-2">To ensure that your account is configured properly, we have reviewed the necessary information and have completed the activation process. You now have full access to all the features that we have built to support you.</p>
                                     <div class="col-md-12">

resources/views/email/register_teacher_email.blade.php

@@ -80,7 +80,7 @@
                         <div class="col-md-9">
                             <div class="card rounded border-0 shadow p-5" style="background-color:white;">
                                 <h3 style="text-align: center; font-family:Ubuntu !important; color: #3c4858 !important; font-size: 30px !important;">Research Admission</h3>
-                                <p class="mt-5">Dear Applicant,</p>
+                                <p class="mt-5">Dear {{$name}},</p>
                                     <p class="mt-3">We would like to extend a warm welcome to our community and thank you for registering to join us. We believe that together we can transform the way you receive proposals from doctoral candidates and make the process much more efficient.</p>
                                     <p class="mt-2">We are pleased to inform you that we have received your registration and our team is working diligently to configure your account as soon as possible. We will notify you by email as soon as your account is ready to use.</p>
                                     <p class="mt-2">Once your account is ready, you will be able to conveniently access all proposals from doctoral candidates in one place. This will save you time and effort, and enable you to make more informed decisions about which proposals to consider.</p>

resources/views/home.blade.php

@@ -32,7 +32,7 @@
                                             <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="">
                                                 <span class="search_button hand search-btn" style="margin-left: -8.8rem; "><span style="display:block; margin-left:11px; margin-top:4px; cursor: pointer;">Search</span></span>
-                                                <span class="search_button hand search-btn ms-2" style="width: 5%; background-color: #ffbd59 !important; border: 2px solid #ffbd59;"><span style="display:block; margin-left:9px; margin-top:4px; cursor: pointer;"><i class="fa fa-refresh" style="color:#ffff !important;"></i></span></span>
+                                                <a href="{{url()->current()}}" class="ref_button hand search-btn ms-2" style="width: 5%; background-color: #ffbd59 !important; border: 2px solid #ffbd59;"><span style="display:block; margin-left:9px; margin-top:4px; cursor: pointer;"><i class="fa fa-refresh" style="color:#ffff !important;"></i></span></a>
                                                 <!-- <button class="btn btncl"></button>  -->
                                             </div> 
                                             <div id="load_data"></div> 

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(){

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>
@@ -183,7 +188,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>                                                            
@@ -207,7 +217,7 @@
                                                                             <div class="col-md-2">
                                                                                 <div class="mt-4 pt-3">
                                                                                     <div class="text-end">
-                                                                                        <button class="btn btncl"><i class="fa fa-refresh"></i></button> 
+                                                                                        <a href="{{url()->current()}}" class="btn btncl"><i class="fa fa-refresh"></i></a>  
                                                                                         <button class="btn btn2">Update</button>                                                                                                                
                                                                                     </div>
                                                                                 </div>
@@ -400,7 +410,7 @@
                                                                                 <div class="col-md-3">
                                                                                     <div class="mt-4 pt-3">
                                                                                         <div class="text-end">
-                                                                                            <button class="btn btncl"><i class="fa fa-refresh"></i></button> 
+                                                                                            <a href="{{url()->current()}}" class="btn btncl"><i class="fa fa-refresh"></i></a> 
                                                                                             <button class="btn btn2">Save</button>                                                                                                                
                                                                                         </div>
                                                                                     </div>
@@ -618,7 +628,7 @@
                                                                                 <div class="col-md-3">
                                                                                     <div class="mt-4 pt-3">
                                                                                         <div class="text-end">
-                                                                                            <button class="btn btncl"><i class="fa fa-refresh"></i></button> 
+                                                                                            <a href="{{url()->current()}}" class="btn btncl"><i class="fa fa-refresh"></i></a> 
                                                                                             <button class="btn btn2">Update</button>                                                                                                                
                                                                                         </div>
                                                                                     </div>
@@ -787,7 +797,7 @@
                                                                         <div class="col-md-12">
                                                                             <div class="mt-2">
                                                                                 <div class="text-end">
-                                                                                    <button class="btn btncl"><i class="fa fa-refresh"></i></button> 
+                                                                                    <a href="{{url()->current()}}" class="btn btncl"><i class="fa fa-refresh"></i></a>  
                                                                                     <button class="btn btn2" type="submit">Save</button>                                                                                                              
                                                                                 </div>
                                                                             </div>
@@ -961,7 +971,7 @@
                                                                             <div class="col-md-12">
                                                                                 <div class="mt-3">
                                                                                     <div class="text-end">
-                                                                                        <button class="btn btncl"><i class="fa fa-refresh"></i></button> 
+                                                                                        <a href="{{url()->current()}}" class="btn btncl"><i class="fa fa-refresh"></i></a>  
                                                                                         <button class="btn btn2">Update</button>                                                                                                                
                                                                                     </div>
                                                                                 </div>
@@ -1087,7 +1097,7 @@
                                                                                     <div class="col-md-2">
                                                                                         <div class="mt-4 pt-4">
                                                                                             <div class="text-end">
-                                                                                                <button class="btn btncl"><i class="fa fa-refresh"></i></button> 
+                                                                                                <a href="{{url()->current()}}" class="btn btncl"><i class="fa fa-refresh"></i></a> 
                                                                                                 <button class="btn btn2">Save</button>                                                                                                                
                                                                                             </div>
                                                                                         </div>
@@ -1232,7 +1242,7 @@
                                                                                     <div class="col-md-2">
                                                                                         <div class="mt-4 pt-4">
                                                                                             <div class="text-end">
-                                                                                                <button class="btn btncl"><i class="fa fa-refresh"></i></button> 
+                                                                                                <a href="{{url()->current()}}" class="btn btncl"><i class="fa fa-refresh"></i></a> 
                                                                                                 <button class="btn btn2">Update</button>                                                                                                                
                                                                                             </div>
                                                                                         </div>
@@ -1407,7 +1417,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>

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');