From d7e658cc02066d16b9052e31074464b708dba9b2 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Mon, 24 Sep 2018 15:20:16 +0530
Subject: [PATCH] report issues

---
 .../api/application/models/Reports_model.php  | 16 ++++++-------
 .../report_markcard_certificateCtrl.js        |  2 +-
 .../assets/views/report_answer_booklets.html  | 10 ++++----
 .../views/report_application_pending.html     | 10 ++++----
 .../report_application_pending_oldData.html   | 10 ++++----
 Apollo/assets/views/report_balance_fee.html   | 14 +++++------
 .../views/report_certificate_status.html      |  6 ++---
 .../assets/views/report_document_pending.html | 10 ++++----
 .../assets/views/report_exam_writing_fee.html |  8 +++----
 Apollo/assets/views/report_expense.html       |  4 ++--
 Apollo/assets/views/report_lead.html          | 10 ++++----
 .../views/report_mark_certificate_status.html | 10 ++++----
 .../assets/views/report_markcardstatus.html   |  6 ++---
 .../views/report_studymaterialstatus.html     |  8 +++----
 .../assets/views/report_waiver_referal.html   | 24 ++++---------------
 15 files changed, 55 insertions(+), 93 deletions(-)

diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 0dba6d07..af86c430 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -170,7 +170,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
     }
     public function certificate_status($bat=null,$br=null,$u=null,$from=null,$to=null){
        
-        $sql = "select sms.sid as Student_id,sms.cid,ifnull(sms.status,'-') as status,ifnull(sms.adate,'-') as adate,ifnull(sms.acmts,'-') as acmts,sms.ctype,sms.certname,ifnull(balance,'-') as balance,sfp.BillDate as initialPaid,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,cm.uid as univID,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
+        $sql = "select sms.sid as Student_id,sms.cid,ifnull(sms.status,'-') as status,ifnull(sms.adate,'-') as adate,ifnull(sms.acmts,'-') as acmts,ifnull(sms.ctype,'-') as ctype,ifnull(sms.certname,'-') as certname,ifnull(balance,'-') as balance,ifnull(sfp.BillDate,'-') as initialPaid,ifnull(scd.eid,'-') as Enrollment_id,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,cm.uid as univID,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
 from 
 (SELECT app.ID,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,AppDate as adate,app.Comments as acmts,CertificationType as ctype,CertificateName as certname,sum(bal.balpayable) as balance
 		FROM T_ApplicationStatus as app
@@ -258,7 +258,7 @@ left join
     public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){
        
         $sql = "select sms.ID,sms.sid,sms.cid,sms.fid,sms.sem as Sem_year,ifnull(sms.certname,'-') as Certificate_name,sms.ctype,
-sms.issuedate,sms.istatus,
+ifnull(sms.issuedate,'') as issuedate,sms.istatus,
 ifnull(sms.rcvedate,'-') as rdate,ifnull(sms.rstatus,'-') as rstatus,sms.acmts,ifnull(sms.balance,0) as Balance_fee,std.name as Student_name,std.father as Father_name,std.phone as Phone_number,cm.course as Course_name,cm.uname as University,mdate,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
 from 
 (select c.ID,c.StudentID as sid,sfs.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,Sem as sem,c.CertificationType as certname,c.CertificationType as ctype,CDate as mdate,balpayable as balance,
@@ -462,10 +462,10 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
        
        $sql = "SELECT   
      APFS.ID as id,
-    APFS.Registration_Details_ID AS regid,
+    ifnull(APFS.Registration_Details_ID,'-') AS regid,
       APFS.ListCode as StatusCode, 
       ifnull(APFS.AppFormDate,'-') as StatusUpdationOn, 
-      APFS.Comments as StatusComments,
+      ifnull(APFS.Comments,'-') as StatusComments,
       PKL.ListName as StatusName,
       concat(STU.Firstname,' ', STU.Lastname) as Student_name,
       STU.Fathername as FatherName,
@@ -474,9 +474,9 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
       STU.PresentAddress as address,
       COUR.CourseName as Course_name,
       UNIV.UniversityName as University,
-      sfpd.BILL as InitialPayDate,
+      ifnull(sfpd.BILL,'-') as InitialPayDate,
       RD.Student_Fee_Status_Id as FeesStatusID,
-      STU_COUR.EnrollmentID as EnrollmentNumber,
+      ifnull(STU_COUR.EnrollmentID,'-') as EnrollmentNumber,
       CFD.Sem_Year as Sem_Year,
       RD.RegistrationType as FormType,
       STU.StudentID as Student_id
@@ -574,7 +574,7 @@ STU.Fathername as FatherName,
 STU.MobileNumber as Phone_number,
 STU.AlternateNumber as AlternateNumber,
 STU.PermanentAddress as address,
-STU_COUR.EnrollmentID as eid,
+ifnull(STU_COUR.EnrollmentID,'-') as eid,
 COUR.CourseName as Course_name,
 UNIV.UniversityName as University
 from T_ApplicationStatus a
@@ -942,7 +942,7 @@ from T_Lead_Tracking_Followup as ltf
         $this->db->where('UniversityID',$universityID);
         $this->db->where('IsActive','1');
         $this->db->where('BranchCode',$br);
-        $this->db->order_by('BatchCode','ASC');
+        $this->db->order_by('BatchCode','DESC');
         $batchDetails = $this->db->get(BATCH);
         return $batchDetails->result();
     }
diff --git a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
index aec73775..91d71af5 100755
--- a/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
+++ b/Apollo/assets/js/controllers/report_markcard_certificateCtrl.js
@@ -175,7 +175,7 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
         
         
         $scope.exportData = function () {
-            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Student_name as StudentName,Father_name as FatherName,CAST(Phone_number AS NUMBER) as PhoneNumber,University as University,Course_name as CourseName,Sem_year as SemYear,Certificate_name as CertificateName,rstatus as ReceivedStatus,rdate as ReceivedDate,istatus as IssuedStatus,issuedate as IssuedDate,acmts as CertificateIssuedComments,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]);
+            alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Student_name as StudentName,Father_name as FatherName,University as University,Course_name as CourseName,Sem_year as SemYear,Certificate_name as CertificateName,rstatus as ReceivedStatus,rdate as ReceivedDate,istatus as IssuedStatus,issuedate as IssuedDate,acmts as CertificateIssuedComments,CAST(Balance_fee AS NUMBER) as BalanceFee INTO XLS("Markcard/Certificate_status.xls",?) FROM ?',[mystyle,$scope.mark_cert_data]);
         };
     /**
      * Auto Call Tracking Sriram
diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html
index da410c0f..dc8127d7 100755
--- a/Apollo/assets/views/report_answer_booklets.html
+++ b/Apollo/assets/views/report_answer_booklets.html
@@ -88,8 +88,8 @@ td,th {
                 <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
             
         </div>
-        <div class="table-responsive">
-            <table  id="datatable"   class="table table-hover" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
+        <div class="table-responsive" style="margin-top: 20px;">
+            <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
                   
                            
                          
@@ -103,7 +103,6 @@ td,th {
                         <th>Father Name</th>
                         <th>Course</th>
                         <th>Sem/Year</th>
-                        <th>Phone No</th>
                         <th>University</th>
 						<th>Balance Fee</th>
 						<th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Issued To Student Date</th>
@@ -114,8 +113,8 @@ td,th {
                  
                     </tr>
                 </thead>
-                <tbody dir-paginate="p in ans_book_data|filter:search:strict|itemsPerPage:10">
-                    <tr>
+                <tbody>
+                    <tr dir-paginate="p in ans_book_data|filter:search:strict|itemsPerPage:10">
                             <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
                         <td>{{p.SL_NO}}</td>
                         <td>{{p.Enrollment_id}}</td>
@@ -123,7 +122,6 @@ td,th {
                         <td>{{p.Father_name}}</td>
                         <td>{{p.Course_name}}</td>
                         <td>{{p.Sem_year}}({{p.Sem}})</td>
-                        <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
 						 <td style="text-align:right;">{{p.balance}}</td>
 						<td>{{p.issuedate}}</td>
diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html
index 1fef1b1a..fa4a240f 100755
--- a/Apollo/assets/views/report_application_pending.html
+++ b/Apollo/assets/views/report_application_pending.html
@@ -89,8 +89,8 @@
                 <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
             
         </div>
-        <div class="table-responsive">
-            <table  id="datatable"   class="table table-hover" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
+        <div class="table-responsive" style="margin-top: 20px;">
+            <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
                   
                            
                          
@@ -105,7 +105,6 @@
                         <th>Father Name</th>
                         <th>Course</th>
                         <th>Sem/Year</th>
-                        <th>Phone No</th>
                         <th>University</th>
                         <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Application Pending Status</th>
 						<th>Form Type</th>
@@ -115,8 +114,8 @@
                  
                     </tr>
                 </thead>
-                <tbody dir-paginate="p in app_pending_data|filter:search:strict|itemsPerPage:10">
-                    <tr>
+                <tbody>
+                    <tr dir-paginate="p in app_pending_data|filter:search:strict|itemsPerPage:10">
                             <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
                         <td>{{p.SL_NO}}</td>
                         <td>{{p.InitialPayDate}}</td>
@@ -125,7 +124,6 @@
                         <td>{{p.FatherName}}</td>
                         <td>{{p.Course_name}}</td>
                         <td>{{p.Sem_Year}}</td>
-                        <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
                         <td>{{p.StatusName}}</td>
 						<td>{{p.FormType}}</td>
diff --git a/Apollo/assets/views/report_application_pending_oldData.html b/Apollo/assets/views/report_application_pending_oldData.html
index 9775c074..007b653f 100644
--- a/Apollo/assets/views/report_application_pending_oldData.html
+++ b/Apollo/assets/views/report_application_pending_oldData.html
@@ -89,8 +89,8 @@
                 <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
             
         </div>
-        <div class="table-responsive">
-            <table  id="datatable"   class="table table-hover" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
+        <div class="table-responsive" style="margin-top: 20px;">
+            <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
                   
                            
                          
@@ -104,7 +104,6 @@
                         <th>Student Name</th>
                         <th>Father Name</th>
                         <th>Course</th>
-                        <th>Phone No</th>
                         <th>University</th>
                         <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Application Status</th>
 						<th>Date</th>
@@ -113,8 +112,8 @@
                  
                     </tr>
                 </thead>
-                <tbody dir-paginate="p in app_pending_data|filter:search:strict|itemsPerPage:10">
-                    <tr>
+                <tbody>
+                    <tr dir-paginate="p in app_pending_data|filter:search:strict|itemsPerPage:10">
                            <!-- <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>-->
                         <td>{{p.SL_NO}}</td>
                         <td>{{p.init_date}}</td>
@@ -122,7 +121,6 @@
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
                         <td>{{p.FatherName}}</td>
                         <td>{{p.Course_name}}</td>
-                        <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
                         <td>{{p.StatusName}}</td>
 						 <td>{{p.adate}}</td>
diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html
index f6d46fdc..6a4a5f44 100755
--- a/Apollo/assets/views/report_balance_fee.html
+++ b/Apollo/assets/views/report_balance_fee.html
@@ -94,14 +94,14 @@
                     <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
                    </div>
             </div>
-            <div class="table-responsive">
-                <table  id="datatable"   class="table table-hover" style="font-size:0.8em;" ng-controller="studentModalDemoCtrl"> 
+            <div class="table-responsive" style="margin-top: 20px;">
+                <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.8em;" ng-controller="studentModalDemoCtrl"> 
                       
                                
                              
                     <thead>
                         <tr>
-                            <th colspan="8"></th>
+                            <th colspan="7"></th>
                             <th></th>
                             <th></th>
                             <th nowrap style="text-align:center;">Sum of Total Fee</th>
@@ -129,7 +129,6 @@
                             <th nowrap style="text-align:center;">Father Name</th>
                             <th nowrap style="text-align:center;">Course</th>
                             <th nowrap style="text-align:center;">Sem/Year</th>
-                            <th nowrap style="text-align:center;">Phone No</th>
                             <th nowrap style="text-align:center;">University</th>
 							<th nowrap style="text-align:center;">Reg Date</th>
                             <th nowrap style="text-align:center;">Total Fee</th>
@@ -163,8 +162,8 @@
                      
                         </tr>
                     </thead>
-                    <tbody dir-paginate="p in returnResultData|filter:search:strict|itemsPerPage:itemsPerPage" current-page="currentPage">
-                        <tr ng-if= "p.balance !=0">
+                    <tbody current-page="currentPage">
+                        <tr  dir-paginate="p in returnResultData|filter:search:strict|itemsPerPage:itemsPerPage" ng-if= "p.balance !=0">
                                 <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
                             <td nowrap>{{p.SL_NO}}</td>
                             <td nowrap>{{p.eid}}</td>
@@ -172,8 +171,7 @@
                             <td nowrap>{{p.Father_name}}</td>
                             <td nowrap>{{p.Course_name}}</td>
                             <td nowrap>{{p.Sem_year}}</td>
-                            <td nowrap><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
-                            <td nowrap>{{p.University}}</td>
+                             <td nowrap>{{p.University}}</td>
 							<td nowrap>{{p.regdate}}</td>
                             <td nowrap style="text-align:right;">{{p.Total}}</td>
                             <td nowrap style="text-align:right;">{{p.Paid_fee}}</td>
diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html
index 6870cebe..09054aa4 100755
--- a/Apollo/assets/views/report_certificate_status.html
+++ b/Apollo/assets/views/report_certificate_status.html
@@ -127,8 +127,8 @@ td,th {
                 <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
             
         </div>
-        <div class="table-responsive">
-            <table  id="datatable"   class="table table-hover" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
+        <div class="table-responsive" style="margin-top: 20px;">
+            <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
                   
                            
                          
@@ -143,7 +143,6 @@ td,th {
                         <th>Father Name</th>
                         <th>Course</th>
                        <!--  <th>Sem/Year</th> -->
-                        <th>Phone No</th>
                         <th>University</th>
                         <th>Balance Fee</th>
                         <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Certificates Name</th>
@@ -162,7 +161,6 @@ td,th {
                         <td>{{p.Father_name}}</td>
                         <td>{{p.Course_name}}</td>
                        <!--  <td>{{p.Sem_year}}</td> -->
-                        <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
                         <td style="text-align:right;">{{p.balance || "0"}}</td>
                         <td>{{p.certname}}</td>
diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html
index f3a8f7a4..1ba726f1 100755
--- a/Apollo/assets/views/report_document_pending.html
+++ b/Apollo/assets/views/report_document_pending.html
@@ -88,8 +88,8 @@ td,th {
                 <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
             
         </div>
-        <div class="table-responsive">
-            <table  id="datatable"   class="table table-hover" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
+        <div class="table-responsive" style="margin-top: 20px;">
+            <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
                   
                            
                          
@@ -104,7 +104,6 @@ td,th {
                         <th>Father Name</th>
                         <th>Course</th>
                         <!-- <th>Sem/Year</th> -->
-                        <th>Phone No</th>
                         <th>University</th>
 						<th>Followup Date</th>
 						<th>Pending Document</th>
@@ -114,8 +113,8 @@ td,th {
                  
                     </tr>
                 </thead>
-                <tbody dir-paginate="p in doc_pending_data|filter:search:strict|itemsPerPage:10">
-                    <tr>
+                <tbody >
+                    <tr dir-paginate="p in doc_pending_data|filter:search:strict|itemsPerPage:10">
                             <td><input type="checkbox" ng-checked="myModel.all" id="{{p.Student_id}}" name="{{p.Student_id}}" class="form-control" ng-click="isClick($event);" /></td>
                         <td>{{p.SL_NO}}</td>
                         <td>{{p.Admission_date}}</td>
@@ -124,7 +123,6 @@ td,th {
                         <td>{{p.Father_name}}</td>
                         <td>{{p.Course_name}}</td>
                         <!-- <td>{{p.Sem_year}}</td> -->
-                        <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
 						 <td>{{p.fdate}}</td>
 						 <td>{{p.certname}}</td>
diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html
index e8c0ed43..60823755 100755
--- a/Apollo/assets/views/report_exam_writing_fee.html
+++ b/Apollo/assets/views/report_exam_writing_fee.html
@@ -88,14 +88,14 @@
  -->                    <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
                 
             </div>
-            <div class="table-responsive">
-                <table  id="datatable"   class="table table-hover" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
+            <div class="table-responsive" style="margin-top: 20px;">
+                <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
                       
                                
                              
                     <thead>
                         <tr>
-                            <th colspan="8"></th>
+                            <th colspan="7"></th>
                             <th>Sum of Exam Writing Fee</th>
                             <th></th>
                         </tr>
@@ -108,7 +108,6 @@
                             <th>Father Name</th>
                             <th>Course</th>
                             <th>Sem/Year</th>
-                            <th>Phone No</th>
                             <th>University</th>
                             <th>Exam Writing Fee</th>
                             <th>Comments</th>
@@ -127,7 +126,6 @@
                             <td>{{p.Father_name}}</td>
                             <td>{{p.Course_name}}</td>
                             <td>{{p.Sem_year}}</td>
-                            <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                             <td>{{p.University}}</td>
                             <td style="text-align:right;">{{p.Amount}}</td>
                             <td>{{p.Comments}}</td>
diff --git a/Apollo/assets/views/report_expense.html b/Apollo/assets/views/report_expense.html
index 9cbfa665..6da8c83f 100755
--- a/Apollo/assets/views/report_expense.html
+++ b/Apollo/assets/views/report_expense.html
@@ -85,10 +85,10 @@
                 <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
             
         </div>
-        <div pdf-save-content="getpdf" class="table-responsive">
+        <div pdf-save-content="getpdf" class="table-responsive" style="margin-top: 20px;">
 		<h4 style="text-align:center;">Apollo Distance Education College - {{expense_data[0].branch}}</h4>
 		<h4 style="text-align:center;">Expense Report {{filters.from_date | date : "dd-MM-yyyy"}} To {{filters.to_date | date : "dd-MM-yyyy"}}</h4>
-            <table  id="datatable"   class="table table-hover">
+            <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed">
                   
                            
                          
diff --git a/Apollo/assets/views/report_lead.html b/Apollo/assets/views/report_lead.html
index b3ab45b9..679e74f3 100644
--- a/Apollo/assets/views/report_lead.html
+++ b/Apollo/assets/views/report_lead.html
@@ -104,8 +104,8 @@ td,th {
                 <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
             
         </div>
-        <div class="table-responsive">
-            <table  id="datatable"   class="table table-hover" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
+        <div class="table-responsive" style="margin-top: 20px;">
+            <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
                   
                            
                          
@@ -118,7 +118,6 @@ td,th {
                         <th>Tracking ID</th>
                         <th>Followup Date</th>
                         <th>Name</th>
-                        <th>Mobile No</th>
                         <th>University</th>
                         <th>Course</th>
                         <th>Present Status</th>
@@ -129,15 +128,14 @@ td,th {
                  
                     </tr>
                 </thead>
-                <tbody dir-paginate="p in lead_data|filter:search:strict|itemsPerPage:10">
-                    <tr>
+                <tbody>
+                    <tr dir-paginate="p in lead_data|filter:search:strict|itemsPerPage:10">
                             
                         <td>{{p.SL_NO}}</td>
                         <td>{{p.date}}</td>
                         <td>{{p.tid}}</td>
                         <td>{{p.fup}}</td>
                         <td>{{p.name}}</td>
-                        <td>{{p.mobile}}</td>
                         <td>{{p.univ}}</td>
                         <td>{{p.course}}</td>
                         <td>{{p.prsStatus}}</td>
diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html
index 8b2b620c..4c59cdc4 100755
--- a/Apollo/assets/views/report_mark_certificate_status.html
+++ b/Apollo/assets/views/report_mark_certificate_status.html
@@ -130,8 +130,8 @@ td,th {
                 <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
             
         </div>
-        <div class="table-responsive">
-            <table  id="datatable"   class="table table-hover" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
+        <div class="table-responsive" style="margin-top: 20px;">
+            <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
                   
                            
                          
@@ -142,8 +142,7 @@ td,th {
                         <th>SL.No</th>
                         <th>Student Name</th>
                         <th>Father Name</th>
-						 <th>Phone No</th>
-						 <th>University</th>
+						<th>University</th>
                         <th>Course</th>
                         <th>Sem/Year</th>
                        <th>Certificates Name</th>
@@ -162,8 +161,7 @@ td,th {
                         <td>{{p.SL_NO}}</td>
                         <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
                         <td>{{p.Father_name}}</td>
-						 <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
-						 <td>{{p.University}}</td>
+						<td>{{p.University}}</td>
                         <td>{{p.Course_name}}</td>
                         <td>{{p.Sem_year}}</td>
                         <td>{{p.Certificate_name}}</td>
diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html
index 0dea4d3a..0eb55d73 100755
--- a/Apollo/assets/views/report_markcardstatus.html
+++ b/Apollo/assets/views/report_markcardstatus.html
@@ -91,9 +91,9 @@
             
         </div>
        
-        <div class="table-responsive">
+        <div class="table-responsive" style="margin-top: 20px;">
                 
-            <table  id="datatable"   class="table table-hover" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
+            <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
                 <thead>
                     <tr>
                             <th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>
@@ -105,7 +105,6 @@
                         <th>Father Name</th>
                         <th>Course</th>
                         <th>Sem/Year</th>
-                        <th>Phone No</th>
                         <th>University</th>
                         <th>Balance Fee</th>
 						<th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Application Sent Date</th>
@@ -126,7 +125,6 @@
                         <td>{{p.Father_name}}</td>
                         <td>{{p.Course_name}}</td>
                         <td>{{p.Sem_year}}({{p.Sem}})</td>
-                        <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
                         <td style="text-align:right;">{{p.Balance_Fee}}</td>
 						<td>{{p.appdate}}</td>
diff --git a/Apollo/assets/views/report_studymaterialstatus.html b/Apollo/assets/views/report_studymaterialstatus.html
index 69da58ce..be6e62d0 100755
--- a/Apollo/assets/views/report_studymaterialstatus.html
+++ b/Apollo/assets/views/report_studymaterialstatus.html
@@ -78,8 +78,8 @@
                 <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
             
         </div>
-        <div id="data" class="table-responsive">
-            <table class="table table-hover" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
+        <div id="data" class="table-responsive" style="margin-top: 20px;">
+            <table  id="datatable" class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
                    <!-- <table datatable=""   class="table table-hover">-->
                 <thead>
                    <tr>
@@ -91,9 +91,8 @@
                         <th>Father Name</th>
                         <th>Course</th>
                         <th>Sem/Year</th>
-                        <th>Phone No</th>
                         <th>University</th>
-                        <th>Study Material Status</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;">Study Material Status</th>
                         <th>Date</th>
                         <th>Balance Fee</th>
                         
@@ -110,7 +109,6 @@
                         <td>{{p.Father_name}}</td>
                         <td>{{p.Course_name}}</td>
                         <td>{{p.Sem_year}}({{p.Sem}})</td> 
-                        <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
                         <td>{{p.University}}</td>
                         <td>{{p.Status}}</td>
                          <td>{{p.Date}}</td>
diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html
index 3cee90c4..4d765a37 100755
--- a/Apollo/assets/views/report_waiver_referal.html
+++ b/Apollo/assets/views/report_waiver_referal.html
@@ -85,26 +85,13 @@
             
         </div>
     
-        <div class="table-responsive">
-            <table  id="datatable"   class="table table-hover" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
+        <div class="table-responsive" style="margin-top: 20px;">
+            <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">
                   
                            
                          
                 <thead>
-                    <tr>
-                        <th></th>
-                        <th></th>
-                        <th></th>
-                        <th></th>
-                        <th></th>
-                        <th></th>
-                        <th></th>
-                        <th></th>
-						<th></th>
-                        <th colspan="2"></th>
-                        <th colspan="2"></th>
-                        <th></th>
-                    </tr>
+                   
                    
                     <tr>
                         <th>SL.No</th>
@@ -114,7 +101,6 @@
                         <th>Course</th>
                         <th>Sem/Year</th>
                         <th>University</th>
-						<th>Phone No</th>
 						<th>Waiver/referal given by</th>
                         <th>Waiver Bill No</th>
                         <th>Waivers Amount</th>
@@ -136,8 +122,7 @@
                         <td>{{p.Course_name}}</td>
                         <td>{{p.Sem_year}}</td>
                         <td>{{p.University}}</td>
-                        <td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
-						<td>{{p.staffname}}</td>
+                        <td>{{p.staffname}}</td>
                         <td>{{p.Waiver_bill}}</td>
                         <td style="text-align:right;">{{p.Waiver_amount}}</td>
                         <td style="text-align:center;">{{p.Referal_bill}}</td>
@@ -156,7 +141,6 @@
                    <td></td>
                    <td>Total</td>
                    <td></td>
-                   <td></td>
                    <td></td>
 				   <td></td>
                    <td style="text-align:right;">{{ getwaiver() }}</td>