diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index afbfb321..dba40078 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -248,7 +248,7 @@ left join 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 -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 and scd.branch=sms.branch +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 sms.branch = '".$br."' "; @@ -271,7 +271,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } - $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year"; $leadDet=$this->db->query($sql); @@ -320,12 +320,14 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } 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 + $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,listdate.rcvedate + from (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,AnsDate as adate,Sem as sem FROM T_AnswerBookletStatus WHERE ID IN (SELECT max(ID) FROM T_AnswerBookletStatus group by StudentID,CourseID,BranchCode,Sem) group by sid,sem,cid,lcode,branch) 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 FROM T_Students_Fees_Status @@ -350,7 +352,15 @@ left join 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 -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 and scd.branch=sms.branch +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, +max(if(ListName = 'ISSUED TO STUDENT', AnsDate,'-')) as issuedate, +max(if(ListName = 'RECEIVED FROM STUDENT', AnsDate,'-')) as rcvedate +from T_AnswerBookletStatus abs +left join T_PickListDetails list on list.ListCode=abs.ListCode where AnsDate is not null +group by sid +) as listdate on listdate.sid=sms.sid where std.active = 1 and sms.branch = '".$br."' "; @@ -364,7 +374,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem,Sem_year"; @@ -383,12 +393,13 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function app_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(sms.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,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 Admission_date, + $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(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.status,'-') as Status,ifnull(sfp.bdate,'-') as Admission_date, ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber from - (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app + (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,list.ListName as status,app.ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType -where CertificateName = 'APPLICATION' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode) +left join T_PickListDetails list on list.ListCode=app.ListCode +where CertificateName like 'APPLICATION%' and list.ListName != 'SENT TO UNIVERSITY' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode) group by sid,cid,lcode,branch) 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 @@ -402,9 +413,6 @@ WHERE IsActive = 1 and ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails gr as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid left join (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sfs.cid and cfd.cid=sfs.ftype -left join - (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) - as list on list.lcode=sms.lcode left join (SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course, UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm @@ -428,7 +436,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by Student_id,Course_id,Batch_code,Branch_code"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem_year"; @@ -447,44 +455,51 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function doc_pending($bat=null,$br=null,$u=null){ - $sql = "SELECT ifnull(sdt.StudentID,'-') as Student_id,ifnull(scd.eid,'-') as Enrollment_id,ifnull(sfb.bdate,'-') as Admission_date,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(lt.CreatedBranch,'-') as Branch_code,ifnull(sfb.batch,'-') as Batch_code,ifnull(lt.Course,'-') as Course_name,ifnull(lt.University,'-') as University,ifnull(uc.cid,'-') as Course_id,ifnull(cfd.syear,'-') as Sem_year,ifnull(sdt.StatusName,'-') as Status,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber - FROM T_Student_DocumentTrack_Details as sdt - join T_Lead_Tracking as lt on lt.PendingDocStatus=sdt.ID - 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=sdt.StudentID - left join + $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(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.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.adate, + ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber + from + (SELECT ID,StudentID as sid,CourseID as cid,app.BranchCode as branch,list.ListName as status,app.ListCode as lcode,AppDate as adate,Comments as acmts,CertificationType as ctype,CertificateName as certname FROM T_ApplicationStatus as app +left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType +left join T_PickListDetails list on list.ListCode=app.ListCode +where list.ListName = 'PENDING' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode) +group by sid,cid,lcode,branch) 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 + FROM T_Students_Fees_Status + group by sid,fid,cid,batch) + as sfs on sfs.sid=sms.sid and sms.cid=sfs.cid +left join + (SELECT ID,StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails +WHERE IsActive = 1 and ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails group by StudentID,FeesID) + group by sid,fid,billno) + as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid +left join + (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=sfs.cid and cfd.cid=sfs.ftype +left join (SELECT CourseID as cid,cm.UniversityID as cuid,u.UniversityID as uid,CourseName as course, - UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm - left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID - group by cid - order by CourseID) as uc on uc.course=lt.Course - left join - (SELECT ID as cid,CourseID as ccid,FeesType as ftype,Sem_Year as syear FROM T_Course_Fees_Details) as cfd on cfd.ccid=uc.cid - left join - (select sfp.sid,sfp.bdate,sfs.batch,sfs.cid from (SELECT ID,StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails - WHERE IsActive = 1 and ID IN (SELECT min(ID) FROM T_Students_Fees_PaidDetails group by StudentID,FeesID) - group by sid,fid,billno) as sfp - 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 - FROM T_Students_Fees_Status - group by sid,fid,cid,batch) as sfs on sfs.fid=sfp.fid and sfs.sid=sfp.sid - group by sfs.sid,sfs.cid) as sfb on sfb.sid=sdt.StudentID and sfb.cid=uc.cid - 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=sdt.StudentID and scd.cid=uc.cid and scd.branch=uc.branch - where std.active = 1 and lt.CreatedBranch = '".$br."' + UniversityName as uname,cm.BranchCode as branch FROM T_CourseMaster as cm + left join T_UniversityMaster as u on u.UniversityID=cm.UniversityID + 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 +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 and scd.branch=sms.branch + where std.active = 1 and sms.branch = '".$br."' "; if ($bat!= ''){ - $sql.=" and sfb.batch = '".$bat."'"; + $sql.=" and sfs.batch = '".$bat."'"; } if ($u!= ''){ - $sql.=" and uc.cuid = '".$u."'"; + $sql.=" and cm.uid = '".$u."'"; } - $sql.="group by Student_id,Course_id,Batch_code,Branch_code "; + $sql.="group by Student_id,Course_id,Batch_code,Branch_code,Sem_year "; @@ -503,9 +518,9 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen } public function wav_ref($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(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(scd.branch,'-') as Branch_code,ifnull(sfs.cid,'-') as Course_id,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,ifnull(sms.waiver_bill,'-') as Waiver_bill,ifnull(sms.waiver,0) as Waiver_amount,ifnull(sms.referal_bill,'-') as Referal_bill,ifnull(sms.referal,0) as Referal_amount,ifnull(sms.cmts,'-') as Comments,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(cfd.syear,'-') as Sem_year,ifnull(sfs.batch,'-') as Batch_code,ifnull(scd.branch,'-') as Branch_code,ifnull(sfs.cid,'-') as Course_id,ifnull(cm.course,'-') as Course_name,ifnull(cm.uname,'-') as University,staff.FirstName as staffname,ifnull(sms.waiver_bill,'-') as Waiver_bill,ifnull(sms.waiver,0) as Waiver_amount,ifnull(sms.referal_bill,'-') as Referal_bill,ifnull(sms.referal,0) as Referal_amount,ifnull(sms.cmts,'-') as Comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber from - (SELECT StudentID as sid,CommentsForStudent as cmts,FeesId as fid, + (SELECT StudentID as sid,CreatedBy as lid,CommentsForStudent as cmts,FeesId as fid, IF(ModeOfPayment = 'WAIVER', BillNO,'-') AS waiver_bill, IF(ModeOfPayment = 'WAIVER', sum(BillAmount), 0) AS waiver, IF(ModeOfPayment = 'REFERRAL', BillNO,'-') AS referal_bill, @@ -529,6 +544,10 @@ left join 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 +left join + T_Login as login on login.ID=sms.lid +left join + T_StaffDetails as staff on staff.StaffID=login.StaffID where std.active = 1 and scd.branch = '".$br."' "; @@ -543,7 +562,7 @@ left join $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Waiver_bill,Referal_bill"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Waiver_bill,Referal_bill,Sem_year"; @@ -598,7 +617,7 @@ left join $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by Student_id,Course_id,Batch_code,Branch_code"; + $sql.=" group by Student_id,Course_id,Batch_code,Branch_code,Sem_year"; @@ -617,7 +636,7 @@ left join } public function balfee($bat=null,$br=null,$u=null){ - $sql = "SELECT ifnull(sfp.StudentID,'-') as Student_id,ifnull(scd.eid,'-') as eid,ifnull(std.name,'-') as Student_name,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.cid,'-') as Course_id,ifnull(cm.course,'-') as Course_name,ifnull(u.uname,'-') as University,ifnull(sfs.branch,'-') as Branch_code,ifnull(cfd.syear,'-') as Sem_year,ifnull((sfs.cf + sfs.stf + sfs.others),0) as Total,ifnull((sfb.bamount),0) as Paid_fee,ifnull(((sfs.cf + sfs.stf + sfs.others) - (sfb.bamount)),0) as balance, + $sql = "SELECT ifnull(sfp.StudentID,'-') as Student_id,ifnull(scd.eid,'-') as eid,ifnull(std.name,'-') as Student_name,date_format(std.regdate,'%d-%m-%Y') as regdate,ifnull(std.father,'-') as Father_name,ifnull(std.phone,'-') as Phone_number,ifnull(sfs.batch,'-') as Batch_code,ifnull(sfs.cid,'-') as Course_id,ifnull(cm.course,'-') as Course_name,ifnull(u.uname,'-') as University,ifnull(sfs.branch,'-') as Branch_code,ifnull(cfd.syear,'-') as Sem_year,ifnull((sfs.cf + sfs.stf + sfs.others),0) as Total,ifnull((sfb.bamount),0) as Paid_fee,ifnull(((sfs.cf + sfs.stf + sfs.others) - (sfb.bamount)),0) as balance, 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, @@ -652,7 +671,7 @@ left join (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u on u.uid=cm.uid left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father,IsActive as active,PermanentAddress as address,AlternateNumber FROM T_StudentDetails where IsActive = 1) as std on std.sid=sfp.StudentID + (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father,IsActive as active,PermanentAddress as address,AlternateNumber,CreatedOn as regdate FROM T_StudentDetails where IsActive = 1) as std on std.sid=sfp.StudentID left join (SELECT BatchCode as bcode,BatchName as batchname FROM T_BatchMaster) as b on b.bcode=sfs.batch left join @@ -660,7 +679,7 @@ left join left join (SELECT StudentID as sid,FeesID as fid,BillNo as billno,sum(BillAmount) as bamount FROM T_Students_Fees_PaidDetails where IsActive = 1 group by sid,fid) as sfb on sfb.sid=sfp.StudentID and sfb.fid=sfp.FeesID -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=sfs.sid and scd.cid=sfs.cid and scd.branch=sfs.branch +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=sfs.sid where sfp.IsActive = 1 and br.brcode = '".$br."' "; diff --git a/Apollo/assets/js/controllers/report_balfeeCtrl.js b/Apollo/assets/js/controllers/report_balfeeCtrl.js index eb86cf8f..ba6b960c 100755 --- a/Apollo/assets/js/controllers/report_balfeeCtrl.js +++ b/Apollo/assets/js/controllers/report_balfeeCtrl.js @@ -121,6 +121,33 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", } }); + + $scope.gettotal = function(){ + var totalfee = 0; + for(var i = 0; i < $scope.balfee_data.length; i++){ + var item = $scope.balfee_data[i]; + totalfee += parseFloat(item.Total); + } + return totalfee; } + $scope.getpaid = function(){ + var totalpaid = 0; + for(var i = 0; i < $scope.balfee_data.length; i++){ + var item = $scope.balfee_data[i]; + totalpaid += parseFloat(item.Paid_fee); + } + return totalpaid; } + + $scope.getbalance = function(){ + var totalbalance=0; + for(var i = 0; i < $scope.balfee_data.length; i++){ + var item = $scope.balfee_data[i]; + totalbalance += parseFloat(item.balance); + + } + return totalbalance; } + + + } @@ -143,7 +170,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal", $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,eid 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 as University,CAST(Total AS NUMBER) as TotalFee,CAST(Paid_fee AS NUMBER) as FeesPaid,CAST(balance AS NUMBER) as Balance,billno1 as BillNO1,CAST(billamt1 AS NUMBER) as BillAmount1,billno2 as BillNO2,CAST(billamt2 AS NUMBER) as BillAmount2, billno3 as BillNO3, CAST(billamt3 AS NUMBER) as BillAmount3, billno4 as BillNO4, CAST(billamt4 AS NUMBER) as BillAmount4, billno5 as BillNO5,CAST(billamt5 AS NUMBER) as BillAmount5,billno6 as BillNO6,CAST(billamt6 AS NUMBER) as BillAmount6,billno7 as BillNo7,CAST(billamt7 AS NUMBER)as BillAmount7,billno8 as BillNO8,CAST(billamt8 AS NUMBER) as BillAmount8,billno9 as BillNO9,CAST(billamt9 AS NUMBER) as BillAmount9,billno10 as BillNO10,CAST(billamt10 AS NUMBER) as BillAmount10 INTO XLS("Balancefee_status.xls",?) FROM ?',[mystyle,$scope.balfee_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,eid 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 as University,regdate as RegistrationDate,CAST(Total AS NUMBER) as TotalFee,CAST(Paid_fee AS NUMBER) as FeesPaid,CAST(balance AS NUMBER) as Balance,billno1 as BillNO1,CAST(billamt1 AS NUMBER) as BillAmount1,billno2 as BillNO2,CAST(billamt2 AS NUMBER) as BillAmount2, billno3 as BillNO3, CAST(billamt3 AS NUMBER) as BillAmount3, billno4 as BillNO4, CAST(billamt4 AS NUMBER) as BillAmount4, billno5 as BillNO5,CAST(billamt5 AS NUMBER) as BillAmount5,billno6 as BillNO6,CAST(billamt6 AS NUMBER) as BillAmount6,billno7 as BillNo7,CAST(billamt7 AS NUMBER)as BillAmount7,billno8 as BillNO8,CAST(billamt8 AS NUMBER) as BillAmount8,billno9 as BillNO9,CAST(billamt9 AS NUMBER) as BillAmount9,billno10 as BillNO10,CAST(billamt10 AS NUMBER) as BillAmount10 INTO XLS("Balancefee_status.xls",?) FROM ?',[mystyle,$scope.balfee_data]); }; diff --git a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js index dc706e08..f032cefd 100755 --- a/Apollo/assets/js/controllers/report_doc_pendingCtrl.js +++ b/Apollo/assets/js/controllers/report_doc_pendingCtrl.js @@ -133,7 +133,7 @@ app.controller('report_doc_pendingCtrl', ["$scope", "$filter","$rootScope","$mod $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,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 as University,Status as DocumentPendingStatus INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Admission_date as AdmissionDate,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 as University,adate as DocumentAppliedDate,certname as DocumentName,Status as DocumentPendingStatus INTO XLS("Document_pending_student_list.xls",?) FROM ?',[mystyle,$scope.doc_pending_data]); }; /*modal controller * */ diff --git a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js index 2866e0eb..2c918064 100755 --- a/Apollo/assets/js/controllers/report_waiver_referalCtrl.js +++ b/Apollo/assets/js/controllers/report_waiver_referalCtrl.js @@ -114,7 +114,7 @@ app.controller('report_waiver_referalCtrl', ["$scope", "API_POINTS", "$http", "S $scope.exportData = function () { - alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,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 as University,Waiver_bill as WaiverBillNo,CAST(Waiver_amount AS NUMBER) as WaiverAmount,Referal_bill as ReferalBillNo,CAST(Referal_amount AS NUMBER) as ReferalAmount,Comments as Comments INTO XLS("Waiver_referal_report.xls",?) FROM ?',[mystyle,$scope.waiver_referal_data]); + alasql('SELECT CAST(SL_NO AS NUMBER) as SLNO,Enrollment_id as EnrollmentID,Student_name as StudentName,Father_name as FatherName,Course_name as CourseName,Sem_year as SemYear,University as University,CAST(Phone_number AS NUMBER) as PhoneNumber,staffname as Waiver/referalGivenBy,Waiver_bill as WaiverBillNo,CAST(Waiver_amount AS NUMBER) as WaiverAmount,Referal_bill as ReferalBillNo,CAST(Referal_amount AS NUMBER) as ReferalAmount,Comments as Comments INTO XLS("Waiver_referal_report.xls",?) FROM ?',[mystyle,$scope.waiver_referal_data]); }; /*modal controller * */ diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index b9455f67..e450ccf7 100755 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -7,6 +7,12 @@