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

resources/views/teacher_profile.blade.php

@@ -317,7 +317,7 @@ tbody, td, tfoot, th, thead, tr {
 .method{
     background-color: #2c2d4d;
     margin-top: -11px;
-    width: 24%;
+    width: 20%;
     font-size: 14px !important;
     color: #fff;
     padding-left: 9px;
@@ -377,7 +377,7 @@ tbody, td, tfoot, th, thead, tr {
                                     <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)">
-                                                <i class="fa fa-bolt change_pass_btn" style="padding: 8px 9px;"></i>
+                                                <button class="btn btn2" style="padding: 6px 10px !important; background-color: #ffad00 !important; color: #191e38 !important;">Q-Apply</button>
                                             </a>
                                         </li>
                                     </ul>
@@ -555,7 +555,7 @@ tbody, td, tfoot, th, thead, tr {
                             <div class="mb-4" style="padding:15px;">
                                 <div class="text-end">
                                     <button class="btn btncl"><i class="fa fa-refresh"></i></button>
-                                    <button class="btn btn2">Save</button>
+                                    <button class="btn btn2">search</button>
                                 </div>
                             </div>
                         </div>
@@ -570,7 +570,7 @@ tbody, td, tfoot, th, thead, tr {
                                             <th>Student Information</th>
                                             <th>Education</th>
                                             <th class="text-center">English Test</th>
-                                            <th class="text-center">work History</th>
+                                            <th class="text-center">Others</th>
                                             <th>Proposal Summary</th>
                                             <th class="text-center">Status</th>
                                         </tr>
@@ -580,14 +580,14 @@ tbody, td, tfoot, th, thead, tr {
                                         <tr>
                                             <td style="font-size: 11px;">{{$key+1}}</td>
                                             <td>
-                                                <div style="font-size: 11px; font-weight: 900; color: black;">
+                                                <div style="font-size: 12px; font-weight: 600; color: black; text-transform: capitalize;">
                                                     <span>{{cn($row,'student_details.first_name','')}} {{cn($row,'student_details.last_name','')}}</span>
                                                 </div>
                                                 <div style="font-size: 11px;">
-                                                    <a href="" class="" style="color: black;"><span class="label_badge_work"> {{$row->student_apply_ref ?? "N/A"}} </span></a>
+                                                    <a href="" class="" style="color: black;"><span>Apply Ref : {{$row->student_apply_ref ?? "N/A"}} </span></a>
                                                 </div>
                                                 <div style="font-size: 11px;">
-                                                    <span style="color: black;">@if(!empty($row->student_details->dob)){{ date("d M, Y", strtotime(cn($row,'student_details.dob','')))}} @else @endif</span>
+                                                    <span style="color: black;">Applied : @if(!empty($row->student_details->dob)){{ date("d M, Y", strtotime(cn($row,'student_details.dob','')))}} @else @endif</span>
                                                 </div>
                                             </td>
                                             <td style="font-size: 11px;">
@@ -595,46 +595,51 @@ tbody, td, tfoot, th, thead, tr {
                                                     <span style="color: black;">{{cn($row,'institutes.institution','')}}</span>
                                                 </div>
                                                 <div style="font-size: 11px;">
-                                                    <span style="color: black;">@if(!empty($row->institutes->start_date)) {{date('M Y',strtotime(cn($row,'institutes.start_date','N/A')))}} @else @endif  @if(!empty($row->institutes->end_date)) - {{date('M Y',strtotime(cn($row,'institutes.end_date','N/A')))}} @else @endif</span>
+                                                    <span style="color: black;">P Year : @if(!empty($row->institutes->start_date)) {{date('M Y',strtotime(cn($row,'institutes.start_date','N/A')))}} @else @endif  @if(!empty($row->institutes->end_date)) - {{date('M Y',strtotime(cn($row,'institutes.end_date','N/A')))}} @else @endif</span>
                                                 </div>
                                                 <div class="mt-1" style="font-size: 11px;">
                                                     <span class="label_badge_gpa">{{cn($row,'institutes.result','')}} (GPA)</span>
                                                 </div>
                                             </td>
-                                            <td style="font-size: 11px; text-align:center; color: black;">{{cn($row,'scores.test_name','N/A')}}
+                                            <td style="font-size: 11px; text-align:center; color: black;">{{cn($row,'scores.test_name','N/A')}} - {{cn($row,'scores.overall_score','')}}
                                                 <div style="font-size: 11px;">
-                                                    <span style="color: black;">{{cn($row,'scores.overall_score','')}}</span>
-                                                </div>
-                                            </td>
-                                            <td style="font-size: 11px; text-align:center;">
-                                                @php
-
-                                                    $work_history_first =$row->work_experience_date()->whereNotNull('start_date')->oldest()->first();
-
-                                                    $work_history_last =$row->work_experience_date()->latest()->first();
-                                                    if($work_history_first && $work_history_last && $work_history_last->end_date){
+                                                    <span style="color: black;">
+                                                    @php
+                                                            $work_history_first =$row->work_experience_date()->whereNotNull('start_date')->oldest()->first();
 
-                                                    $diff_in_days =diff_in_days($work_history_first->start_date,$work_history_last->end_date);
+                                                            $work_history_last =$row->work_experience_date()->latest()->first();
+                                                            if($work_history_first && $work_history_last && $work_history_last->end_date){
 
-                                                    }elseif($work_history_first){
-                                                    $diff_in_days =diff_in_days($work_history_first->start_date, now());
-                                                    }else{
-                                                    $diff_in_days =0;
-                                                    }
+                                                            $diff_in_days =diff_in_days($work_history_first->start_date,$work_history_last->end_date);
 
-                                                    $years = ($diff_in_days / 365) ;
-                                                    $years = floor($years);
-                                                    $month = ($diff_in_days % 365) / 30.5;
-                                                    $month = floor($month);
-                                                    $days = ($diff_in_days % 365) % 30.5;
-                                                  @endphp
+                                                            }elseif($work_history_first){
+                                                            $diff_in_days =diff_in_days($work_history_first->start_date, now());
+                                                            }else{
+                                                            $diff_in_days =0;
+                                                            }
 
+                                                            $years = ($diff_in_days / 365) ;
+                                                            $years = floor($years);
+                                                            $month = ($diff_in_days % 365) / 30.5;
+                                                            $month = floor($month);
+                                                            $days = ($diff_in_days % 365) % 30.5;
+                                                            @endphp
 
-                                                <div style="font-size: 11px; display:block;">
-                                                    <span class="label_badge_work">{{$years}} years</span>
+                                                            <div class="mt-1" style="font-size: 11px; display:block;">
+                                                                <span class="label_badge_work">{{$years}} years</span>
+                                                            </div>
+                                                    </span>
                                                 </div>
+                                            </td>
+                                            <td style="font-size: 11px; text-align:center;">
+                                             
                                                 <div style="font-size: 11px; display:block;">
-
+                                                        <div style="font-size: 11px; color: black;"> Pu :
+                                                            <span class="label_badge_work"> yes</span>
+                                                        </div>
+                                                        <div class="mt-1" style="font-size: 11px; color: black;"> Con :
+                                                            <span class="label_badge_work"> yes</span>
+                                                        </div>
 
                                                     {{-- ({{ dDate($work_history_first->start_date) }} - {{dDate($work_history_last->end_date, 'd M Y', 'Continue')}})  --}}
 

resources/views/web/layouts/header.blade.php

@@ -11,7 +11,7 @@
                 <div class="col md-6">
                     <div class="mt-4 pt-1" style="display:flex; justify-content: end;">
                             <!-- <i class="fa fa-user me-2" style="color:black !important; font-size: 13px; height: 25px; padding: 3.5px 5.9px; border: 2px solid black; border-radius: 100%;"></i> -->
-                                <p style="color:black; font-weight:600 !important;">Hello, {{ Auth::user()->first_name }} {{ Auth::user()->last_name }}</p>
+                                <p style="color:black; font-weight:600 !important; text-transform: capitalize;">Hello, {{ Auth::user()->first_name }} {{ Auth::user()->last_name }}</p>
                         <ul class="nav navbar-nav align-items-center ml-auto header_right ps-2">
                             <li class="nav-item dropdown dropdown-notification">
                                 <div class="dropdown tooltips click_for_notification_list_popup_header" style="float: right; margin-top: 0px;" title="Notifications" id="notification_part">