diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index e63eb5ee..39da5836 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -9,36 +9,31 @@ class Reports_model extends CI_Model { public function status($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,std.name as name,std.father as father,br.bname as bname,ifnull(b.batch,'-') as batch,std.phone as phone,sms.cid as scid,sfp.bdate as bdate,sms.date as sdate,list.status as status,u.uname as uname,cm.course as course,sms.sem as sem,sfs.batch as fbatch,sfs.cid as fcid,cfd.syear as syear,sum(sfs.cf) as crsfee,sum(sfs.stf) as stf,sum(sfs.others) as others,(sum(sfs.cf) + sum(sfs.stf) + sum(sfs.others)) as total,ifnull(sfp.bamount,0) as bamount,(sum(sfs.cf) + (sum(sfs.stf) + sum(sfs.others)) - ifnull(sfp.bamount,0)) as balance + $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,std.father,std.phone,sms.cid as scid,sms.lcode,sms.date as sdate,cfd.syear,sms.sem as sem,sfs.batch as fbatch,cm.course,cm.uname,list.status,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sum(sfp.bamount) as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as balance from (SELECT @s:= 0) AS s, - (SELECT StudentID as sid,CourseID as cid,ListCode as lcode,BranchCode as branch,SDate as date,Sem as sem FROM T_StudyMaterialStatus - group by sid,sem) as sms + (SELECT ID,StudentID as sid,CourseID as cid,ListCode as lcode,BranchCode as branch,SDate as date,Sem as sem FROM T_StudyMaterialStatus where ID in (SELECT max(ID) FROM T_StudyMaterialStatus group by StudentID,CourseID,BranchCode,Sem) + group by sid,sem,cid,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,batch) as sfs on sfs.sid=sms.sid + group by sid,fid,cid,batch) as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype left join - (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount - FROM T_Students_Fees_PaidDetails - group by sid,fid,bdate) as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid + (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails +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.cid=sms.cid - left join - (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm - on cm.cid=sfs.cid - left join - (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u - on u.uid=cm.uid 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 +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,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid - left join - (SELECT BatchCode as bcode,BatchName as batch FROM T_BatchMaster) as b on b.bcode=sfs.batch - left join - (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sms.branch - where std.name != 'null' + where sms.sid != 'null' "; if ($br!= ''){ @@ -47,15 +42,15 @@ class Reports_model extends CI_Model } if ($bat!= ''){ - $sql.=" and b.bcode = '".$bat."'"; + $sql.=" and sfs.batch = '".$bat."'"; } if ($u!= ''){ - $sql.=" and u.uid = '".$u."'"; + $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by ssid,sem,fbatch"; + $sql.=" group by ssid,scid,fbatch,lcode,fbatch,fid,sem"; $sql.=" order by sl"; $leadDet=$this->db->query($sql); $statusDetails = $leadDet->result(); @@ -107,35 +102,32 @@ class Reports_model extends CI_Model } public function markcard($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,std.name as name,std.father as father,br.bname as bname,ifnull(b.batch,'-') as batch,std.phone as phone,sms.cid as scid,sfp.bdate as bdate,list.status as status,u.uname as uname,cm.course as course,sms.sem as sem,sms.cdate as cdate,sfs.batch as fbatch,sfs.cid as fcid,cfd.syear as syear,sum(sfs.cf) as crsfee,sum(sfs.stf) as stf,sum(sfs.others) as others,(sum(sfs.cf) + sum(sfs.stf) + sum(sfs.others)) as total,ifnull(sfp.bamount,0) as bamount,(sum(sfs.cf) + (sum(sfs.stf) + sum(sfs.others)) - ifnull(sfp.bamount,0)) as balance - from - (SELECT StudentID as sid,CourseID as cid,BranchCode as branch,CDate as cdate,ListCode as lcode,Comments as cmts,Sem as sem FROM T_CertificationStatus) as sms + $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,sms.ctype,std.father,std.phone,sms.cid as scid,sms.lcode,sms.cdate as sdate,cfd.syear,sms.sem as sem,sfs.batch as fbatch,cm.course,cm.uname,list.status,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sum(sfp.bamount) as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as balance + from (SELECT @s:= 0) AS s, + (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,CertificationType as ctype,CDate as cdate,Sem as sem FROM T_CertificationStatus +WHERE ID IN (SELECT max(ID) FROM T_CertificationStatus 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 - group by sid,batch) as sfs on sfs.sid=sms.sid + group by sid,fid,cid,batch) as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype left join - (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount - FROM T_Students_Fees_PaidDetails, (SELECT @s:= 0) AS s - group by sid,fid,bdate) as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid + (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails +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.cid=sms.cid - left join - (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm - on cm.cid=sfs.cid - left join - (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u - on u.uid=cm.uid 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 +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,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid - left join - (SELECT BatchCode as bcode,BatchName as batch FROM T_BatchMaster) as b on b.bcode=sfs.batch - left join - (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sms.branch - where std.name != 'null' + where sms.sid != 'null' "; if ($br!= ''){ @@ -152,7 +144,7 @@ class Reports_model extends CI_Model $sql.=" and u.uid = '".$u."'"; } - $sql.=" group by ssid,sem,fbatch"; + $sql.=" group by ssid,scid,fbatch,lcode,fbatch,fid,sem"; $sql.=" order by sl"; $leadDet=$this->db->query($sql); $mstatusDetails = $leadDet->result(); @@ -169,35 +161,33 @@ class Reports_model extends CI_Model } public function certificate_status($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,std.name as name,std.father as father,br.bname as bname,ifnull(b.batch,'-') as batch,std.phone as phone,sms.cid as scid,sfp.bdate as bdate,list.status as status,u.uname as uname,cm.course as course,sms.cert_name as cert_name,sms.sem as sem,sms.cdate as cdate,sfs.batch as fbatch,sfs.cid as fcid,cfd.syear as syear,sum(sfs.cf) as crsfee,sum(sfs.stf) as stf,sum(sfs.others) as others,(sum(sfs.cf) + sum(sfs.stf) + sum(sfs.others)) as total,ifnull(sfp.bamount,0) as bamount,(sum(sfs.cf) + (sum(sfs.stf) + sum(sfs.others)) - ifnull(sfp.bamount,0)) as balance - from - (SELECT StudentID as sid,CourseID as cid,CertificationType as cert_name,BranchCode as branch,CDate as cdate,ListCode as lcode,Comments as cmts,Sem as sem FROM T_CertificationStatus) as sms + $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,sms.certname,std.father,std.phone,sms.cid as scid,sms.lcode,sms.adate as adate,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,list.status,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sum(sfp.bamount) as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as balance + from (SELECT @s:= 0) AS s, + (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 +left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType +where CertificationType != 'CERT024' 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,batch) as sfs on sfs.sid=sms.sid + group by sid,fid,cid,batch) as sfs on sfs.sid=sms.sid and sms.cid=sfs.cid left join - (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount - FROM T_Students_Fees_PaidDetails, (SELECT @s:= 0) AS s - group by sid,fid,bdate) as sfp on sfp.sid=sfs.sid and sfp.fid=sfs.fid + (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails +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.cid=sms.cid - left join - (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm - on cm.cid=sfs.cid - left join - (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u - on u.uid=cm.uid + on cfd.ccid=sms.cid 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 +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,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid - left join - (SELECT BatchCode as bcode,BatchName as batch FROM T_BatchMaster) as b on b.bcode=sfs.batch - left join - (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sms.branch - where std.name != 'null' + where sms.sid != 'null' "; if ($br!= ''){ @@ -214,7 +204,7 @@ class Reports_model extends CI_Model $sql.=" and u.uid = '".$u."'"; } - $sql.=" group by ssid,sem,fbatch"; + $sql.=" group by ssid,scid,fbatch,lcode,fbatch,fid"; $sql.=" order by sl"; $leadDet=$this->db->query($sql); $cert_statusDetails = $leadDet->result(); @@ -231,35 +221,48 @@ class Reports_model extends CI_Model } public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,std.name as name,std.father as father,br.bname as bname,ifnull(b.batch,'-') as batch,std.phone as phone,sms.cmts as cmts,sms.cid as scid,sfp.bdate as bdate,list.status as status,u.uname as uname,cm.course as course,sms.cert_name as cert_name,sms.sem as sem,sms.cdate as cdate,sfs.batch as fbatch,sfs.cid as fcid,cfd.syear as syear,sum(sfs.cf) as crsfee,sum(sfs.stf) as stf,sum(sfs.others) as others,(sum(sfs.cf) + sum(sfs.stf) + sum(sfs.others)) as total,ifnull(sfp.bamount,0) as bamount,(sum(sfs.cf) + (sum(sfs.stf) + sum(sfs.others)) - ifnull(sfp.bamount,0)) as balance - from - (SELECT StudentID as sid,CourseID as cid,CertificationType as cert_name,BranchCode as branch,CDate as cdate,ListCode as lcode,Comments as cmts,Sem as sem FROM T_CertificationStatus) 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,batch) as sfs on sfs.sid=sms.sid - left join - (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount - FROM T_Students_Fees_PaidDetails, (SELECT @s:= 0) AS s - group by sid,fid,bdate) 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.cid=sms.cid - left join - (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm - on cm.cid=sfs.cid - left join - (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u - on u.uid=cm.uid - left join - (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) as list - on list.lcode=sms.lcode - left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid - left join - (SELECT BatchCode as bcode,BatchName as batch FROM T_BatchMaster) as b on b.bcode=sfs.batch - left join - (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sms.branch - where std.name != 'null' + $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,ams.certname,sms.ccmts,ams.acmts,std.father,std.phone,sms.cid as scid,sms.lcode,sms.cdate,ams.adate as adate,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,sms.sem,list.status,alist.astatus,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sfp.bamount as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sfp.bamount) as balance + from (SELECT @s:= 0) AS s, + (SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode, + CertificationType as ctype,CDate as cdate,Sem as sem,Comments as ccmts + FROM T_CertificationStatus + WHERE ID IN (SELECT max(ID) FROM T_CertificationStatus group by StudentID,CourseID,BranchCode,Sem) + group by sid,sem,cid,lcode,branch) as sms +left join + (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 + left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType + where CertificationType != 'CERT024' and ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode) + group by sid,cid,lcode,branch) + as ams on ams.branch=sms.branch and ams.sid=sms.sid +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.ftype +left join + (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails + 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.cid=sms.cid +left join + (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) + as list on list.lcode=sms.lcode +left join + (SELECT ListCode as lcode,ListName as astatus FROM T_PickListDetails) + as alist on alist.lcode=ams.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 + 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,FirstName as name,Fathername as father + FROM T_StudentDetails) as std on std.sid=sms.sid + where sms.sid != 'null' "; if ($br!= ''){ @@ -273,7 +276,7 @@ class Reports_model extends CI_Model } if ($u!= ''){ - $sql.=" and u.uid = '".$u."'"; + $sql.=" and cm.uid = '".$u."'"; } if ($from and $to != ''){ @@ -284,7 +287,7 @@ class Reports_model extends CI_Model and sms.cdate <= '".$tod."'"; } - $sql.=" group by ssid,sem,fbatch"; + $sql.=" group by ssid,scid,fbatch,fbatch,fid,sem"; $sql.=" order by sl"; $leadDet=$this->db->query($sql); @@ -304,7 +307,7 @@ class Reports_model extends CI_Model $sql = "SELECT dbm.Date as date,exp.TypeName as exp_name,sum(dbm.Amount) as amount FROM T_Income_Outcome_Master exp join T_DayBookMaster dbm on dbm.Type=exp.ID - where dbm.Name = 'I001' + where dbm.Name = 'I001' and dbm.Status = 'Approved' "; if ($from and $to != ''){ @@ -333,35 +336,37 @@ class Reports_model extends CI_Model } public function answer_booklet($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,std.name as name,std.father as father,br.bname as bname,ifnull(b.batch,'-') as batch,std.phone as phone,sms.cmts as cmts,sms.cid as scid,sfp.bdate as bdate,list.status as status,u.uname as uname,cm.course as course,sms.sem as sem,sms.adate as adate,sfs.batch as fbatch,sfs.cid as fcid,cfd.syear as syear,sum(sfs.cf) as crsfee,sum(sfs.stf) as stf,sum(sfs.others) as others,(sum(sfs.cf) + sum(sfs.stf) + sum(sfs.others)) as total,ifnull(sfp.bamount,0) as bamount,(sum(sfs.cf) + (sum(sfs.stf) + sum(sfs.others)) - ifnull(sfp.bamount,0)) as balance - from - (SELECT StudentID as sid,CourseID as cid,BranchCode as branch,AnsDate as adate,ListCode as lcode,Comments as cmts,Sem as sem FROM T_AnswerBookletStatus) 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,batch) as sfs on sfs.sid=sms.sid - left join - (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount - FROM T_Students_Fees_PaidDetails, (SELECT @s:= 0) AS s - group by sid,fid,bdate) 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.cid=sms.cid - left join - (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm - on cm.cid=sfs.cid - left join - (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u - on u.uid=cm.uid - left join - (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) as list - on list.lcode=sms.lcode - left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid - left join - (SELECT BatchCode as bcode,BatchName as batch FROM T_BatchMaster) as b on b.bcode=sfs.batch - left join - (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sms.branch - where std.name != 'null' + $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,std.father,std.phone,sms.cid as scid,sms.sem,sms.lcode,sms.adate as adate,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,list.status,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sum(sfp.bamount) as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as balance + from (SELECT @s:= 0) AS s, + (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 + group by sid,fid,cid,batch) + as sfs on sfs.sid=sms.sid and sms.cid=sfs.ftype +left join + (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount,BillNO as billno FROM T_Students_Fees_PaidDetails + 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.cid=sms.cid +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 + 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,FirstName as name,Fathername as father + FROM T_StudentDetails) as std on std.sid=sms.sid + where sms.sid != 'null' "; if ($br!= ''){ @@ -376,10 +381,10 @@ class Reports_model extends CI_Model } if ($u!= ''){ - $sql.=" and u.uid = '".$u."'"; + $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by ssid,sem,fbatch"; + $sql.=" group by ssid,scid,fbatch,lcode,fbatch,fid,sem"; $sql.=" order by sl"; @@ -398,35 +403,38 @@ class Reports_model extends CI_Model } public function app_pending($bat=null,$br=null,$u=null){ - $sql = " select @s:=@s+1 sl,sms.sid as ssid,std.name as name,std.father as father,br.bname as bname,ifnull(b.batch,'-') as batch,std.phone as phone,sms.cmts as cmts,sms.cid as scid,sfp.bdate as bdate,list.status as status,u.uname as uname,cm.course as course,sms.adate as adate,sfs.batch as fbatch,sfs.cid as fcid,cfd.syear as syear,sum(sfs.cf) as crsfee,sum(sfs.stf) as stf,sum(sfs.others) as others,(sum(sfs.cf) + sum(sfs.stf) + sum(sfs.others)) as total,ifnull(sfp.bamount,0) as bamount,(sum(sfs.cf) + (sum(sfs.stf) + sum(sfs.others)) - ifnull(sfp.bamount,0)) as balance - from - (SELECT StudentID as sid,CourseID as cid,BranchCode as branch,AppDate as adate,ListCode as lcode,Comments as cmts FROM T_ApplicationStatus) 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,batch) as sfs on sfs.sid=sms.sid - left join - (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount - FROM T_Students_Fees_PaidDetails, (SELECT @s:= 0) AS s - group by sid,fid,bdate) 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.cid=sms.cid - left join - (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm - on cm.cid=sfs.cid - left join - (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u - on u.uid=cm.uid - left join - (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) as list - on list.lcode=sms.lcode - left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid - left join - (SELECT BatchCode as bcode,BatchName as batch FROM T_BatchMaster) as b on b.bcode=sfs.batch - left join - (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sms.branch - where std.name != 'null' + $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,std.father,std.phone,sms.cid as scid,sms.lcode,sms.adate as adate,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,list.status,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sum(sfp.bamount) as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as balance + from (SELECT @s:= 0) AS s, + (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 +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) +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 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 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 + 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,FirstName as name,Fathername as father + FROM T_StudentDetails) as std on std.sid=sms.sid + where sms.sid != 'null' "; if ($br!= ''){ @@ -441,10 +449,10 @@ class Reports_model extends CI_Model } if ($u!= ''){ - $sql.=" and u.uid = '".$u."'"; + $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by ssid,fbatch"; + $sql.=" group by ssid,scid,fbatch,lcode,fbatch,fid"; $sql.=" order by sl"; @@ -463,36 +471,38 @@ class Reports_model extends CI_Model } public function doc_pending($bat=null,$br=null,$u=null){ - $sql = "select @s:=@s+1 sl,sms.sid as ssid,std.name as name,std.father as father,br.bname as bname,ifnull(b.batch,'-') as batch,std.phone as phone,sms.cmts as cmts,sms.cid as scid,sfp.bdate as bdate,list.status as status,u.uname as uname,cm.course as course,sms.adate as adate,sfs.batch as fbatch,sfs.cid as fcid,cfd.syear as syear,sum(sfs.cf) as crsfee,sum(sfs.stf) as stf,sum(sfs.others) as others,(sum(sfs.cf) + sum(sfs.stf) + sum(sfs.others)) as total,ifnull(sfp.bamount,0) as bamount,(sum(sfs.cf) + (sum(sfs.stf) + sum(sfs.others)) - ifnull(sfp.bamount,0)) as balance, - (SELECT BillDate FROM T_Students_Fees_PaidDetails order by date(BillDate) limit 0,1) AS addate - from - (SELECT StudentID as sid,CourseID as cid,BranchCode as branch,AppDate as adate,ListCode as lcode,Comments as cmts FROM T_ApplicationStatus) 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,batch) as sfs on sfs.sid=sms.sid - left join - (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount - FROM T_Students_Fees_PaidDetails, (SELECT @s:= 0) AS s - group by sid,fid,bdate) 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.cid=sms.cid - left join - (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm - on cm.cid=sfs.cid - left join - (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u - on u.uid=cm.uid - left join - (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) as list - on list.lcode=sms.lcode - left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid - left join - (SELECT BatchCode as bcode,BatchName as batch FROM T_BatchMaster) as b on b.bcode=sfs.batch - left join - (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sms.branch - where std.name != 'null' + $sql = "select @s:=@s+1 sl,sms.sid as ssid,sfp.fid,std.name,std.father,std.phone,sms.cid as scid,sms.lcode,sms.adate as adate,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,list.status,sfs.cid as fcid,sfs.cf as crsfee,sfs.stf as stf,sfs.others as others,(sfs.cf + sfs.stf + sfs.others) as total,sum(sfp.bamount) as bamount,sfp.bdate as bdate,sfp.billno,((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)) as balance + from (SELECT @s:= 0) AS s, + (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 +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) +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 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 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 + 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,FirstName as name,Fathername as father + FROM T_StudentDetails) as std on std.sid=sms.sid + where sms.sid != 'null' "; if ($br!= ''){ @@ -507,10 +517,10 @@ class Reports_model extends CI_Model } if ($u!= ''){ - $sql.=" and u.uid = '".$u."'"; + $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by ssid,fbatch"; + $sql.=" group by ssid,scid,fbatch,lcode,fbatch,fid"; $sql.=" order by sl"; @@ -529,43 +539,39 @@ class Reports_model extends CI_Model } public function wav_ref($bat=null,$br=null,$u=null){ - $sql = " select @s:=@s+1 sl,sms.sid as ssid,std.name as name,std.father as father,br.bname as bname,ifnull(b.batch,'-') as batch,std.phone as phone,sfp.cmts as cmts,u.uname as uname,cm.course as course,sfs.batch as fbatch,sfs.cid as fcid,cfd.syear as syear,sfp.waiver_bill as wbill,sfp.waiver as wamount,sfp.referal_bill as rbill,sfp.referal as ramount - from - (SELECT StudentID as sid,CourseID as cid,BranchCode as branch,AppDate as adate,ListCode as lcode,Comments as cmts FROM T_ApplicationStatus - - ) 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,batch) as sfs on sfs.sid=sms.sid - left join - (SELECT StudentID as sid,CommentsForStudent as cmts,FeesId as fid, + $sql = "select @s:=@s+1 sl,sms.sid as ssid,std.name,std.father,std.phone,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,sfs.cid as scid,sms.waiver_bill,sms.waiver,sms.referal_bill,sms.referal,sms.cmts + from (SELECT @s:= 0) AS s, + (SELECT StudentID as sid,CommentsForStudent as cmts,FeesId as fid, IF(ModeOfPayment = 'WAIVER', BillNO,0) AS waiver_bill, IF(ModeOfPayment = 'WAIVER', sum(BillAmount), 0) AS waiver, IF(ModeOfPayment = 'REFERRAL', BillNO, 0) AS referal_bill, - IF(ModeOfPayment = 'REFERRAL', sum(BillAmount), 0) AS referal FROM T_Students_Fees_PaidDetails, (SELECT @s:= 0) AS s - group by waiver_bill,referal_bill) 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.cid=sfs.cid - left join - (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm - on cm.cid=sfs.cid - 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 FROM T_StudentDetails) as std on std.sid=sms.sid - left join - (SELECT BatchCode as bcode,BatchName as batch FROM T_BatchMaster) as b on b.bcode=sfs.batch - left join - (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sms.branch - where std.name != 'null' + IF(ModeOfPayment = 'REFERRAL', sum(BillAmount), 0) AS referal FROM T_Students_Fees_PaidDetails + group by waiver_bill,referal_bill) as sms +left join + (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype FROM T_Students_Fees_Status + group by sid,cid,batch) as sfs on sfs.sid=sms.sid and sfs.fid=sms.fid +left join + (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sfs.cid + +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=scd.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 cm on cm.cid=cfd.ccid +left join + (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father + FROM T_StudentDetails) as std on std.sid=sms.sid + where sms.sid != 'null' "; if ($br!= ''){ - $sql.=" and sms.branch = '".$br."'"; + $sql.=" and scd.branch = '".$br."'"; } if ($bat!= ''){ @@ -575,10 +581,10 @@ class Reports_model extends CI_Model } if ($u!= ''){ - $sql.=" and u.uid = '".$u."'"; + $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by wbill,rbill"; + $sql.=" group by ssid,scid,fbatch,fbatch,waiver_bill,referal_bill"; $sql.=" order by sl"; @@ -597,36 +603,31 @@ class Reports_model extends CI_Model } public function examfee($bat=null,$br=null,$u=null){ - $sql = " select @s:=@s+1 sl,sms.sid as ssid,std.name as name,std.father as father,br.bname as bname,ifnull(b.batch,'-') as batch,std.phone as phone,sfs.cmts as cmts,sms.cid as scid,sfp.bdate as bdate,list.status as status,u.uname as uname,cm.course as course,sms.sem as sem,sms.adate as adate,sfs.batch as fbatch,sfs.cid as fcid,cfd.syear as syear,sum(sfs.stf) as stf - from - (SELECT StudentID as sid,CourseID as cid,BranchCode as branch,AnsDate as adate,ListCode as lcode,Comments as cmts,Sem as sem FROM T_AnswerBookletStatus) 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,Comments as cmts FROM T_Students_Fees_Status - group by sid,batch) as sfs on sfs.sid=sms.sid - left join - (SELECT StudentID as sid,FeesId as fid,BillDate as bdate,sum(BillAmount) as bamount - FROM T_Students_Fees_PaidDetails, (SELECT @s:= 0) AS s - group by sid,fid,bdate) 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.cid=sms.cid - left join - (SELECT CourseID as cid,UniversityID as uid,CourseName as course FROM T_CourseMaster) as cm - on cm.cid=sfs.cid - left join - (SELECT UniversityID as uid,UniversityName as uname FROM T_UniversityMaster) as u - on u.uid=cm.uid - left join - (SELECT ListCode as lcode,ListName as status FROM T_PickListDetails) as list - on list.lcode=sms.lcode - left join - (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father FROM T_StudentDetails) as std on std.sid=sms.sid - left join - (SELECT BatchCode as bcode,BatchName as batch FROM T_BatchMaster) as b on b.bcode=sfs.batch - left join - (SELECT BranchCode as brcode,BranchName as bname FROM T_BranchMaster) as br on br.brcode=sms.branch - where std.name != 'null' - "; + $sql = "select @s:=@s+1 sl,sms.sid as ssid,std.name,std.father,std.phone,cfd.syear,sfs.batch as fbatch,cm.course,cm.uname,sfs.cid as scid,sms.cmts,sms.stf,sms.branch + from (SELECT @s:= 0) AS s, + (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,Comments as cmts,BranchCode as branch FROM T_Students_Fees_Status +where STFOrWR != '' +group by sid,batch,cid) as sms +left join + (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype FROM T_Students_Fees_Status + group by sid,cid,batch) as sfs on sfs.sid=sms.sid and sfs.fid=sms.fid +left join + (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,BranchID as branch FROM T_Student_CourseDetails) as scd on scd.sid=sms.sid and scd.cid=sfs.cid + +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=scd.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 cm on cm.cid=cfd.ccid +left join + (SELECT StudentID as sid,MobileNumber as phone,FirstName as name,Fathername as father + FROM T_StudentDetails) as std on std.sid=sms.sid + where sms.sid != 'null' +"; if ($br!= ''){ @@ -640,10 +641,10 @@ class Reports_model extends CI_Model } if ($u!= ''){ - $sql.=" and u.uid = '".$u."'"; + $sql.=" and cm.uid = '".$u."'"; } - $sql.=" group by ssid,fbatch"; + $sql.=" group by ssid,scid,fbatch,fbatch"; $sql.=" order by sl"; diff --git a/Apollo/assets/views/report_answer_booklets.html b/Apollo/assets/views/report_answer_booklets.html index 735fbd03..76e7a820 100644 --- a/Apollo/assets/views/report_answer_booklets.html +++ b/Apollo/assets/views/report_answer_booklets.html @@ -75,7 +75,7 @@
- + diff --git a/Apollo/assets/views/report_application_pending.html b/Apollo/assets/views/report_application_pending.html index 761c10df..1f85667d 100644 --- a/Apollo/assets/views/report_application_pending.html +++ b/Apollo/assets/views/report_application_pending.html @@ -75,7 +75,7 @@
- + diff --git a/Apollo/assets/views/report_balance_fee.html b/Apollo/assets/views/report_balance_fee.html index a26c4986..7efc0001 100644 --- a/Apollo/assets/views/report_balance_fee.html +++ b/Apollo/assets/views/report_balance_fee.html @@ -75,7 +75,7 @@
- + diff --git a/Apollo/assets/views/report_certificate_status.html b/Apollo/assets/views/report_certificate_status.html index 5d9bd171..8028be0c 100755 --- a/Apollo/assets/views/report_certificate_status.html +++ b/Apollo/assets/views/report_certificate_status.html @@ -89,7 +89,7 @@
- + @@ -126,13 +126,13 @@ {{p.name}} {{p.father}} {{p.course}} - {{p.syear}}({{p.sem}}) + {{p.syear}} {{p.phone}} {{p.uname}} {{p.balance}} - {{p.cert_name}} + {{p.certname}} {{p.status}} - {{p.cdate}} + {{p.adate}} diff --git a/Apollo/assets/views/report_document_pending.html b/Apollo/assets/views/report_document_pending.html index f8408a87..4ac6f54b 100644 --- a/Apollo/assets/views/report_document_pending.html +++ b/Apollo/assets/views/report_document_pending.html @@ -75,7 +75,7 @@
- + diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html index 2b6b6fbc..2dfc321c 100644 --- a/Apollo/assets/views/report_exam_writing_fee.html +++ b/Apollo/assets/views/report_exam_writing_fee.html @@ -75,7 +75,7 @@
- + diff --git a/Apollo/assets/views/report_expense.html b/Apollo/assets/views/report_expense.html index 70658e8a..5957df95 100755 --- a/Apollo/assets/views/report_expense.html +++ b/Apollo/assets/views/report_expense.html @@ -77,7 +77,7 @@
- + diff --git a/Apollo/assets/views/report_mark_certificate_status.html b/Apollo/assets/views/report_mark_certificate_status.html index 3d918053..735d95fb 100755 --- a/Apollo/assets/views/report_mark_certificate_status.html +++ b/Apollo/assets/views/report_mark_certificate_status.html @@ -117,7 +117,7 @@
- + @@ -158,17 +158,17 @@ {{p.name}} {{p.father}} {{p.course}} - {{p.syear}}({{p.sem}}) + {{p.syear}} {{p.phone}} {{p.uname}} {{p.balance}} {{p.status}} {{p.cdate}} - {{p.cmts}} - {{p.cert_name}} - {{p.status}} - {{p.cdate}} - {{p.cmts}} + {{p.ccmts}} + {{p.certname}} + {{p.astatus}} + {{p.adate}} + {{p.acmts}} diff --git a/Apollo/assets/views/report_markcardstatus.html b/Apollo/assets/views/report_markcardstatus.html index c3c053f7..41e4b032 100755 --- a/Apollo/assets/views/report_markcardstatus.html +++ b/Apollo/assets/views/report_markcardstatus.html @@ -91,12 +91,12 @@ - +
@@ -118,7 +118,7 @@ - + @@ -141,7 +141,7 @@ - + + \ No newline at end of file diff --git a/Apollo/assets/views/report_studymaterialstatus.html b/Apollo/assets/views/report_studymaterialstatus.html index 3d4a2d4e..2a4beeff 100755 --- a/Apollo/assets/views/report_studymaterialstatus.html +++ b/Apollo/assets/views/report_studymaterialstatus.html @@ -89,7 +89,7 @@
- + diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html index 4b284374..9867a940 100644 --- a/Apollo/assets/views/report_waiver_referal.html +++ b/Apollo/assets/views/report_waiver_referal.html @@ -75,7 +75,7 @@
- + @@ -121,10 +121,10 @@
- - - - + + + +
{{p.sl}} {{p.bdate}} {{p.course}} {{p.syear}} {{p.phone}}{{p.wbill}}{{p.wamount}}{{p.rbill}}{{p.ramount}}{{p.waiver_bill}}{{p.waiver}}{{p.referal_bill}}{{p.referal}} {{p.cmts}}