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

newcolumn added in referal report

Browse Source
This commit is contained in:
gayathri1990 2018-10-03 11:05:44 +05:30
parent 883cd6a69d
commit ba09266e81
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -736,7 +736,7 @@ 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,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
$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,AdmittedBy as admittedby,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,CreatedBy as lid,CommentsForStudent as cmts,FeesId as fid,
IF(ModeOfPayment = 'WAIVER', BillNO,'-') AS waiver_bill,

2
Apollo/assets/views/report_waiver_referal.html
View File

@ -101,6 +101,7 @@
<th>Course</th>
<th>Sem/Year</th>
<th>University</th>
<th>Admitted By</th>
<th>Waiver/referal given by</th>
<th>Waiver Bill No</th>
<th>Waivers Amount</th>
@ -122,6 +123,7 @@
<td>{{p.Course_name}}</td>
<td>{{p.Sem_year}}</td>
<td>{{p.University}}</td>
<td>{{p.admittedby}}</td>
<td>{{p.staffname}}</td>
<td>{{p.Waiver_bill}}</td>
<td style="text-align:right;">{{p.Waiver_amount}}</td>