Browse Source

Issue modified

Mostafijur Rahman 1 year ago
parent
commit
c437cd7391

+ 6 - 2
resources/views/application.blade.php

@@ -44,7 +44,7 @@
                                                         <span style="font-size:10px; font-weight:400;">{{cn($row,'teacher_details.others_department','')}}</span>
                                                     @endif
                                                     <span>.</span>
-                                                    <span style="font-size:10px; font-weight:400;"> {{cn($row,'teacher_details.university_name','')}} </span>
+                                                    <span style="font-size:10px; font-weight:400;"> {{cn($row,'teacher_details.university.name','')}} </span>
                                             </div>
                                         </div>
                                     </div>
@@ -63,7 +63,11 @@
                                                         <span>.</span>
                                                         <span style="font-size:10px;">{{cn($row,'proposal.methology','')}}</span>
                                                         <span>.</span>
-                                                        <span style="font-size:10px;">{{cn($row,'proposal.department','')}}</span>
+                                                        @php
+                                                               $proposal =\DB::table('proposal')->where('id',$row->proposal_id)->first();
+                                                               $department =model('Department')::find($proposal->department);
+                                                            @endphp
+                                                        <span style="font-size:10px;">{{$department->name ?? ''}}</span>
                                                         <span>.</span>
                                                         <span style="font-size:10px;">{{cn($row,'proposal.status','')}}</span>
                                                     </div>

+ 5 - 1
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>
-                                                <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>
+                                                <span 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></span>
                                                 <!-- <button class="btn btncl"></button>  -->
                                             </div>
                                             <div id="load_data"></div>
@@ -235,6 +235,10 @@
             }
         });
 
+        $('.ref_button').on('click', function(){ 
+            $('#teacher_ref_no').val("");
+        });
+
         // function get_data(){
         //     var base = '{{url('/')}}';
         //     var teacher_ref_no = $('#teacher_ref_no').val();

+ 3 - 3
resources/views/teacher_profile.blade.php

@@ -590,7 +590,7 @@ tbody, td, tfoot, th, thead, tr {
                                                     <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;">{{cn($row,'teacher_details.ref_no','')}}<span> (Apply Ref.) </span></a>
+                                                    <a href="" class="" style="color: black;">{{cn($row,'teacher_details.ref_no','')}}<span> ({{$row->student_apply_ref}}) </span></a>
                                                 </div>
                                                 <div style="font-size: 11px;">
                                                     <span style="color: black;">{{ date("d M, Y", strtotime(cn($row,'student_details.dob','')))}}</span>
@@ -705,8 +705,8 @@ tbody, td, tfoot, th, thead, tr {
                                             <td style="font-size: 11px;">{{$key+1}}</td>
                                             <td style="font-size: 11px;">{{$row->name}}</td>
                                             <td style="font-size: 11px;">{{$row->email}}</td>
-                                            <td style="font-size: 11px;">{{date('d M Y', strtotime($row->created_at))}}</td>
-                                            <td style="font-size: 11px;">{{date('d M Y', strtotime($row->created_at))}}</td>
+                                            <td style="font-size: 11px;">{{date('d M Y h.i A', strtotime($row->created_at))}}</td>
+                                            <td style="font-size: 11px;">{{date('d M Y h.i A', strtotime($row->created_at))}}</td>
                                             <td style="font-size: 11px;">
                                                 @if($row->q_form_status==1)
                                                  Q-Apply