Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

report issue fixes

Browse Source
This commit is contained in:
gandhimathi 2018-08-11 14:01:55 +05:30
parent 64b737761e
commit 6e46233da8
4 changed files with 95 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
Apollo/api/application/models/Reports_model.php
View File

@ -34,7 +34,7 @@ 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
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 sms.branch = '".$br."'
";
@ -92,7 +92,7 @@ where BranchCode = '".$br."'";
}
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,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_Fee,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(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,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_Fee,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber,appdate,ansdate
from
(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)
@ -118,7 +118,21 @@ 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
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
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)
group by sid,Sem) as andate on andate.sid=sms.sid and andate.Sem=cfd.syear
left join (select abs.ID,StudentID as sid,Sem_Year as sem,
max(if(ListName = 'SENT TO UNIVERSITY', AppDate,'-')) as appdate
from T_ApplicationStatus abs
left join T_PickListDetails list on list.ListCode=abs.ListCode
left join T_Course_Fees_Details cf on cf.CourseID=abs.CourseID
where AppDate is not null
and abs.ID in (select max(ID) from T_ApplicationStatus where AppDate is not null group by StudentID)
group by sid,sem) as apdate on apdate.sid=sms.sid and apdate.sem=cfd.syear
where std.active = 1 and sms.branch = '".$br."'
";
@ -132,7 +146,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";
$leadDet=$this->db->query($sql);
$mstatusDetails = $leadDet->result();
@ -149,34 +163,48 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
}
public function certificate_status($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(sms.certname,'-') as Certificate_name,ifnull(std.father,'-') as Father,ifnull(std.phone,'-') as Phone_number,ifnull(sms.cid,'-') as Course_id,ifnull(sms.adate,'-') as Date,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 Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,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(cm.course,'-') as course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,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
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,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,BillNO as billno FROM T_Students_Fees_PaidDetails
(SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,
CertificationType as ctype,CDate as mdate,Sem as sem,Comments as mcmts
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
where IsActive = 1
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=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,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
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,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
where std.active = 1 and sms.branch = '".$br."'
";
@ -207,7 +235,7 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
}
public function mark_cert_status($bat=null,$br=null,$u=null,$from=null,$to=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(cm.course,'-') as course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sfp.bamount),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_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(sms.cid,'-') as Course_id,ifnull(sfs.batch,'-') as Batch_code,ifnull(sms.branch,'-') as Branch_code,ifnull(cm.course,'-') as course_name,ifnull(cm.uname,'-') as University,ifnull(sfp.bdate,'-') as Document_fee_paid_date,ifnull(((sfs.cf + sfs.stf + sfs.others)-sum(sfp.bamount)),0) as Balance_fee,ifnull(cfd.syear,'-') as Sem_year,ifnull(sms.sem,'-') as Sem,ifnull(list.status,'-') as Markcard_status,ifnull(sms.mdate,'-') as Markcard_date,ifnull(sms.mcmts,'-') as Markcard_comments,ifnull(ams.certname,'-') as Certificate_name,ifnull(alist.astatus,'-') as Certificate_status,ifnull(ams.adate,'-') as Certificate_date,ifnull(ams.acmts,'-') as Certificate_comments,ifnull(std.address,'-') as address,ifnull(std.AlternateNumber,'') as AlternateNumber
from
(SELECT ID,StudentID as sid,CourseID as cid,BranchCode as branch,ListCode as lcode,
CertificationType as ctype,CDate as mdate,Sem as sem,Comments as mcmts
@ -263,11 +291,11 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
}
if ($from != '' and $to != ''){
$fromd= date("d-m-Y",strtotime($from));
$tod=date("d-m-Y",strtotime($to));
$fromd= date("Y-m-d",strtotime($from));
$tod=date("Y-m-d",strtotime($to));
$sql.="and sfp.bdate >= '".$fromd."'
and sfp.bdate <= '".$tod."'";
$sql.="and STR_TO_DATE(sfp.bdate,'%d-%m-%Y') >= '".$fromd."'
and STR_TO_DATE(sfp.bdate,'%d-%m-%Y') <= '".$tod."'";
}
@ -295,11 +323,11 @@ left join (SELECT StudentID as sid,UniversityID as uid,CourseID as cid,Enrollmen
";
if ($from and $to != ''){
$fromd= date("d-m-Y",strtotime($from));
$tod=date("d-m-Y",strtotime($to));
$sql.="and dbm.Date >= '".$fromd."'
and dbm.Date <= '".$tod."'";
$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."'";
}
$sql.=" group by Expense_name";

14
Apollo/assets/views/report_certificate_status.html
View File

@ -7,6 +7,12 @@
</div>
</section>
<style>
td,th {
white-space: nowrap;
}
th{
text-align:center;
}
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
@ -112,15 +118,15 @@
<td>{{p.Document_fee_paid_date}}</td>
<td>{{p.Enrollment_id}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Student_name}}</a></td>
<td>{{p.Father}}</td>
<td>{{p.Course_name}}</td>
<td>{{p.Father_name}}</td>
<td>{{p.course_name}}</td>
<td>{{p.Sem_year}}</td>
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<td>{{p.University}}</td>
<td>{{p.Balance_fee}}</td>
<td>{{p.Certificate_name}}</td>
<td>{{p.Status}}</td>
<td>{{p.Date}}</td>
<td>{{p.Certificate_status}}</td>
<td>{{p.Certificate_date}}</td>
</tr>
</tbody>

13
Apollo/assets/views/report_markcardstatus.html
View File

@ -7,9 +7,14 @@
</div>
</section>
<style>
td,th {
white-space: nowrap;
}
th{
text-align:center;
}
</style>
</script>
<div class="container-fluid container-fullw bg-white">
@ -99,6 +104,8 @@
<th>Phone No</th>
<th>University</th>
<th>Balance Fee</th>
<th>Application Sent Date</th>
<th>Answer Booklet Sent Date</th>
<th>Mark Card Status</th>
<th>Date</th>
@ -118,6 +125,8 @@
<td><a tooltip="View Student" class="text-dark" ng-click="open(p);">{{p.Phone_number}}</a></td>
<td>{{p.University}}</td>
<td>{{p.Balance_Fee}}</td>
<td>{{p.appdate}}</td>
<td>{{p.ansdate}}</td>
<td>{{p.Status}}</td>
<td>{{p.Date}}</td>
</tr>

14
Apollo/assets/views/report_studymaterialstatus.html
View File

@ -7,14 +7,12 @@
</div>
</section>
<style>
/* .sort-icon {
font-size: 9px;
margin-left: 5px;
}
th {
cursor: pointer;
} */
td,th {
white-space: nowrap;
}
th{
text-align:center;
}
</style>
<div class="container-fluid container-fullw bg-white">