diff --git a/Apollo/assets/views/student/studentView.html b/Apollo/assets/views/student/studentView.html
index 75173994..74f48509 100644
--- a/Apollo/assets/views/student/studentView.html
+++ b/Apollo/assets/views/student/studentView.html
@@ -1,4 +1,35 @@
 <style>
+    .modal-backdrop {
+        background-color: #000;
+        bottom: 0;
+        position: fixed;
+    }
+    .modal-backdrop.in {
+        opacity: 0.4;
+    }
+
+    .modal-backdrop {
+        z-index: 9998 !important;
+    }
+
+    .modal {
+        z-index: 9999 !important;
+    }
+
+    .modal-content {
+        background: #ffffff;
+        box-shadow: none;
+        width: 80%;
+        margin-left: 30%;
+        margin-top: 10%;
+    }
+
+    .modal-footer, .modal-header {
+        border-color: #b5b5b5;
+    }
+    .fa {
+        color:#0095C8;
+    }
     a {
         color: #5b5b60;
     }
@@ -139,161 +170,234 @@
 
         </div>
    <!-- <pre>{{courseDetails | json}}</pre>-->
-    <div class="row" ng-repeat="course in courseDetails">
+    <div class="row" ng-repeat="course in courseDetails.courseStatus">
         <div class="col-md-12">
             <div class="panel panel-white" id="panel2">
-                <div class="panel-heading">
-                    <h4 class="panel-title text-orange">{{course.UniversityName}} - {{course.CourseName}}</h4>
+                <div class="panel-heading ">
+                    <h4 class="panel-title text-orange">{{course.UniversityName}} / {{course.CourseName}}</h4>
                     <ct-paneltool class="panel-tools" tool-collapse="tool-collapse"></ct-paneltool>
                 </div>
-                <div collapse="panel2" ng-init="panel2=true" class="panel-wrapper">
-                    <div class="panel-body no-padding">
-                        <!--<div class="padding-10">
-                            <img src="assets/images/avatar-1.jpg" class="img-circle pull-left" alt="" width="50" height="50">
-                            <h4 class="no-margin inline-block padding-5">Peter Clark <span class="block text-small text-left">UI Designer</span></h4>
-                            <div class="pull-right padding-15">
-                                <span class="text-small text-bold text-green"><i class="fa fa-dot-circle-o"></i> on-line</span>
-                            </div>
-                        </div>-->
-                        <!--<div class="clearfix padding-5 space5">
-                            <div class="col-xs-4 text-center no-padding">
-                                <div class="border-right border-dark">
-                                    <a class="text-dark" href="#">
-                                        <i class="fa fa-heart-o text-red"></i> 250
-                                    </a>
-                                </div>
-                            </div>
-                            <div class="col-xs-4 text-center no-padding">
-                                <div class="border-right border-dark">
-                                    <a class="text-dark" href="#">
-                                        <i class="fa fa-bookmark-o text-green"></i> 20
-                                    </a>
-                                </div>
-                            </div>
-                            <div class="col-xs-4 text-center no-padding">
-                                <a class="text-dark" href="#"><i class="fa fa-comment-o text-azure"></i> 544</a>
-                            </div>
-                        </div>-->
-                        <div class="tabbable no-padding no-margin ng-isolate-scope">
-                            <ul class="nav nav-tabs" ng-class="{'nav-stacked': vertical, 'nav-justified': justified}" ng-transclude="">
-                                <li ng-class="[{active: active, disabled: disabled}, classes]" class="padding-top-5 padding-left-5 uib-tab nav-item ng-scope ng-isolate-scope active" heading="Followers" style="">
-                                    <a href="" ng-click="select($event)" class="nav-link ng-binding" uib-tab-heading-transclude="">Fees Details</a>
-                                </li>
-                                <li ng-class="[{active: active, disabled: disabled}, classes]" class="padding-top-5 uib-tab nav-item ng-scope ng-isolate-scope" heading="Following" style="">
-                                    <a href="" ng-click="select($event)" class="nav-link ng-binding" uib-tab-heading-transclude="">Application Details</a>
-                                </li>
-                            </ul>
-                            <div class="tab-content">
-                                <!-- ngRepeat: tab in tabset.tabs --><div class="tab-pane ng-scope active" ng-class="{active: tabset.active === tab.index}" uib-tab-content-transclude="tab" style="">
 
-                                <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468"><div ng-transclude="">
-                                    <table class="table no-margin ng-scope">
+
+
+                <div collapse="panel2" ng-init="panel2=true" class="panel-wrapper">
+                    <div class="panel-body">
+
+                        <tabset class="tabbable">
+
+                            <tab heading="Application Details" id="application">
+                                <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
+                                    <div ng-if="course.applicationDetails==false">
+                                        <center>
+                                            <h5 class="text-dark">No Application Details!</h5>
+                                        </center>
+                                    </div>
+                                    <table class="table no-margin ng-scope" ng-if="course.applicationDetails!=false">
                                         <thead>
                                         <tr>
-                                            <th>Fees Name</th>
-                                            <th>Course Fees</th>
-                                            <th>Paid Amount</th>
-                                            <th>Activity</th>
-                                            <th>Followup On</th>
+                                            <th>Type</th>
                                             <th>Status</th>
+                                            <th>Comments</th>
 
                                         </tr>
                                         </thead>
                                         <tbody>
-                                        <tr>
-                                            <td class="center"><img alt="image" class="img-circle" src="assets/images/avatar-1-small.jpg"></td>
-                                            <td><span class="text-small block text-light">UI Designer</span><span>Peter Clark</span></td>
-                                            <td class="center">
-                                                <div class="cl-effect-13">
-                                                    <a href="">
-                                                        view more
-                                                    </a>
-                                                </div></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="center"><img alt="image" class="img-circle" src="assets/images/avatar-2-small.jpg"></td>
-                                            <td><span class="text-small block text-light">Content Designer</span><span>Nicole Bell</span></td>
-                                            <td class="center">
-                                                <div class="cl-effect-13">
-                                                    <a href="">
-                                                        view more
-                                                    </a>
-                                                </div></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="center"><img alt="image" class="img-circle" src="assets/images/avatar-3-small.jpg"></td>
-                                            <td><span class="text-small block text-light">Visual Designer</span><span>Steven Thompson</span></td>
-                                            <td class="center">
-                                                <div class="cl-effect-13">
-                                                    <a href="">
-                                                        view more
-                                                    </a>
-                                                </div></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="center"><img alt="image" class="img-circle" src="assets/images/avatar-5-small.jpg"></td>
-                                            <td><span class="text-small block text-light">Senior Designer</span><span>Kenneth Ross</span></td>
-                                            <td class="center">
-                                                <div class="cl-effect-13">
-                                                    <a href="">
-                                                        view more
-                                                    </a>
-                                                </div></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="center"><img alt="image" class="img-circle" src="assets/images/avatar-4-small.jpg"></td>
-                                            <td><span class="text-small block text-light">Web Editor</span><span>Ella Patterson</span></td>
-                                            <td class="center">
-                                                <div class="cl-effect-13">
-                                                    <a href="">
-                                                        view more
-                                                    </a>
-                                                </div></td>
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                </div><div class="ps-scrollbar-x-rail" style="left: 0px; bottom: -64px;"><div class="ps-scrollbar-x" tabindex="0" style="left: 0px; width: 0px;"></div></div><div class="ps-scrollbar-y-rail" style="top: 67px; height: 200px; right: 3px;"><div class="ps-scrollbar-y" tabindex="0" style="top: 51px; height: 149px;"></div></div></div>
-                            </div><!-- end ngRepeat: tab in tabset.tabs --><div class="tab-pane ng-scope" ng-repeat="tab in tabset.tabs" ng-class="{active: tabset.active === tab.index}" uib-tab-content-transclude="tab" style="">
+                                        <tr ng-repeat="apps in course.applicationDetails">
+                                            <td>
+                                                <span>{{apps.Sem_Year}}</span>
+                                            </td>
+                                            <td>
+                                                <span>{{apps.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{cert.AppDate}}</span>
+                                            </td>
+                                            <td>
+                                                <span>{{apps.Comments}}</span>
+                                            </td>
+
 
-                                <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="03366876-2a93-ee2e-b05e-d274b2bf5cdd"><div ng-transclude="">
-                                    <table class="table no-margin ng-scope">
-                                        <tbody>
-                                        <tr>
-                                            <td class="center"><img alt="image" class="img-circle" src="assets/images/avatar-3-small.jpg"></td>
-                                            <td><span class="text-small block text-light">Visual Designer</span><span>Steven Thompson</span></td>
-                                            <td class="center">
-                                                <div class="cl-effect-13">
-                                                    <a href="">
-                                                        view more
-                                                    </a>
-                                                </div></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="center"><img alt="image" class="img-circle" src="assets/images/avatar-5-small.jpg"></td>
-                                            <td><span class="text-small block text-light">Senior Designer</span><span>Kenneth Ross</span></td>
-                                            <td class="center">
-                                                <div class="cl-effect-13">
-                                                    <a href="">
-                                                        view more
-                                                    </a>
-                                                </div></td>
-                                        </tr>
-                                        <tr>
-                                            <td class="center"><img alt="image" class="img-circle" src="assets/images/avatar-4-small.jpg"></td>
-                                            <td><span class="text-small block text-light">Web Editor</span><span>Ella Patterson</span></td>
-                                            <td class="center">
-                                                <div class="cl-effect-13">
-                                                    <a href="">
-                                                        view more
-                                                    </a>
-                                                </div></td>
                                         </tr>
+
                                         </tbody>
                                     </table>
-                                </div><div class="ps-scrollbar-x-rail" style="left: 0px; bottom: 3px;"><div class="ps-scrollbar-x" tabindex="0" style="left: 0px; width: 0px;"></div></div><div class="ps-scrollbar-y-rail" style="top: 0px; right: 3px;"><div class="ps-scrollbar-y" tabindex="0" style="top: 0px; height: 0px;"></div></div></div>
-                            </div><!-- end ngRepeat: tab in tabset.tabs -->
-                            </div>
-                        </div>
+
+                                    <!--
+                                    view tab end
+                                    -->
+
+                                </div>
+                            </tab>
+
+                            <tab heading="BookLet Details" id="booklet">
+                                <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
+                                    <div ng-if="course.bookletDetails==false">
+                                        <center>
+                                            <h5 class="text-dark">No Booklet Details!</h5>
+                                        </center>
+                                    </div>
+                                    <table class="table no-margin ng-scope" ng-if="course.bookletDetails!=false">
+                                        <thead>
+                                        <tr>
+                                            <th>Type</th>
+                                            <th>Date</th>
+                                            <th>Status</th>
+                                            <th>Comments</th>
+
+
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr ng-repeat="book in course.bookletDetails">
+                                            <td>
+                                                <span>{{book.Sem_Year}}</span></td>
+                                            <td>
+                                                <span>{{book.AnsDate}}</span></td>
+                                            <td>
+                                                <span>{{book.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{book.AnsDate}}</span>
+                                            </td>
+                                            <td>
+                                                <span>{{book.Comments}}</span></td>
+
+                                        </tr>
+
+                                        </tbody>
+                                    </table>
+
+                                    <!--
+                                    view tab end
+                                    -->
+
+                                </div>
+                            </tab>
+                            <tab heading="Certificate Details" id="certificate">
+                                <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
+                                    <div ng-if="course.certificateDetails==false">
+                                        <center>
+                                            <h5 class="text-dark">No Certificate Details!</h5>
+                                        </center>
+                                    </div>
+                                    <table class="table no-margin ng-scope" ng-if="course.certificateDetails!=false">
+                                        <thead>
+                                        <tr>
+                                            <th>Type</th>
+                                            <th>Certificate Name</th>
+                                            <th>Status</th>
+                                            <th>Comments</th>
+
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr ng-repeat="cert in course.certificateDetails">
+                                            <td>
+                                                <span>{{cert.Sem_Year}}</span>
+                                            </td>
+                                            <td>
+                                                <span>{{cert.CertificateName}}</span>
+                                            </td>
+                                            <td>
+                                                <span>{{cert.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{cert.CDate}}</span>
+                                            </td>
+                                            <td>
+                                                <span>{{cert.Comments}}</span>
+                                            </td>
+
+
+                                        </tr>
+
+                                        </tbody>
+                                    </table>
+
+                                    <!--
+                                    view tab end
+                                    -->
+
+                                </div>
+                            </tab>
+                            <tab heading="Fees Details" id="fees">
+                                <div class="panel-scroll height-200 ng-scope ps-container ps-theme-default ps-active-y" perfect-scrollbar="" wheel-propagation="false" suppress-scroll-x="true" data-ps-id="6fc3054c-6292-144d-eff7-cd557f527468">
+                                    <div ng-if="course.feesDetails==false">
+                                        <center>
+                                            <h5 class="text-dark">No Fees Details!</h5>
+                                        </center>
+                                    </div>
+                                    <table class="table no-margin ng-scope" ng-controller="FeesModalDemoCtrl" ng-if="course.feesDetails!=false">
+                                        <thead>
+                                        <tr>
+                                            <th>Fees Name</th>
+                                            <th>Session Name</th>
+                                            <th>Roll Number</th>
+                                            <th>Total Payable Fees</th>
+                                            <th>Paid Amount</th>
+                                            <th>Balance</th>
+                                            <th></th>
+
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr ng-repeat="fees in course.feesDetails">
+                                            <td>
+                                                <span>{{fees.FeesName}}</span></td>
+                                            <td>
+                                                <span>{{fees.SessionName}}</span></td>
+                                            <td>
+                                                <span>{{fees.RollNo}}</span></td>
+                                            <td>
+                                                <span>{{fees.PayableAmount}}</span></td>
+                                            <td>
+                                                <span>{{fees.PaidBillAmount}}</span></td>
+                                            <td>
+                                                <span>{{fees.BalanceAmount}}</span></td>
+                                            <td><span>
+									<a  tooltip="{{dynamicTooltip}}">
+										<i class="fa fa-eye" ng-click="open(fees)"></i>
+									</a> </span>
+                                            </td>
+                                        </tr>
+                                        <script type="text/ng-template" id="myModalContent.html">
+
+                                            <div class="modal-header">
+                                                <h4 class="modal-title">{{items.FeesName}} Details</h4>
+                                            </div>
+                                            <div class="modal-body">
+                                                <table class="table">
+                                                    <thead>
+                                                    <tr>
+                                                        <th>Bill NO</th>
+                                                        <th>Bill Amount</th>
+                                                        <th>Bill Date</th>
+                                                    </tr>
+                                                    </thead>
+                                                    <tbody>
+                                                    <tr ng-repeat="v in items.paidDetails">
+                                                        <td>{{v.BillNO}}</td>
+                                                        <td>{{v.BillAmount}}</td>
+                                                        <td>{{v.BillDate}}</td>
+
+                                                    </tr>
+
+                                                </table>
+
+
+
+
+
+                                            </div>
+                                            <div class="modal-footer">
+                                                <button class="btn btn-danger btn-sm" ng-click="cancel()">Cancel</button>
+                                            </div>
+                                        </script>
+
+                                        </tbody>
+                                    </table>
+
+                                    <!--
+                                    view tab end
+                                    -->
+
+                                </div>
+
+                            </tab>
+
+                        </tabset>
+
                     </div>
                 </div>
             </div>
@@ -303,6 +407,7 @@
 
 
 
+
     </div>
 
     <div>