Report issues

Apollo/api/application/models/Reports_model.php

@@ -33,7 +33,7 @@ group by cid
 order by CourseID) as cm
         on cm.cid=cfd.ccid
         left join 
-        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,AlternateNumber,PresentAddress as address FROM T_StudentDetails where IsActive = 1) as std on std.sid=sms.sid
+        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,AlternateNumber,PresentAddress as address FROM T_StudentDetails where IsActive = 1) as std on std.sid=sms.sid
 left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid 
 left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.semyr=sms.sem
        where sms.branch = '".$br."'
@@ -99,7 +99,7 @@ where BranchCode = '".$br."' and BatchName = '".$batch."'";
     }
     public function markcard($bat=null,$br=null,$u=null){
        
-        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfs.rollno,'-') as Roll_NO,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.cdate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Initial_paid_date,bal.balpayable as Balance_Fee,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,appdate,ansdate 
+        $sql = "select ifnull(sms.sid,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfs.rollno,'-') as Roll_NO,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.cdate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(sfp.bdate,'-') as Initial_paid_date,bal.balpayable as Balance_Fee,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,ifnull(appdate,'-') as appdate,ifnull(ansdate,'-') as ansdate  
         from 
         (SELECT c.ID,StudentID as sid,c.CourseID as cid,c.BranchCode as branch,c.ListCode as lcode,p.ListName,c.CertificationType as ctype,c.CDate as cdate,c.Sem as sem FROM T_CertificationStatus c
  left join T_PickListDetails p on p.ListCode=c.ListCode
@@ -125,7 +125,7 @@ group by cid
 order by CourseID) as cm
         on cm.cid=cfd.ccid
         left join 
-        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber  FROM T_StudentDetails) as std on std.sid=sms.sid
+        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber  FROM T_StudentDetails) as std on std.sid=sms.sid
 left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
 left join (select ID,StudentID as sid,Sem,
 if(ListName = 'SENT TO UNIVERSITY', AnsDate,'-') as ansdate
@@ -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,sms.status,sms.adate,sms.acmts,sms.ctype,sms.certname,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,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
 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
@@ -209,7 +209,7 @@ left join
         order by CourseID) 
     as cm on cm.cid=sms.cid
 left join 
-        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
+        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
 left join 
        (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid
        
@@ -226,12 +226,18 @@ left join
             $sql.=" and cm.uid = '".$u."'";
           
           }
-		  if ($from != '' and $to != ''){
+		  if ($from != ''){
             $fromd= date("Y-m-d",strtotime($from));
-            $tod=date("Y-m-d",strtotime($to));
+           
             
             $sql.="and STR_TO_DATE(sms.adate,'%d-%m-%Y') >= '".$fromd."'
-                and STR_TO_DATE(sms.adate,'%d-%m-%Y') <= '".$tod."'";
+                ";
+        
+        }
+        if ($to != ''){
+             $tod=date("Y-m-d",strtotime($to));
+            
+            $sql.=" and STR_TO_DATE(sms.adate,'%d-%m-%Y') <= '".$tod."'";
         
         }
           $sql.=" group by Student_id,cid,ctype";
@@ -274,7 +280,7 @@ T_Students_Fees_Status sfs on sfs.StudentID=a.StudentID and sfs.CourseID=a.Cours
 left join T_CertificationMaster cm on cm.CertificationID=a.CertificationType
 left join T_PickListDetails list on list.ListCode=a.ListCode 
 left join (select student, course, sum(balpayable) balpayable from BalFees group by student, course) bal on bal.student=a.StudentID and bal.course=a.CourseID
-where AppDate is not null 
+where AppDate is not null and cm.CertificateName not like 'APPLICATION%'  and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' ) 
 group by sid,cid,ctype) as sms
 left join 
         (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others 
@@ -295,7 +301,7 @@ where IsActive = 1
         order by CourseID) 
     as cm on cm.cid=sms.cid
 left join 
-        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
+        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
 left join 
        (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sms.cid
        where sms.branch = '".$br."'     
@@ -311,11 +317,18 @@ left join
             $sql.=" and cm.uid = '".$u."'";
           
           }
-          if ($from != '' and $to != ''){
+          if ($from != ''){
             $fromd= date("Y-m-d",strtotime($from));
+            
+            
+            $sql.=" and STR_TO_DATE(sms.mdate,'%d-%m-%Y') >= '".$fromd."'
+               ";
+        
+        }
+        if ($to != ''){
             $tod=date("Y-m-d",strtotime($to));
             
-            $sql.="and STR_TO_DATE(sms.mdate,'%d-%m-%Y') >= '".$fromd."'
+            $sql.="
                 and STR_TO_DATE(sms.mdate,'%d-%m-%Y') <= '".$tod."'";
         
         }
@@ -344,12 +357,15 @@ left join
         where dbm.Name = 'I001' and exp.TypeName not like 'FEES' and dbm.Status = 'Approved' and exp.BranchCode = '".$br."'
         ";
        
-          if ($from and $to != ''){
+          if ($from != ''){
             $fromd= date("Y-m-d",strtotime($from));
-            $tod=date("Y-m-d",strtotime($to));
-           
             $sql.="and STR_TO_DATE(dbm.Date,'%d-%m-%Y') >= '".$fromd."'
-                and STR_TO_DATE(dbm.Date,'%d-%m-%Y') <= '".$tod."'";
+               ";
+        
+        }
+        if ($to != ''){
+           $tod=date("Y-m-d",strtotime($to));
+            $sql.=" and STR_TO_DATE(dbm.Date,'%d-%m-%Y') <= '".$tod."'";
         
         }
           $sql.=" group by Expense_name";
@@ -370,7 +386,7 @@ left join
     }
     public function answer_booklet($bat=null,$br=null,$u=null){
        
-        $sql = "select ifnull(sms.sid,'-') as Student_id,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(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,listdate.issuedate as issuedate,listdate.rcvedate as rcvedate,bal.balpayable as balance
+        $sql = "select ifnull(sms.sid,'-') as Student_id,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(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(sms.adate,'-') as Date,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(list.status,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,ifnull(listdate.issuedate,'-') as issuedate,ifnull(listdate.rcvedate,'-') as rcvedate,ifnull(bal.balpayable,'-') as balance
 
         from 
 			 (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as  
@@ -401,7 +417,7 @@ left join
         order by CourseID) 
     as cm on cm.cid=cfd.ccid
 left join 
-        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
+        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
 left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid
 left join 
          (select ID,StudentID as sid,Sem as sem,
@@ -448,7 +464,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
      APFS.ID as id,
     APFS.Registration_Details_ID AS regid,
       APFS.ListCode as StatusCode, 
-      APFS.AppFormDate as StatusUpdationOn, 
+      ifnull(APFS.AppFormDate,'-') as StatusUpdationOn, 
       APFS.Comments as StatusComments,
       PKL.ListName as StatusName,
       concat(STU.Firstname,' ', STU.Lastname) as Student_name,
@@ -553,7 +569,7 @@ a.CertificationType as ctype,
 ifnull(sfs.BatchCode,'-') as batch,
 list.ListName as StatusName,
 ifnull(sfp.bill,'-') as init_date,
-STU.Firstname as Student_name,
+concat(STU.Firstname,' ', STU.Lastname) as Student_name,
 STU.Fathername as FatherName,
 STU.MobileNumber as Phone_number,
 STU.AlternateNumber as AlternateNumber,
@@ -599,7 +615,7 @@ $sql.=" group by Student_id,cid,ctype";
     }
     public function doc_pending($bat=null,$br=null,$u=null){
        
-        $sql = "select ifnull(sms.sid,'-') as Student_id,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(sfs.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,sms.follow_date as fdate,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
+        $sql = "select ifnull(sms.sid,'-') as Student_id,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(sfs.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,sms.certname as certname,ifnull(sfp.bdate,'-') as Admission_date,ifnull(sms.follow_date,'-') as fdate,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
         from 
 			 (select StudentID as sid,Details as certname,DocumentDate as follow_date,StatusName as status
 from T_Student_DocumentTrack_Details
@@ -624,7 +640,7 @@ left join
         order by CourseID) 
     as cm on cm.cid=cfd.ccid
 left join 
-        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
+        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber FROM T_StudentDetails) as std on std.sid=sms.sid
 left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,EnrollmentID as eid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid 
        where std.active = 1  and sfs.branch = '".$br."'
 
@@ -683,7 +699,7 @@ left join
         order by CourseID) 
     as cm on cm.cid=cfd.ccid
 left join 
-        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber  FROM T_StudentDetails) as std on std.sid=sms.sid
+        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber  FROM T_StudentDetails) as std on std.sid=sms.sid
 left join 
          T_Login as login on login.ID=sms.lid
 left join 
@@ -739,7 +755,7 @@ left join
         order by CourseID) 
     as cm on cm.cid=sms.cid
 left join 
-        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,FirstName as name,Fathername as father,PermanentAddress as address,AlternateNumber  FROM T_StudentDetails) as std on std.sid=sms.sid
+        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber  FROM T_StudentDetails) as std on std.sid=sms.sid
        where std.active = 1 and sms.branch = '".$br."' 
  
 ";
@@ -773,7 +789,7 @@ left join
     }
     public function balfee($bat=null,$br=null,$u=null){
        
-        $sql = "SELECT  ifnull(sfp.StudentID,'-') as Student_id,scd.EnrollmentID as eid,sfs.CourseID as cid,std.MobileNumber as Phone_number,FirstName as Student_name,Fathername as Father_name,PermanentAddress as address,AlternateNumber,date_format(std.CreatedOn,'%d-%m-%Y') as regdate,cm.CourseName as Course_name,u.UniversityName as University,sfp.FeesID as fid,(sfs.CourseFees + sfs.STFOrWR + sfs.Others) as Total,ifnull((sum(sfp.BillAmount)),0) as Paid_fee,sfs.CourseFees , sfs.STFOrWR , sfs.Others,((sfs.CourseFees + sfs.STFOrWR + sfs.Others) - sfp.BillAmount) as balance,bal.balpayable as bal,cfd.Sem_Year as Sem_year,std.PermanentAddress as address,std.AlternateNumber as AlternateNumber,
+        $sql = "SELECT  ifnull(sfp.StudentID,'-') as Student_id,scd.EnrollmentID as eid,sfs.CourseID as cid,std.MobileNumber as Phone_number,concat(FirstName,' ',Lastname) as Student_name,Fathername as Father_name,PermanentAddress as address,AlternateNumber,ifnull(date_format(std.CreatedOn,'%d-%m-%Y'),'-') as regdate,cm.CourseName as Course_name,u.UniversityName as University,sfp.FeesID as fid,(sfs.CourseFees + sfs.STFOrWR + sfs.Others) as Total,ifnull((sum(sfp.BillAmount)),0) as Paid_fee,sfs.CourseFees , sfs.STFOrWR , sfs.Others,((sfs.CourseFees + sfs.STFOrWR + sfs.Others) - sfp.BillAmount) as balance,ifnull(bal.balpayable,'-') as bal,ifnull(cfd.Sem_Year,'-') as Sem_year,std.PermanentAddress as address,std.AlternateNumber as AlternateNumber,
         ifnull(MAX(CASE WHEN Installment = 1 THEN sfp.BillNO END),'-') as billno1,
         ifnull(MAX(CASE WHEN Installment = 1 THEN sfp.BillAmount END),0) as billamt1,
         ifnull(MAX(CASE WHEN Installment = 2 THEN sfp.BillNO END),'-') as billno2,
@@ -839,7 +855,7 @@ left join
     }
 	public function lead($from=null,$to=null,$br=null){
        
-        $sql = "select InteractionID,date_format(ltf.CreatedOn,'%d-%m-%Y') as date,ltf.TrackingID as tid,ltf.FollowupOn as fup,ld.LeadName as name,ld.MobileNumber as mobile,lt.University as univ,lt.Course as course,lt.Course as prvStatus,list.ListName as prsStatus,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo
+        $sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as tid,ifnull(ltf.FollowupOn,'-') as fup,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobile,lt.University as univ,lt.Course as course,lt.Course as prvStatus,list.ListName as prsStatus,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo
 from T_Lead_Tracking_Followup as ltf
  left join T_Lead_Tracking lt on lt.TrackingID=ltf.TrackingID
  join T_Login l on l.ID=lt.AssignedTo
@@ -851,11 +867,18 @@ from T_Lead_Tracking_Followup as ltf
 
    ";
        
-       if ($from and $to != ''){
+       if ($from != ''){
             $fromd= date("Y-m-d",strtotime($from));
-            $tod=date("Y-m-d",strtotime($to));
+           
            
             $sql.=" and date(ltf.CreatedOn) >= '".$fromd."'
+               ";
+        
+        }
+        if ($to != ''){
+            $tod=date("Y-m-d",strtotime($to));
+           
+            $sql.="
                 and date(ltf.CreatedOn) <= '".$tod."'";
         
         }

Apollo/assets/js/controllers/report_markcard_certificateCtrl.js

@@ -158,10 +158,10 @@ app.controller('report_markcard_certificateCtrl', ["$scope", "$filter","$rootSco
 
         }
         var mystyle = {
-            sheetid: 'MARKCARD/CERTIFICATE STATUS REPORT',
+            sheetid: 'Markcard and Certificate',
             headers: true,
             caption: {
-              title:'MARKCARD/CERTIFICATE STATUS REPORT',
+              title:'MARKS CARD/ CERTIFICATES - RECEIVED/ ISSUED STATUS REPORT',
               width: '300px',
               style:'font-size:50px;' 
             },
@@ -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,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]);
         };
     /**
      * Auto Call Tracking Sriram

Apollo/assets/js/controllers/report_markcard_statusCtrl.js

@@ -155,7 +155,7 @@ app.controller('report_markcard_statusCtrl', ["$scope", "$filter","$rootScope",
             },
             // style:'background:#00FF00',
             column: {
-              style:'font-size:16px'
+              style:'font-size:10px'
             },
            
         };

Apollo/assets/js/controllers/report_study_material_statusCtrl.js

@@ -161,7 +161,7 @@ app.controller('report_study_material_statusCtrl', ["$scope", "$filter","$rootSc
 
 
 $scope.exportData = function () {
-    alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University,Status as StudyMaterial_Status,Date,CAST(Balance_fee AS NUMBER) as BalanceFee  INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]);
+    alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Initial_paid_date as InitialPaidDate,Enrollment_id as EnrollmentId,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem as SemYear,CAST(Phone_number AS NUMBER) as PhoneNumber,University,Status as StudyMaterial_Status,Date,CAST(Balance_fee AS NUMBER) as BalanceFee  INTO XLS("Study_material_status.xls",?) FROM ?',[mystyle,$scope.study_mat_data]);
 };
 
 

Apollo/assets/views/report_answer_booklets.html

@@ -37,9 +37,9 @@ td,th {
                         <div class="row">
                            
                              <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     University
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
@@ -51,9 +51,9 @@ td,th {
                             </div>
 
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     Batch
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
@@ -106,9 +106,9 @@ td,th {
                         <th>Phone No</th>
                         <th>University</th>
 						<th>Balance Fee</th>
-						<th>Issued To Student Date</th>
+						<th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Issued To Student Date</th>
-						<th>Received From Student Date</th>
+						<th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Received From Student Date</th>
-                        <th>Answer Booklet Status</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Answer Booklet Status</th>
                         <th>Date</th>
                         
                  

Apollo/assets/views/report_application_pending.html

@@ -39,9 +39,9 @@
                         <div class="row">
                             
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     University
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
@@ -52,9 +52,9 @@
                             </div>
 
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     Batch
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
@@ -99,7 +99,7 @@
                     <tr>
                             <th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>
                         <th>SL.No</th>
-                        <th>Initital Payment Date</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Initital Payment Date</th>
                         <th>Enrollment ID</th>
                         <th>Student Name</th>
                         <th>Father Name</th>
@@ -107,7 +107,7 @@
                         <th>Sem/Year</th>
                         <th>Phone No</th>
                         <th>University</th>
-                        <th>Application Pending Status</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Application Pending Status</th>
 						<th>Form Type</th>
 						<th>Date</th>
                         

Apollo/assets/views/report_application_pending_oldData.html

@@ -15,7 +15,7 @@
 	  th{
 	  text-align:center;
 	  }
-	   .table>tbody>tr>td { padding: 2px; }
+	   .table>tbody>tr>td { padding: 10px; }
     /* .sort-icon {
         font-size: 9px;
         margin-left: 5px;
@@ -39,9 +39,9 @@
                         <div class="row">
                             
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     University
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
@@ -52,9 +52,9 @@
                             </div>
 
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     Batch
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
@@ -99,14 +99,14 @@
                     <tr>
                             <!--<th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>-->
                         <th>SL.No</th>
-                        <th>Initital Payment Date</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Initital Payment Date</th>
                         <th>Enrollment ID</th>
                         <th>Student Name</th>
                         <th>Father Name</th>
                         <th>Course</th>
                         <th>Phone No</th>
                         <th>University</th>
-                        <th>Application Status</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Application Status</th>
 						<th>Date</th>
                         
                         

Apollo/assets/views/report_balance_fee.html

@@ -31,9 +31,9 @@
                             <div class="row">
                                 
                                 <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     University
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
@@ -45,9 +45,9 @@
                             </div>
 
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     Batch
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>

Apollo/assets/views/report_certificate_status.html

@@ -39,7 +39,7 @@ td,th {
                             <div class="col-md-4">
                                 <label for="form-field-select-2">
                                     University
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
@@ -53,7 +53,7 @@ td,th {
                             <div class="col-md-4">
                                 <label for="form-field-select-2">
                                     Batch
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
@@ -137,7 +137,7 @@ td,th {
                     <tr>
                             <th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>
                         <th>SL.No</th>
-                        <th>Document Fee Paid Date</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Document Fee Paid Date</th>
                         <th>Enrollment ID</th>
                         <th>Student Name</th>
                         <th>Father Name</th>
@@ -146,8 +146,8 @@ td,th {
                         <th>Phone No</th>
                         <th>University</th>
                         <th>Balance Fee</th>
-                        <th>Certificates Name</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Certificates Name</th>
-                        <th>Certificates Status</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Certificates Status</th>
                         <th>Date</th>
                  
                     </tr>

Apollo/assets/views/report_document_pending.html

@@ -37,9 +37,9 @@ td,th {
                         <div class="row">
                             
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label >
                                     University
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
@@ -51,9 +51,9 @@ td,th {
                             </div>
 
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     Batch
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>

Apollo/assets/views/report_exam_writing_fee.html

@@ -13,7 +13,7 @@
 	  th{
 	  text-align:center;
 	  }
-	   .table>tbody>tr>td { padding: 2px; }
+	   .table>tbody>tr>td { padding: 10px; }
         /* .sort-icon {
             font-size: 9px;
             margin-left: 5px;
@@ -37,9 +37,9 @@
                             <div class="row">
                                 
                                <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     University
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
@@ -51,9 +51,9 @@
                             </div>
 
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     Batch
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>

Apollo/assets/views/report_lead.html

@@ -13,7 +13,7 @@ td,th {
 	  th{
 	  text-align:center;
 	  }
-	   .table>tbody>tr>td { padding: 2px; }
+	   .table>tbody>tr>td { padding: 10px; }
     /* .sort-icon {
         font-size: 9px;
         margin-left: 5px;

Apollo/assets/views/report_mark_certificate_status.html

@@ -37,9 +37,9 @@ td,th {
                         <div class="row">
                             
                             <div class="col-md-4">
-                                <label for="form-field-select-2">
+                                <label>
                                     University
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
@@ -51,9 +51,9 @@ td,th {
                             </div>
 
                             <div class="col-md-4">
-                                <label for="form-field-select-2">
+                                <label>
                                     Batch
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
@@ -65,7 +65,7 @@ td,th {
                         </div>
                         <div class="row">
                             <div class="col-md-4">
-                                <!--<pre>{{searchData.date}}</pre>-->
+                                <!--<pre>{{searchData.date}}</pre>--> 
                                 <div data-ng-controller="DatepickerDemoCtrl">
                                     <label>
                                            From Date 

Apollo/assets/views/report_markcardstatus.html

@@ -25,9 +25,9 @@
                         <div class="row">
 
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     University
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
@@ -39,9 +39,9 @@
                             </div>
 
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     Batch
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
@@ -98,7 +98,7 @@
                     <tr>
                             <th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>
                         <th>SL.No</th>
-                        <th>Intial Payment Paid Date</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Intial Payment Paid Date</th>
                         <th>Enrollment ID</th>
                         <th>Student Name</th>
                         <th>Roll NO</th>
@@ -108,8 +108,8 @@
                         <th>Phone No</th>
                         <th>University</th>
                         <th>Balance Fee</th>
-						<th>Application Sent Date</th>
+						<th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Application Sent Date</th>
-						<th>Answer Booklet Sent Date</th>
+						<th style=" white-space: pre-wrap;text-align:left;width: 100px;"!important>Answer Booklet Sent Date</th>
                         <th>Mark Card Status</th>
                         <th>Date</th>
                  

Apollo/assets/views/report_studymaterialstatus.html

@@ -7,12 +7,10 @@
     </div>
 </section>
 <style>
-     td,th {
+     td {
 	  white-space: nowrap;
 	  }
-	  th{
+	 
-	  text-align:center;
-	  }
 	   .table>tbody>tr>td { padding: 2px; }
 </style>
 
@@ -25,9 +23,9 @@
                         <div class="row">
 
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label >
                                     University
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
@@ -39,9 +37,9 @@
                             </div>
 
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label >
                                     Batch
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>
@@ -87,7 +85,7 @@
                    <tr>
                         <th><input type="checkbox" ng-model="myModel.all" id="all" name="all" ng-click="isCheckAll($event);"></th>
                         <th>SL.No</th>
-                        <th>Initial Payment Paid Date</th>
+                        <th style=" white-space: pre-wrap;text-align:left;width: 100px;">Initial Payment Paid Date</th>
                         <th>Enrollment ID</th>
                         <th>Student Name</th>
                         <th>Father Name</th>

Apollo/assets/views/report_waiver_referal.html

@@ -13,7 +13,7 @@
 	  th{
 	  text-align:center;
 	  }
-	   .table>tbody>tr>td { padding: 2px; }
+	   .table>tbody>tr>td { padding: 10px; }
     /* .sort-icon {
         font-size: 9px;
         margin-left: 5px;
@@ -35,9 +35,9 @@
                         <div class="row">
                             
                               <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     University
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="1" class="cs-select cs-skin-elastic" name="university" ng-model="univModel.university" required>
                                     <option value="" selected>Select University</option>
@@ -49,9 +49,9 @@
                             </div>
 
                             <div class="col-md-3">
-                                <label for="form-field-select-2">
+                                <label>
                                     Batch
-                                </label>
+                                </label><br>
 
                                 <select ui-select2 class="form-control" tabindex="2" class="cs-select cs-skin-elastic" name="batch" ng-model="univModel.batch" required>
                                     <option value="" selected>Select Batch</option>