Home Explore Help
Sign In
revinr
/
student-admission
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

Israat Zarin 1 year ago
parent
91690d437b b7e8ce0fbf
commit
cefb067437
10 changed files with 131 additions and 25 deletions
Split View Show Diff Stats
  1. 1 1
      app/Http/Controllers/Admin/AdminController.php
  2. 2 2
      app/Http/Controllers/AjaxController.php
  3. 3 0
      app/Http/Controllers/ModalController.php
  4. 12 7
      app/Http/Controllers/TeacherHomeController.php
  5. 2 1
      resources/views/Q_apply_form.blade.php
  6. 94 0
      resources/views/modal_pages/proposal_status_rejected_form.blade.php
  7. 12 9
      resources/views/teacher/load_application.blade.php
  8. 1 1
      resources/views/teacher/student_proposal_details.blade.php
  9. 1 1
      resources/views/teacher_profile.blade.php
  10. 3 3
      routes/web.php

+ 1 - 1
app/Http/Controllers/Admin/AdminController.php
View File 

@@ -35,7 +35,7 @@ class AdminController extends Controller
 
             )->where(
 
                 'user_type',2
 
             )->orderBy(
 
-                'id','DESC'
 
+                'registered_date','DESC'
 
             )->get();
 
 
         $pending_student_list =User::where(

+ 2 - 2
app/Http/Controllers/AjaxController.php
View File 

@@ -408,9 +408,9 @@ class AjaxController extends Controller
 
 
             $data =User::find($user->id);
 
             if($req->checked =="true"){
 
-                $data->is_available =1;
 
-            }else{
 
                 $data->is_available =0;
 
+            }else{
 
+                $data->is_available =1;
 
             }
 
 
             $data->update();

+ 3 - 0
app/Http/Controllers/ModalController.php
View File 

@@ -76,6 +76,9 @@ class ModalController extends Controller{
 
             $data['teacher']=Auth::guard('teacher')->user();
 
             $data['std_proposal']=StudentProposal::find($req->id);
 
             $data['doc_requirement_list']=Requirement::where('std_proposal_id',$req->id)->get();
 
+        }elseif($name=="proposal_status_rejected_form"){
 
+            $data['teacher']=Auth::guard('teacher')->user();
 
+            $data['std_proposal']=StudentProposal::find($req->id);
 
         }else $name='default';

+ 12 - 7
app/Http/Controllers/TeacherHomeController.php
View File 

@@ -39,9 +39,14 @@ class TeacherHomeController extends Controller
 
         return view('teacher_profile',compact('students','user','departments','refer_users','universities'));
 
     }
 
 
-    public function student_proposal_details($id){
 
+    public function student_proposal_details($hash){
 
+
 
         $user = Auth::guard('teacher')->user();
 
-        $proposal_details = StudentProposal::find($id);
 
+        $hashids=new \Hashids\Hashids('application', 25);
 
+        $hash_ids=$hashids->decode($hash);
 
+        if(empty($hash_ids[0])) abort(404);
 
+
 
+        $proposal_details = StudentProposal::find($hash_ids[0]);
 
         $education_history =Institution::where(
 
             'student_id',$proposal_details->student_id
 
         )->orderBy('id','desc')->get();
 
@@ -65,7 +70,7 @@ class TeacherHomeController extends Controller
 
             'std_proposal_id',$proposal_details->id
 
         )->get();
 
 
-        return view('teacher.student_proposal_details',compact('proposal_details','education_history','start_date','end_date','doc_info'));
 
+        return view('teacher.student_proposal_details',compact('hash_ids','proposal_details','education_history','start_date','end_date','doc_info'));
 
     }
 
 
 
@@ -91,14 +96,14 @@ class TeacherHomeController extends Controller
 
         }
 
 
         if($request->submitted_date){
 
-            $date_array = explode("to",$request->submitted_date); 
+            $date_array = explode("to",$request->submitted_date);
 
 
             $from_date = date('d-m-Y', strtotime($date_array[0]));
 
-            $to_date = date('d-m-Y', strtotime($date_array[1])); 
+            $to_date = date('d-m-Y', strtotime($date_array[1]));
 
 
             $start_date=$carbon->parse($from_date)->toDateString();
 
             $end_date=$carbon->parse($to_date)->toDateString();
 
-             
+
 
 
             $students->whereRaw("DATE(submitted_date) >= ? AND DATE(submitted_date) <= ?", [$start_date, $end_date]);
 
         }
 
@@ -108,7 +113,7 @@ class TeacherHomeController extends Controller
 
 
             $from_month_year = date('m-Y', strtotime($date_array[0])); //01-06-2023
 
             $to_month_year = date('m-Y', strtotime($date_array[1]));//31-07-2023
 
-            
+
 
             $start_date=$carbon->parse('01-'.$from_month_year)->toDateString();
 
             $end_date=$carbon->parse('01-'.$to_month_year)->toDateString();

+ 2 - 1
resources/views/Q_apply_form.blade.php
View File 

@@ -2,7 +2,8 @@
 
     <html lang="en">
 
         <head>
 
             <meta charset="utf-8" />
 
-            <title>Supervisor's Login - Research Admission</title>
 
+            <div class="alert" style="margin-bottom: 0px; color: #3c3d5b;">  
+            <title>{{ $user->first_name }} {{ $user->last_name }} {{'.'}}  @if($user->others_department) {{ $user->others_department }} @else {{ cn($user,'department_name.name','')}} @endif {{'.'}} @if($user->university_name) {{ $user->university_name }} @else {{ cn($user,'university.name','')}} @endif - Research Admission</title>
 
             <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
             <meta name="description" content="Information & Guidance on the PhD Process, Connect with Supervisor and Many" />
 
             <meta name="keywords" content="" />

+ 94 - 0
resources/views/modal_pages/proposal_status_rejected_form.blade.php
View File 

@@ -0,0 +1,94 @@
 
+@extends('modal_pages.base')
 
+<style>
 
+    .listFlag{
 
+        height: 20px;
 
+        border-radius: 50%;
 
+        width: 20px;
 
+        margin-right: 5px;
 
+    }
 
+    .btn1{
 
+    background-color: #141639c4 !important;
 
+    color:white !important;
 
+    border-radius: 20px;
 
+    box-shadow:none !important;
 
+    }
 
+    .btn1:hover{
 
+        background: #ffff !important;
 
+        color: #141639c4 !important;
 
+        border-radius: 20px;
 
+        border: 1px solid #141639c4;
 
+    }
 
+</style>
 
+@section('main')
 
+
 
+    <div class="container" style="background-color: white; border-radius: 6px;">
 
+        <div class="row">
 
+            <div class="co-md-12 p-3">
 
+                <form class="modal-form" action="{{ url()->current() }}" method="POST" enctype="multipart/form-data">
 
+                {{ csrf_field() }}
 
+                    <div class="row">
 
+                        <div class="col-md-12"> 
+                            <div class="pretty p-default p-curve">
 
+                                <input class="feedback" type="radio" name="feedback" />
 
+                                <div class="state p-success-o">
 
+                                    <label>Success</label>
 
+                                </div>
 
+                            </div>
 
+                            <div class="pretty p-default p-curve">
 
+                                <input class="feedback" type="radio" name="feedback" />
 
+                                <div class="state p-success-o">
 
+                                    <label>Success</label>
 
+                                </div>
 
+                            </div>
 
+                            <div class="pretty p-default p-curve">
 
+                                <input class="feedback feedback_msg" type="radio" name="feedback" value="others"/>
 
+                                <div class="state p-success-o">
 
+                                    <label>Others</label>
 
+                                </div>
 
+                            </div> 
+                        </div> 
+                        <div class="col-md-12" id="feedback_msg"> 
+                            <label class="form-label">Feedback</label>
 
+                            <div class="form-icon position-relative">
 
+                                <input type="hidden" name="p_status" id="p_status" value="">
 
+                                <textarea class="form-control" name="message" id="message" required=""></textarea>
 
+                            </div> 
+                        </div> 
+                        <div class="col-md-12">
 
+                            <div class="mt-2 text-center">
 
+                                <button type="submit" class="btn btn1" style="padding: 3px 18px;">
 
+                                    {{ __('Submit') }}
 
+                                </button>
 
+                            </div>
 
+                        </div>
 
+                    </div>
 
+                </form>
 
+            </div>
 
+        </div>
 
+    </div>
 
+
 
+   <script>
 
+    $(function(){
 
+        $('#modal_page_footer').hide(); 
+
 
+        var feedback=[ 
+            'others',
 
+        ];
 
+
 
+        feedback.forEach(function(row){
 
+            $('#'+row).hide();
 
+        });
 
+
 
+        $('.feedback_msg').on('click', function(){
 
+
 
+            feedback.forEach(function(row){
 
+                $('#'+row).hide();
 
+            });
 
+
 
+            var feedback_msg=$(this).val();
 
+            $('#'+feedback_msg).show();
 
+
 
+        });
 
+    }); 
+    </script>  
+@endsection

+ 12 - 9
resources/views/teacher/load_application.blade.php
View File 

@@ -70,27 +70,30 @@
 
                                 </span>
 
                             </div>
 
                         </td>
 
-                        <td style="font-size: 11px; text-align:center;"> 
+                        <td style="font-size: 11px; text-align:center;">
 
                             <div style="font-size: 11px; display:block;">
 
                                 <div style="font-size: 11px; color: black;"> Pu :
 
-                                    @if($row->student_details->is_publication==1) 
+                                    @if($row->student_details->is_publication==1)
 
                                         <span class="label_badge_work"> yes</span>
 
                                     @else
 
                                         <span class="label_badge_no"> No</span>
 
                                     @endif
 
                                 </div>
 
                                 <div class="mt-1" style="font-size: 11px; color: black;"> Con :
 
-                                    @if($row->student_details->is_attended_conference==1) 
+                                    @if($row->student_details->is_attended_conference==1)
 
                                         <span class="label_badge_work"> yes</span>
 
                                     @else
 
                                         <span class="label_badge_no"> No</span>
 
                                     @endif
 
-                                </div>  
+                                </div>
 
                             </div>
 
                         </td>
 
                         <td style="font-size: 11px;">
 
+                            @php
 
+                                $hashids = new \Hashids\Hashids('application', 25);
 
+                            @endphp
 
                             <div class="inner_right">
 
-                                <a href="{{ url('teacher/student-proposal-details') }}/{{$row->id}}"><strong style="font-size:11px; color:black;">{{cn($row,'proposal.title','')}}</strong></a></br>
 
+                                <a href="{{ url('supervisor/application/'.$hashids->encode($row->id)) }}"><strong style="font-size:11px; color:black;">{{cn($row,'proposal.title','')}}</strong></a></br>
 
                                 <span style="color:black;">{{cn($row,'proposal.methology','')}}</span>
 
                                 @php
 
                                     $proposal =\DB::table('proposal')->where(
 
@@ -101,12 +104,12 @@
 
                                         $department =\DB::table('departments')->where(
 
                                             'id',$proposal->department
 
                                         )->first();
 
-                                    } 
+                                    }
 
                                 @endphp
 
                                 @if(isset($department))
 
                                 <span>.</span>
 
-                                <span style="color:black;"> 
-                                    {{ $department->name }} 
+                                <span style="color:black;">
 
+                                    {{ $department->name }}
 
                                 </span>
 
                                 @endif
 
                                 <span>.</span>
 
@@ -134,7 +137,7 @@
 
 
                                 @if($row->proposal_status_date)
 
                                     <br>
 
-                                    <span style="font-size:11px; font-weight: bold;"> 
+                                    <span style="font-size:11px; font-weight: bold;">
 
                                     {{utc_to_ltz($row->proposal_status_date, 'd M Y g:i A', local_tz($user))}}
 
                                 </span>

+ 1 - 1
resources/views/teacher/student_proposal_details.blade.php
View File 

@@ -1041,7 +1041,7 @@ element.style {
 
                                                                                 <a class="dropdown-item status_change hand" data-val="3" data-id="{{$proposal_details->id}}" name="proposal_status">Pause</a> <!--Push means less than 2 seconds does one thing -->
 
                                                                                 <a class="dropdown-item status_change hand" data-val="4" data-id="{{$proposal_details->id}}" name="proposal_status">Hold</a>  <!--holding it for longer does something-->
 
                                                                                 <a class="dropdown-item status_change hand" data-val="5" data-id="{{$proposal_details->id}}" name="proposal_status">Interested</a>
 
-                                                                                <a class="dropdown-item status_change hand" data-val="6" data-id="{{$proposal_details->id}}" name="proposal_status">Rejected</a>
 
+                                                                                <a class="dropdown-item open_modal_page hand" data-url="{{route('modal-get',['name'=>'proposal_status_rejected_form','id'=>$proposal_details->id])}}" data-title="Rejected" data-val="6" data-id="{{$proposal_details->id}}">Rejected</a>
 
                                                                             </div>
 
                                                                         </div>
 
                                                                     </div>

+ 1 - 1
resources/views/teacher_profile.blade.php
View File 

@@ -399,7 +399,7 @@ tbody, td, tfoot, th, thead, tr {
 
                                 @php
 
                                     $hashids = new \Hashids\Hashids('student_q_signup', 25);
 
                                 @endphp
 
-                                <div class="flag_country copy" style="display:flex; cursor:pointer;" data-clipboard-text="{{ url('student-q-form/'.$hashids->encode(auth_user('teacher')->id)) }}">
 
+                                <div class="flag_country copy" style="display:flex; cursor:pointer;" data-clipboard-text="{{ url('q-apply/'.$hashids->encode(auth_user('teacher')->id)) }}">
 
                                     <ul class="nav navbar-nav align-items-center ml-auto header_right ps-2">
 
                                         <li class="nav-item dropdown dropdown-notification">
 
                                             <a href="javascript:void(0)">

+ 3 - 3
routes/web.php
View File 

@@ -58,7 +58,7 @@ Route::get('register', [App\Http\Controllers\Auth\RegisterController::class,'sho
 
 Route::post('student-register', [App\Http\Controllers\Auth\RegisterController::class,'create'])->name('student-register');
 
 Route::get('/verify/{token}', [App\Http\Controllers\Auth\RegisterController::class,'email_verification'])->name('email-verification');
 
 
-Route::get('student-q-form/{hash}', [App\Http\Controllers\HomeController::class,'student_q_form']);
 
+Route::get('q-apply/{hash}', [App\Http\Controllers\HomeController::class,'student_q_form']);
 
 Route::get('register/{hash}', [App\Http\Controllers\HomeController::class,'q_apply_register_form']);
 
 
 Route::group(['middleware' => ['auth']], function() {
 
@@ -98,7 +98,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');
 
-    Route::get('teacher/student-proposal-details/{id}', [App\Http\Controllers\TeacherHomeController::class,'student_proposal_details']);
 
+    Route::get('supervisor/application/{hash}', [App\Http\Controllers\TeacherHomeController::class,'student_proposal_details']);
 
     Route::get('teacher_profile/application/search', [App\Http\Controllers\TeacherHomeController::class,'search']);
 
 
 
@@ -141,7 +141,7 @@ Route::get(
 
     'sub-content/{name}', [App\Http\Controllers\Admin\SubContentController::class, 'get']
 
 )->name('sub-content');
 
 
- 
+