Browse Source

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

Shah Rakibur Rahaman 1 year ago
parent
commit
81612c9d42

BIN
public/uploads/proposal/1679901730documentfile_.pdf


+ 7 - 5
resources/views/admin/admin_profile.blade.php

@@ -788,11 +788,13 @@ tbody, td, tfoot, th, thead, tr {
                                                         <button class="btn btn2 add_department" style="margin-left: -3.4rem; border-radius: 0px 6px 6px 0px">Add</button>
                                                     </div>
                                                 </div>
-                                                <div class="left mb-2">
                                                     <div class="single_glance_row mt-5" style="border-bottom: 1px solid #e8eef1;">
-                                                        <div>
+                                                        <div style="display: flex">
+                                                        <div class="left" style="width: 80%;">
                                                             <span class="title" style="font-size:11px;">Math</span>
-                                                            <span class="title" style="font-size:11px; font-weight: 600; margin-left: 11.9rem;">
+                                                        </div>
+                                                        <div class="right" style="width: 20%;">
+                                                            <span class="title" style="font-size:11px; font-weight: 600;">
                                                                 <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
                                                                     <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo16" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-pencil"></i></button>
                                                                 </a>
@@ -800,6 +802,7 @@ tbody, td, tfoot, th, thead, tr {
                                                             <span class="title" style="font-size:11px; font-weight: 600;">
                                                                 <button type="button" class="btn btn2" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-trash"></i></button>
                                                             </span>
+                                                        </div>
                                                         </div>
                                                                 <!-- Tab -->
                                                         <div class="col-md-12">
@@ -824,8 +827,7 @@ tbody, td, tfoot, th, thead, tr {
                                                                 </div>
                                                             </div> 
                                                         </div> 
-                                                    </div>   
-                                                </div>                                 
+                                                    </div>                              
                                             </div>
                                         </div>
                                     </div>

+ 20 - 13
resources/views/application.blade.php

@@ -1,6 +1,6 @@
 @extends('web.layouts.master')
 @section('content') 
-        <section class="bg-half-170 d-table w-100" style="background-color: #efefef; height:600px; padding:154px 0px 5px;">
+        <section class="bg-half-170 d-table w-100" style="background-color: #efefef; height:100vh; padding:154px 0px 5px;">
             <div class="container">
                 <div class="row align-items-center p-3">
                     <div class="col-md-12 mt-2">
@@ -26,18 +26,19 @@
                                             <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>
-                                            <div class="alert" style="background-color:white; padding: 0px 10px;"> 
-                                                <span style="margin: 0px"></span>Mr Z</br>
-                                                <span class="text-muted" style="font-weight: 500;">designation</span></br>
-                                                <span class="text-muted" style="font-weight: 500;">department</span>
-                                                <span>.</span>
-                                                <span class="text-muted" style="font-weight: 500;">university_name</span>
+                                            <div class="alert" style="background-color:white; padding: 3px 7px;"> 
+                                                <strong style="font-size:13px;">Mr Z</strong></br>
+                                                    <span style="font-size:10px; font-weight:400;"> designation </span>
+                                                    <span>.</span>
+                                                    <span style="font-size:10px; font-weight:400;"> department </span>
+                                                    <span>.</span>
+                                                    <span style="font-size:10px; font-weight:400;"> university-name </span>
                                             </div>
                                         </div>
                                     </div>
                                     <div class="text-end" style="width:50%;">
-                                        <span style="font-size:11px;">Proposed Start Date</span><br>
-                                        <h6 style="font-size:11px !important; font-weight:800;">Mar 9</h6>
+                                        <span style="font-size:11px;">Apply Reference</span><br>
+                                        <span class="label_badge_radius" style="font-size:11px !important; font-weight:800;">23302</span>
                                     </div>
                                 </div>  
                                 <div class="p-3" style="display:flex; border-width: 0px 0px 0.5px; border-top-style: dashed; border-top-color: #eee; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom-style: dashed; border-bottom-color: #eee;">
@@ -45,7 +46,7 @@
                                         <div class="uni_details" style="display:flex;">
                                             <div class="inner_right ms-5">
                                                 <strong style="font-size:13px;">Title</strong></br>
-                                                    <div style="margin-top: -11px; display: block;">
+                                                    <div style="margin-top: -8px;">
                                                         <span style="font-size:10px;">methology</span>
                                                         <span>.</span>
                                                         <span style="font-size:10px;">department</span> 
@@ -57,14 +58,20 @@
                                     </div>
                                 </div>                                  
                                 <div class="p-3" style="display:flex; border-width: 0px 0px 0.5px; border-top-style: dashed; border-top-color: #eee; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom-style: dashed; border-bottom-color: #eee;">
-                                    <div class="left" style="width:50%;"> 
+                                    <div class="left" style="width:50%;">
+                                        <div class="uni_details" style="display:flex;">
+                                            <div class="inner_right ms-5">
+                                                <span style="font-size:11px;">Start Date : Sep 2010</span><br>
+                                            </div>
+                                        </div>
                                     </div>
                                     <div class="text-end" style="width:50%;">
-                                        <span style="font-size:11px;">Application Status</span><br>
+                                        <span style="font-size:11px;">Application Status </span><br>
+                                        <span class="label_badge_radius" style="background-color: #d8fdd8; color: green;">Applied</span>
                                         <h6 style="font-size:11px !important; font-weight:800;"></h6>
                                     </div>
                                 </div>  
-                            </div>
+                            </div> 
                         </div>
                     </div> 
                 </div>

+ 19 - 16
resources/views/modal_pages/apply_student_proposal.blade.php

@@ -5,23 +5,25 @@
     {{ csrf_field() }}
     <div class="container">
         <div class="col-md-12">
-            <p class="mb-3" style="font-size: 16px; font-weight: bold;">This proposal will be sent to the following supervisor</p>
-            <div class="alert p-3" style="background-color:white;">
-                <input type="hidden" name="teacher_id" value="{{$teacher->id}}">
-                <input type="hidden" name="student_id" value="{{$student->id}}">
-                <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>
-                @else
-                    <span class="text-muted" style="font-weight: 500;">{{$teacher->others_department}}</span>
-                @endif
-                <span>.</span>
-                <span class="text-muted" style="font-weight: 500;">{{$teacher->university_name}}</span>
+            <div class="middle p-3" style="background-color:white; border-radius:6px;">
+                <p style="font-size: 16px; font-weight: bold; margin: 0px;">This proposal will be sent to the following supervisor</p>
+                <div class="alert" style="padding: 0px; margin: 0px">
+                    <input type="hidden" name="teacher_id" value="{{$teacher->id}}">
+                    <input type="hidden" name="student_id" value="{{$student->id}}">
+                    <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>
+                    @else
+                        <span class="text-muted" style="font-weight: 500;">{{$teacher->others_department}}</span>
+                    @endif
+                    <span>.</span>
+                    <span class="text-muted" style="font-weight: 500;">{{$teacher->university_name}}</span>
+                </div>
             </div>
         </div>
 
-        <div class="middle p-3" style="background-color:white; border-radius:6px;">
+        <div class="middle p-3 mt-3" style="background-color:white; border-radius:6px;">
             <p style="font-size: 16px; font-weight: bold; margin-bottom: 0px !important;">Please select which proposal you want to send</p>
             <div class="alert mb-3 propose" style="padding: 0px; margin-bottom: 0px">
                 <div style="width:100%;">
@@ -29,8 +31,9 @@
                     <div class="p-2" style="border-bottom: 2px solid #eee;">
                         <div class="custom-control custom-radio custom-control-inline">
                             <div class="form-check mb-0">
-                                <input class="form-check-input" type="radio" name="proposal_id" value="{{$row->id}}" id="flexRadioDefault1">
-                                <label class="form-check-label" for="flexRadioDefault1" style="font-weight: 400 !important; font-size: 13px;">({{ $row->proposal_ref}})-{{$row->title}}</label>
+                                <input class="form-check-input mt-2" type="radio" name="proposal_id" value="{{$row->id}}" id="flexRadioDefault1">
+                                <label class="form-check-label" for="flexRadioDefault1" style="font-weight: 400 !important; font-size: 13px;">{{$row->title}}</label></br>
+                                <span class="label_badge_radius" style="background-image: linear-gradient(90deg,rgba(46,17,83,.19),#f5f4fd); font-weight: 400 !important; font-size: 10px;">Ref. ({{ $row->proposal_ref}})</span>
                             </div>
                         </div>
                     </div>

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

@@ -47,7 +47,7 @@
                 <div class="col-md-5">
                     <div class="p-2 ms-2"> 
                         <div class="form-icon position-relative ms-1" style="font-size: 13px;">
-                            Start Year : {{date("M", mktime(0, 0, 0, $std_proposal->start_month, 10))}} {{ $std_proposal->start_year}}
+                            Start Date : {{date("M", mktime(0, 0, 0, $std_proposal->start_month, 10))}} {{ $std_proposal->start_year}}
                         </div>
                     </div>
                 </div>

+ 3 - 3
resources/views/modal_pages/view_student_proposal.blade.php

@@ -2,10 +2,10 @@
 
 @section('main')
  
-    @foreach($proposal as $row)
+    <!-- @foreach($proposal as $row)
         {{ $row->title}}
-    @endforeach
- 
+    @endforeach -->
+    <embed src="web/files/CRM.pdf" type="application/pdf" width="100%" height="560px"/>
 
 <script>
     $(function(){

+ 100 - 100
resources/views/profile.blade.php

@@ -655,8 +655,8 @@
                                                             </div>
                                                         </div>
                                                         <div class="col-md-12 mt-2">
-                                                                <div id="demo1" class="collapse">
-                                                                    <div class="panel-body" style="padding:10px; background-color: #16183f69;  border: 1px solid #e9e5e5; border-radius: 5px;">
+                                                            <div id="demo1" class="collapse">
+                                                                <div class="panel-body" style="padding:10px; background-color: #16183f69;  border: 1px solid #e9e5e5; border-radius: 5px;">
                                                                     <form method="POST" action="{{ route('work-save') }}">
                                                                             @csrf
                                                                         <div class="row">
@@ -676,118 +676,118 @@
                                                                                     </div>
                                                                                 </div>
                                                                             </div>
-                                                                            <div class="col-md-3 mt-4" style="display:flex; font-size:15px; font-weight:600;">
-                                                                                    Currently working in that company?
-                                                                                <div class="form-check form-switch" id="checkCurrentlyWorking" style="margin-left: 7px; margin-top: 14px;">
-                                                                                        <input class="form-check-input" type="checkbox" name="currentlyworking" value="0" onchange="checkCurrentlyWorking(this)">
-                                                                                        <label class="form-check-label" for="checkCurrentlyWorking"></label>
-                                                                                </div>
-                                                                            </div>
-                                                                                <div class="col-md-3">
-                                                                                        <div class="row">
-                                                                                            <div class="col-md-6">
-                                                                                                <div class="mb-1">
-                                                                                                        <label class="form-label">Start Date <span class="text-danger">*</span></label>
-                                                                                                    <div class="form-icon position-relative">
-                                                                                                        <select name="startdate" id="start date" class="form-control frm" required="">
-                                                                                                            <option disabled="" selected="" value="">Year</option>
-                                                                                                            @php
-                                                                                                                $firstYear = (int)date('Y') - 20;
-                                                                                                                $lastYear = $firstYear + 20;
-                                                                                                                for($i=$firstYear;$i<=$lastYear;$i++){
-                                                                                                            @endphp
-                                                                                                            <option value="{{$i}}">{{$i}}</option>
-                                                                                                            @php
-                                                                                                                }
-                                                                                                            @endphp
+                                                                            <div class="col-md-3">
+                                                                                <div class="row">
+                                                                                    <div class="col-md-6">
+                                                                                        <div class="mb-1">
+                                                                                                <label class="form-label">Start Date <span class="text-danger">*</span></label>
+                                                                                            <div class="form-icon position-relative">
+                                                                                                <select name="startdate" id="start date" class="form-control frm" required="">
+                                                                                                    <option disabled="" selected="" value="">Year</option>
+                                                                                                    @php
+                                                                                                        $firstYear = (int)date('Y') - 20;
+                                                                                                        $lastYear = $firstYear + 20;
+                                                                                                        for($i=$firstYear;$i<=$lastYear;$i++){
+                                                                                                    @endphp
+                                                                                                    <option value="{{$i}}">{{$i}}</option>
+                                                                                                    @php
+                                                                                                        }
+                                                                                                    @endphp
 
-                                                                                                        </select>
-                                                                                                    </div>
-                                                                                                </div>
+                                                                                                </select>
                                                                                             </div>
-                                                                                            <div class="col-md-6">
-                                                                                                <div class="mb-1 mt-2">
-                                                                                                        <label class="form-label"></label>
-                                                                                                    <div class="form-icon position-relative">
-                                                                                                        <select name="startmonth" id="month" class="form-control frm" required="">
-                                                                                                            <option disabled="" selected="" value="">Month</option>
-                                                                                                            <option value="01">January</option>
-                                                                                                            <option value="02">February</option>
-                                                                                                            <option value="03">March</option>
-                                                                                                            <option value="04">April</option>
-                                                                                                            <option value="05">May</option>
-                                                                                                            <option value="06">June</option>
-                                                                                                            <option value="07">July</option>
-                                                                                                            <option value="08">August</option>
-                                                                                                            <option value="09">September</option>
-                                                                                                            <option value="10">October</option>
-                                                                                                            <option value="11">November</option>
-                                                                                                            <option value="12">December</option>
-                                                                                                        </select>
-                                                                                                    </div>
-                                                                                                </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                    <div class="col-md-6">
+                                                                                        <div class="mb-1 mt-2">
+                                                                                                <label class="form-label"></label>
+                                                                                            <div class="form-icon position-relative">
+                                                                                                <select name="startmonth" id="month" class="form-control frm" required="">
+                                                                                                    <option disabled="" selected="" value="">Month</option>
+                                                                                                    <option value="01">January</option>
+                                                                                                    <option value="02">February</option>
+                                                                                                    <option value="03">March</option>
+                                                                                                    <option value="04">April</option>
+                                                                                                    <option value="05">May</option>
+                                                                                                    <option value="06">June</option>
+                                                                                                    <option value="07">July</option>
+                                                                                                    <option value="08">August</option>
+                                                                                                    <option value="09">September</option>
+                                                                                                    <option value="10">October</option>
+                                                                                                    <option value="11">November</option>
+                                                                                                    <option value="12">December</option>
+                                                                                                </select>
                                                                                             </div>
                                                                                         </div>
                                                                                     </div>
-                                                                                    <div class="col-md-3" id="end_date_div">
-                                                                                        <div class="row">
-                                                                                            <div class="col-md-6">
-                                                                                                <div class="mb-1">
-                                                                                                        <label class="form-label">End Date <span class="text-danger">*</span></label>
-                                                                                                    <div class="form-icon position-relative">
-                                                                                                        <select name="enddate" id="end date" class="form-control frm">
-                                                                                                            <option disabled="" selected="" value="">Year</option>
-                                                                                                            @php
-                                                                                                                $firstYear = (int)date('Y') - 20;
-                                                                                                                $lastYear = $firstYear + 20;
-                                                                                                                for($i=$firstYear;$i<=$lastYear;$i++){
-                                                                                                            @endphp
-                                                                                                            <option value="{{$i}}">{{$i}}</option>
-                                                                                                            @php
-                                                                                                                }
-                                                                                                            @endphp
+                                                                                </div>
+                                                                            </div>
+                                                                            <div class="col-md-3 mt-4 pt-2" style="display:flex; font-size:13px; font-weight:600; color: white;">
+                                                                                Currently working in that company?
+                                                                                <div class="form-check form-switch" id="checkCurrentlyWorking" style="margin-top: 14px;">
+                                                                                    <input class="form-check-input" type="checkbox" name="currentlyworking" value="0" onchange="checkCurrentlyWorking(this)">
+                                                                                    <label class="form-check-label" for="checkCurrentlyWorking"></label>
+                                                                                </div>
+                                                                            </div>
+                                                                            <div class="col-md-3" id="end_date_div">
+                                                                                <div class="row">
+                                                                                    <div class="col-md-6">
+                                                                                        <div class="mb-1">
+                                                                                                <label class="form-label">End Date <span class="text-danger">*</span></label>
+                                                                                            <div class="form-icon position-relative">
+                                                                                                <select name="enddate" id="end date" class="form-control frm">
+                                                                                                    <option disabled="" selected="" value="">Year</option>
+                                                                                                    @php
+                                                                                                        $firstYear = (int)date('Y') - 20;
+                                                                                                        $lastYear = $firstYear + 20;
+                                                                                                        for($i=$firstYear;$i<=$lastYear;$i++){
+                                                                                                    @endphp
+                                                                                                    <option value="{{$i}}">{{$i}}</option>
+                                                                                                    @php
+                                                                                                        }
+                                                                                                    @endphp
 
-                                                                                                        </select>
-                                                                                                    </div>
-                                                                                                </div>
+                                                                                                </select>
                                                                                             </div>
-                                                                                            <div class="col-md-6">
-                                                                                                <div class="mb-1 mt-2">
-                                                                                                        <label class="form-label"></label>
-                                                                                                    <div class="form-icon position-relative">
-                                                                                                        <select name="endmonth" id="month" class="form-control frm">
-                                                                                                            <option disabled="" selected="" value="">Month</option>
-                                                                                                            <option value="01">January</option>
-                                                                                                            <option value="02">February</option>
-                                                                                                            <option value="03">March</option>
-                                                                                                            <option value="04">April</option>
-                                                                                                            <option value="05">May</option>
-                                                                                                            <option value="06">June</option>
-                                                                                                            <option value="07">July</option>
-                                                                                                            <option value="08">August</option>
-                                                                                                            <option value="09">September</option>
-                                                                                                            <option value="10">October</option>
-                                                                                                            <option value="11">November</option>
-                                                                                                            <option value="12">December</option>
-                                                                                                        </select>
-                                                                                                    </div>
-                                                                                                </div>
+                                                                                        </div>
+                                                                                    </div>
+                                                                                    <div class="col-md-6">
+                                                                                        <div class="mb-1 mt-2">
+                                                                                                <label class="form-label"></label>
+                                                                                            <div class="form-icon position-relative">
+                                                                                                <select name="endmonth" id="month" class="form-control frm">
+                                                                                                    <option disabled="" selected="" value="">Month</option>
+                                                                                                    <option value="01">January</option>
+                                                                                                    <option value="02">February</option>
+                                                                                                    <option value="03">March</option>
+                                                                                                    <option value="04">April</option>
+                                                                                                    <option value="05">May</option>
+                                                                                                    <option value="06">June</option>
+                                                                                                    <option value="07">July</option>
+                                                                                                    <option value="08">August</option>
+                                                                                                    <option value="09">September</option>
+                                                                                                    <option value="10">October</option>
+                                                                                                    <option value="11">November</option>
+                                                                                                    <option value="12">December</option>
+                                                                                                </select>
                                                                                             </div>
                                                                                         </div>
                                                                                     </div>
+                                                                                </div>
                                                                             </div>
-                                                                            <div class="col-md-12">
-                                                                                <div class="mt-2">
-                                                                                    <div class="text-end">
-                                                                                        <button class="btn btncl"><i class="fa fa-refresh"></i></button> 
-                                                                                        <button class="btn btn2" type="submit">Save</button>                                                                                                              
-                                                                                    </div>
+                                                                        </div>
+                                                                        <div class="col-md-12">
+                                                                            <div class="mt-2">
+                                                                                <div class="text-end">
+                                                                                    <button class="btn btncl"><i class="fa fa-refresh"></i></button> 
+                                                                                    <button class="btn btn2" type="submit">Save</button>                                                                                                              
                                                                                 </div>
-                                                                            </div>  
+                                                                            </div>
+                                                                        </div>  
                                                                     </form>
-                                                                    </div>
                                                                 </div>
                                                             </div>
+                                                        </div>
                                                         <div class="table-responsive mt-2">
                                                         @if(count($work_experience)>0)
                                                             <table class="table table-bordered list_table" style="margin-bottom: 10px;">
@@ -968,7 +968,7 @@
                                                 <div class="row align-items-center mt-4">
                                                         <div class="col-md-12" style="background: rgb(255, 255, 255);border-radius: 0.25rem;">
                                                             <div class="education">
-                                                                <i class="fa fa-align-center" style="padding: 7px;"></i>ENGLISH TEST
+                                                                <i class="fa fa-align-center" style="padding: 7px;"></i>ENGLISH LANGUAGE PROFICIENCY
                                                             </div>
                                                             <div class="row">
                                                                 <div class="col-md-6 mt-2">

+ 51 - 41
resources/views/teacher_profile.blade.php

@@ -391,7 +391,7 @@ tbody, td, tfoot, th, thead, tr {
                                     </li><!--end nav item-->
                                     
                                     <li class="nav-item">
-                                        <a class="nav-link" id="dentalcare" data-bs-toggle="pill" href="#dental" role="tab" aria-controls="dental" aria-selected="false">
+                                        <a class="nav-link" id="application" data-bs-toggle="pill" href="#applicate" role="tab" aria-controls="dental" aria-selected="false">
                                             <div class="text-start py-1 px-2" style="display:flex;">
                                             <i class="fa fa-graduation-cap ms-3" style="font-size: 11px; margin-top: 3px;"></i>
                                                 <h6 class="mb-0" style="margin-left: 6px; font-size: 13px !important;">Application</h6>
@@ -459,7 +459,7 @@ tbody, td, tfoot, th, thead, tr {
                         </div>
                     </div><!--end teb pane-->
 
-                    <div class="tab-pane fade show p-2 rounded" id="dental" role="tabpanel" aria-labelledby="dentalcare">
+                    <div class="tab-pane fade show p-2 rounded" id="applicate" role="tabpanel" aria-labelledby="application">
                         <form method="POST" action="" style="padding: 10px; background-color: #16183f69; border-radius: 5px 5px 0px 0px;">
                             <div class="row">
                                 <div class="col-md-3">
@@ -529,30 +529,30 @@ tbody, td, tfoot, th, thead, tr {
                                         <tr>
                                             <td style="font-size: 11px;">{{$key+1}}</td>
                                             <td>
-                                                <div style="font-size: 11px; font-weight: 900; display:block;">
+                                                <div style="font-size: 11px; font-weight: 900; color: black;">
                                                     <span>{{cn($row,'student_details.first_name','')}} {{cn($row,'student_details.last_name','')}}</span>
                                                 </div>
-                                                <div style="font-size: 11px; font-weight: 600; display:block;">
-                                                    <a href="" class="">{{cn($row,'teacher_details.ref_no','')}}<span style="color:#626262 !important;">(Apply Ref.)</span></a>
+                                                <div style="font-size: 11px;">
+                                                    <a href="" class="" style="color: black;">{{cn($row,'teacher_details.ref_no','')}}<span> (Apply Ref.) </span></a>
                                                 </div>
-                                                <div style="font-size: 11px; font-weight: 600; display:block;">
-                                                    <span>{{ date("d M, Y", strtotime(cn($row,'student_details.dob','')))}}</span>
+                                                <div style="font-size: 11px;">
+                                                    <span style="color: black;">{{ date("d M, Y", strtotime(cn($row,'student_details.dob','')))}}</span>
                                                 </div>
                                             </td>
                                             <td style="font-size: 11px;">
                                                 <div style="font-size: 11px; font-weight: 600; display:block;">
-                                                    <span>{{cn($row,'institutes.institution','')}}</span>
+                                                    <span style="color: black;">{{cn($row,'institutes.institution','')}}</span>
                                                 </div>
-                                                <div style="font-size: 11px; font-weight: 600; display:block;">
-                                                    <span>{{date('M Y',strtotime(cn($row,'institutes.start_date','')))}} - {{date('M Y',strtotime(cn($row,'institutes.end_date','')))}}</span>
+                                                <div style="font-size: 11px;">
+                                                    <span style="color: black;">{{date('M Y',strtotime(cn($row,'institutes.start_date','')))}} - {{date('M Y',strtotime(cn($row,'institutes.end_date','')))}}</span>
                                                 </div>
-                                                <div class="mt-1" style="font-size: 11px; display:block;">
+                                                <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; font-weight: 600; text-align:center;">{{cn($row,'scores.test_name','')}}
+                                            <td style="font-size: 11px; text-align:center; color: black;">{{cn($row,'scores.test_name','')}}
                                                 <div style="font-size: 11px;">
-                                                    <span>{{cn($row,'scores.overall_score','')}}</span>
+                                                    <span style="color: black;">{{cn($row,'scores.overall_score','')}}</span>
                                                 </div>
                                             </td>
                                             <td style="font-size: 11px; text-align:center;">
@@ -566,7 +566,7 @@ tbody, td, tfoot, th, thead, tr {
                                                     @endphp
                                                     {{--<span class="label_badge_work">@if($years) {{$years}} years @endif</span>--}}
                                                 </div>
-                                                <div style="font-size: 11px; font-weight: 600; display:block;">
+                                                <div style="font-size: 11px; display:block;">
                                                      @if(empty($row->work_experience->end_date))
                                                     {{--<span>{{date('M Y', strtotime($row->work_experience->start_date))}} - continue</span>--}}
                                                     @endif 
@@ -574,12 +574,12 @@ tbody, td, tfoot, th, thead, tr {
                                             </td>
                                             <td style="font-size: 11px;">
                                                 <div class="inner_right">
-                                                    <a href="{{ url('title') }}"><strong style="font-size:11px; color:#6e6b7b;">{{cn($row,'proposal.title','')}}</strong></a></br>
-                                                    <span>{{cn($row,'proposal.methology','')}}</span>
+                                                    <a href="{{ url('title') }}"><strong style="font-size:11px; color:black;">{{cn($row,'proposal.title','')}}</strong></a></br>
+                                                    <span style="color:black;">{{cn($row,'proposal.methology','')}}</span>
                                                     <span>.</span>
-                                                    <span>{{cn($row,'proposal.department','')}}</span>
+                                                    <span style="color:black;">{{cn($row,'proposal.department','')}}</span>
                                                     <span>.</span>
-                                                    <span>{{cn($row,'proposal.status','')}}</span>
+                                                    <span style="color:black;">{{cn($row,'proposal.status','')}}</span>
                                                 </div>
                                             </td>
                                             <td style="font-size: 11px; text-align:center;">
@@ -863,12 +863,18 @@ tbody, td, tfoot, th, thead, tr {
                                     <div class="col-md-4 bg-white rounded p-2 ms-2" style="width: 32.4%;">
                                         <div class="row">
                                             <div class="col-md-12 mt-2">
-                                                    <span class="title p-2" style="margin-bottom: 0px !important; font-weight:bold !important;">Profile</span>
-                                                        <span class="title" style="font-size:11px; font-weight: 600;">
-                                                            <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
-                                                                <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo16" style="padding: 2px 5px !important; font-size: 11px; margin-left:18rem;"><i class="fa fa-pencil"></i></button>
-                                                            </a>
-                                                        </span>
+                                                    <div style="display: flex;">
+                                                        <div class="left" style="width: 90%;">
+                                                            <span class="title p-2" style="margin-bottom: 0px !important; font-weight:bold !important;">Profile</span>
+                                                        </div>
+                                                        <div class="right" style="width: 10%;">
+                                                            <span class="title" style="font-size:11px; font-weight: 600;">
+                                                                <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
+                                                                    <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo16" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-pencil"></i></button>
+                                                                </a>
+                                                            </span>
+                                                        </div>
+                                                    </div>
                                                     <div class="single_glance_row mt-5" style="border-bottom: 1px solid #e8eef1;">
                                                         <div class="col-md-12">
                                                             <div id="demo16" class="collapse mt-2">
@@ -954,7 +960,7 @@ tbody, td, tfoot, th, thead, tr {
                                     <div class="col-md-2 bg-white rounded p-2 ms-4" style="width:25%;">
                                         <div class="row">
                                             <div class="col-md-12">
-                                                    <h6 style="padding: 13px 10px 0px; margin-bottom: 0px;">Research Interest</h6>
+                                                <h6 style="padding: 13px 10px 0px; margin-bottom: 0px;">Research Interest</h6>
                                                 <div class="col-md-12 mt-2">
                                                     <div class="mb-2">
                                                         <div class="form-icon position-relative p-2" style="display: flex;">
@@ -962,17 +968,20 @@ tbody, td, tfoot, th, thead, tr {
                                                             <button class="btn btn2" style="margin-left: -3.4rem; border-radius: 0px 6px 6px 0px">Add</button>
                                                         </div>
                                                     </div>
-                                                    <div class="left mb-2">
-                                                        <div class="single_glance_row mt-4">
-                                                        <div>
-                                                            <span class="title" style="font-size:11px;">Business 1</span>
-                                                            <span class="title" style="font-size:11px; margin-left: 11.4rem;">
-                                                                <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
-                                                                    <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo17" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-pencil"></i></button>
-                                                                </a>
-                                                            </span>
+                                                    <div class="single_glance_row mt-4">
+                                                        <div style="display: flex;">
+                                                            <div class="left" style="width: 90%;">
+                                                                <span class="title" style="font-size:11px;">Business 1</span>
+                                                            </div>
+                                                            <div class="right" style="width: 10%;">
+                                                                <span class="title" style="font-size:11px;">
+                                                                    <a role="button" data-bs-toggle="collapse" data-bs-parent="#collapse" href="#collapse1" aria-expanded="true" aria-controls="collapse1">
+                                                                        <button type="button" class="btn btn2" data-toggle="collapse" data-target="#demo17" style="padding: 2px 5px !important; font-size: 11px;"><i class="fa fa-pencil"></i></button>
+                                                                    </a>
+                                                                </span>
+                                                            </div>
                                                         </div>
-                                                            <div class="col-md-12">
+                                                        <div class="col-md-12">
                                                             <div id="demo17" class="collapse mt-2">
                                                                 <div class="panel-body" style="padding:10px; background-color: #4b4c6824; border: 1px solid #e9e5e5; border-radius: 5px;">
                                                                     <form method="POST" action="">
@@ -989,18 +998,19 @@ tbody, td, tfoot, th, thead, tr {
                                                                                 <div class="text-end">
                                                                                     <button class="btn btn2">Update</button>                                                                                                                
                                                                                 </div>
-                                                                            </div> 
+                                                                            </div>
+                                                                        </div> 
                                                                     </form>
                                                                 </div>
                                                             </div> 
                                                         </div> 
-                                                        </div>                                    
-                                                    </div> 
-                                                </div>
+                                                    </div>                                    
+                                                </div> 
                                             </div>
                                         </div>
-                                    </div><!--end col-->
-                                </div>
+                                    </div>
+                                </div><!--end col-->
+                            </div>
                         </div>
                     </div><!--end teb pane-->
                 </div><!--end tab content-->