From 89a5dea41683b515460a3ce9d19329321ecb1483 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Wed, 26 Sep 2018 16:14:11 +0530 Subject: [PATCH] Report changes --- .../api/application/models/Reports_model.php | 113 ++++++++++-------- .../views/report_certificate_status.html | 2 +- .../assets/views/report_markcardstatus.html | 8 +- 3 files changed, 70 insertions(+), 53 deletions(-) diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 3b2bc7e0..76fd6aa2 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -265,52 +265,69 @@ 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, -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, -max(if(ListName = 'ISSUED TO STUDENT', CDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus, -max(if(ListName = 'RECEIVED', CDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,c.Comments as acmts -from T_CertificationStatus c -left join T_Students_Fees_Status sfs on sfs.FeesType=c.CourseID and sfs.StudentID=c.StudentID -left join T_PickListDetails list on list.ListCode=c.ListCode -left join BalFees bal on bal.student=c.StudentID and bal.course=sfs.CourseID and bal.semyr=c.Sem -where CDate is not null and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' ) -group by sid,cid,sem,ctype -union -select a.ID,a.StudentID as sid,a.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,'-' as sem,ifnull(cm.CertificateName,a.CertificationType) as certname,a.CertificationType as ctype,AppDate as mdate,bal.balpayable as balance, -max(if(ListName = 'ISSUED TO STUDENT', AppDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus, -max(if(ListName = 'RECEIVED', AppDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,a.Comments as acmts -from T_ApplicationStatus a -left join -T_Students_Fees_Status sfs on sfs.StudentID=a.StudentID and sfs.CourseID=a.CourseID -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 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 - FROM T_Students_Fees_Status - group by sid,cid) - as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid -left join - (SELECT sfp.StudentID as sid,sfp.FeesId as fid,sfs.FeesType as ftype,sfs.CourseID as cid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails sfp -left join T_Students_Fees_Status sfs on sfs.FeesId=sfp.FeesId -where IsActive = 1 - group by sid,cid) - as sfb on sfb.sid=sms.sid and sfb.fid=sms.fid and (sfb.ftype=sms.cid or sfb.cid=sms.cid) - 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 cm on cm.cid=sms.cid -left join - (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 + 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, + max(if(ListName = 'ISSUED TO STUDENT', CDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus, + max(if(ListName = 'RECEIVED', CDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,c.Comments as acmts + from T_CertificationStatus c + left join T_Students_Fees_Status sfs on sfs.FeesType=c.CourseID and sfs.StudentID=c.StudentID + left join T_PickListDetails list on list.ListCode=c.ListCode + left join BalFees bal on bal.student=c.StudentID and bal.course=sfs.CourseID and bal.semyr=c.Sem + where CDate is not null and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' ) + group by sid,cid,sem,ctype + union + select a.ID,a.StudentID as sid,a.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,'-' as sem,ifnull(cm.CertificateName,a.CertificationType) as certname,a.CertificationType as ctype,AppDate as mdate,bal.balpayable as balance, + max(if(ListName = 'ISSUED TO STUDENT', AppDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus, + max(if(ListName = 'RECEIVED', AppDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,a.Comments as acmts + from T_ApplicationStatus a + left join + T_Students_Fees_Status sfs on sfs.StudentID=a.StudentID and sfs.CourseID=a.CourseID + 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 cm.CertificateName not like 'APPLICATION%' and a.ID in (select Max(a.ID) from T_ApplicationStatus a + left join T_CertificationMaster cm on cm.CertificationID=a.CertificationType + group by a.StudentID,a.CourseID,cm.CertificateName) and (list.ListName like 'ISSUED TO STUDENT' or list.ListName like 'RECEIVED%' ) + group by sid,cid,ctype + union + select a.ID,a.StudentID as sid,a.CourseID as cid,sfs.BranchCode as branch,sfs.FeesID as fid,'-' as sem,ifnull(cm.CertificateName,a.CertificationType) as certname,a.CertificationType as ctype,AppDate as mdate,bal.balpayable as balance, + max(if(ListName = 'ISSUED TO STUDENT', AppDate,'-')) as issuedate,max(if(ListName = 'ISSUED TO STUDENT', ListName,'-')) as istatus, + max(if(ListName = 'RECEIVED', AppDate,'-')) as rcvedate,max(if(ListName = 'RECEIVED', ListName,'-')) as rstatus,a.Comments as acmts + from T_ApplicationStatus a + left join + T_Students_Fees_Status sfs on sfs.StudentID=a.StudentID and sfs.CourseID=a.CourseID + 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 a.CertificationType not like 'CERT%' and a.ID in (select Max(a.ID) from T_ApplicationStatus a + left join T_CertificationMaster cm on cm.CertificationID=a.CertificationType + group by a.StudentID,a.CourseID,cm.CertificateName) 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 + FROM T_Students_Fees_Status + group by sid,cid) + as sfs on sfs.sid=sms.sid and sfs.cid=sms.cid + left join + (SELECT sfp.StudentID as sid,sfp.FeesId as fid,sfs.FeesType as ftype,sfs.CourseID as cid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails sfp + left join T_Students_Fees_Status sfs on sfs.FeesId=sfp.FeesId + where IsActive = 1 + group by sid,cid) + as sfb on sfb.sid=sms.sid and sfb.fid=sms.fid and (sfb.ftype=sms.cid or sfb.cid=sms.cid) + 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 cm on cm.cid=sms.cid + left join + (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."' "; @@ -431,7 +448,7 @@ left join if(ListName like '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 and -ID in (select max(ID) from T_AnswerBookletStatus where AnsDate is not null group by StudentID,Sem) and StudentID = 3061 +ID in (select max(ID) from T_AnswerBookletStatus where AnsDate is not null group by StudentID,Sem) group by sid,Sem ) as rdate on rdate.sid=sms.sid and rdate.sem=sms.sem left join @@ -439,7 +456,7 @@ left join if(ListName like 'ISSUED TO STUDENT', AnsDate,'-') as issuedate from T_AnswerBookletStatus abs left join T_PickListDetails list on list.ListCode=abs.ListCode where AnsDate is not null and -ID in (select min(ID) from T_AnswerBookletStatus where AnsDate is not null group by StudentID,Sem) and StudentID = 3061 +ID in (select min(ID) from T_AnswerBookletStatus where AnsDate is not null group by StudentID,Sem) group by sid,Sem) as idate on idate.sid=sms.sid and idate.sem=sms.sem left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.semyr=sms.sem where std.active = 1 and sms.branch = '".$br."' diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html index 86f48462..363702cd 100755 --- a/Apollo/assets/views/report_certificate_status.html +++ b/Apollo/assets/views/report_certificate_status.html @@ -137,7 +137,7 @@ td,th { SL.No - Document Fee Paid Date + Certificate Fee Paid Date Enrollment ID Student Name Father Name diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html index 91617fc5..d4b26f2a 100755 --- a/Apollo/assets/views/report_markcardstatus.html +++ b/Apollo/assets/views/report_markcardstatus.html @@ -100,15 +100,15 @@ SL.No Intial Payment Paid Date Enrollment ID - Student Name Roll NO + Student Name Father Name Course Sem/Year University Balance Fee - Application Sent Date - Answer Booklet Sent Date + Application Sent to Univ Date + Answer Booklet Sent to Univ Date Mark Card Status Date @@ -120,8 +120,8 @@ {{p.SL_NO}} {{p.Initial_paid_date}} {{p.Enrollment_id}} - {{p.Student_name}} {{p.Roll_NO}} + {{p.Student_name}} {{p.Father_name}} {{p.Course_name}} {{p.Sem_year}}({{p.Sem}})