From ba09266e8121c158236880132705e05f5383e944 Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Wed, 3 Oct 2018 11:05:44 +0530
Subject: [PATCH] newcolumn added  in referal report

---
 Apollo/api/application/models/Reports_model.php | 2 +-
 Apollo/assets/views/report_waiver_referal.html  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 9f940303..cfae8caa 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -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,
diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html
index 4d765a37..10908f6d 100755
--- a/Apollo/assets/views/report_waiver_referal.html
+++ b/Apollo/assets/views/report_waiver_referal.html
@@ -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>