Mostafijur Rahman 1 year ago
parent
commit
0162f89db3

+ 7 - 3
resources/views/admin/sub_contents/load_ref_no_available_info.blade.php

@@ -5,9 +5,13 @@
     <div class="col-md-12">
         <div class="row">
             <div class="col-md-10">
-                <di style="display:flex;">
-                @if($teacher->university)
-                    <img class="img-responsive listFlag" style="border: 1px solid black;border-radius: 20px; padding: 6px;height: 37px;width: 37px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($teacher,'university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+                <div style="display:flex;"> 
+                @if($teacher->university) 
+                <img class="img-responsive listFlag" style="border-radius: 20px; padding: 0px;height: 37px;width: 37px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($teacher,'university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+                @else
+                <div class="inner_left mt-1" style="border: 1px solid black; border-radius: 20px; padding: 6px; height: 37px; width: 37px;">
+                    <i class="fa fa fa-university ms-1"></i>
+                </div>
                 @endif
                 <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span>
                 </div>

+ 8 - 5
resources/views/application.blade.php

@@ -25,12 +25,15 @@
                                 <div class="p-2" style="display:flex;">
                                     <div class="left" style="width:50%;">
                                         <div class="uni_details" style="display:flex;">
-                                            {{-- <div class="inner_left mt-1" style="border: 1px solid black; border-radius: 20px; padding: 6px; height: 37px; width: 37px;">
-                                                <i class="fa fa fa-university ms-1"></i>
-                                            </div> --}}
-
-                                            <img class="img-responsive listFlag" style="border: 1px solid black;border-radius: 20px; padding: 6px;height: 37px;width: 37px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($row,'teacher_details.university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+                                             
 
+                                            @if(cn($row,'teacher_details.university')) 
+                                            <img class="img-responsive listFlag" style="border-radius: 20px; padding: 0px;height: 37px;width: 37px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($row,'teacher_details.university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+                                            @else
+                                            <div class="inner_left mt-1" style="border: 1px solid black; border-radius: 20px; padding: 6px; height: 37px; width: 37px;">
+                                                <i class="fa fa fa-university ms-1"></i>
+                                            </div>
+                                            @endif
                                             <div class="alert" style="background-color:white; padding: 3px 7px; margin-bottom: 0px;">
                                                 <strong style="font-size:13px;">{{ cn($row,'teacher_details.first_name','')}} {{ cn($row,'teacher_details.last_name','')}}</strong></br>
                                                     <span style="font-size:10px; font-weight:400;"> {{cn($row,'teacher_details.designation','')}} </span>

+ 7 - 4
resources/views/modal_pages/apply_student_proposal.blade.php

@@ -11,9 +11,12 @@
                     <input type="hidden" name="teacher_id" value="{{$teacher->id}}">
                     <input type="hidden" name="student_id" value="{{$student->id}}">
                     <div class="d-flex">
-                        <img class="img-responsive listFlag" style="border: 1px solid black;border-radius: 20px; padding: 6px;height: 37px;width: 37px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($teacher,'university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
-                         <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
+                        @if($teacher->university) 
+                            <img class="img-responsive listFlag" style="border-radius: 20px; padding: 0px;height: 37px;width: 37px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($teacher,'university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+                        @endif
                     </div>
+                         <span style="margin: 0px;">{{$teacher->first_name}} {{$teacher->last_name}}</span></br>
+                    
                     <span class="text-muted" style="font-weight: 500;">{{$teacher->designation}}</span></br>
                     @if(isset($teacher->department_name))
                         <span class="text-muted" style="font-weight: 500;">{{cn($teacher,'department_name.name','')}}</span>
@@ -57,8 +60,8 @@
                             <select name="startdate" id="start date" class="form-control frm" required=""  style="font-size: 13px;">
                                 <option disabled="" selected="" value="">Year</option>
                                 @php
-                                    $firstYear = (int)date('Y') - 20;
-                                    $lastYear = $firstYear + 20;
+                                    $firstYear = (int)date('Y');
+                                    $lastYear = $firstYear + 1;
                                     for($i=$firstYear;$i<=$lastYear;$i++){
                                 @endphp
                                 <option value="{{$i}}">{{$i}}</option>

+ 9 - 1
resources/views/modal_pages/view_apply_proposal.blade.php

@@ -5,7 +5,15 @@
     <div class="container mt-2">
         <div class="col-md-12">
             <div class="alert p-3" style="background-color:white;"> 
-                <span style="margin: 0px;">{{cn($std_proposal,'teacher_details.first_name','')}} {{cn($std_proposal,'teacher_details.last_name','')}}</span></br>
+                <div class="d-flex">
+                    @if(cn($std_proposal,'teacher_details.university','')) 
+                        <img class="img-responsive listFlag" style="border-radius: 20px; padding: 0px;height: 37px;width: 37px;" src="{{ asset('/assets/img/flags/4x3').'/'.strtolower(cn($std_proposal,'teacher_details.university.country.iso_3166_2','')).'.svg' }}" alt="Flag" data-toggle="tooltip" title="" data-placement="top">
+                    @endif
+                
+                    <span style="margin: 0px;">{{cn($std_proposal,'teacher_details.first_name','')}} {{cn($std_proposal,'teacher_details.last_name','')}}</span>
+                </div>
+                </br>
+                
                 <span class="text-muted" style="font-weight: 500;">{{cn($std_proposal,'teacher_details.designation','')}}</span></br>
                 @if(isset($std_proposal->teacher_details->department_name))
                     <span class="text-muted" style="font-weight: 500; font-size: 10px;">{{cn($std_proposal,'teacher_details.department_name.name','')}}</span>