From b3659f22d49d147552f6e5fab543c09f59e3d871 Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Wed, 3 Oct 2018 11:34:01 +0530
Subject: [PATCH] lastchanges

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

diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index cfae8caa..dccae2be 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,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 
+        $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,AdmittedBy as admittedby,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,
@@ -760,7 +760,7 @@ left join
         order by CourseID) 
     as cm on cm.cid=cfd.ccid
 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
+        (SELECT StudentID as sid,MobileNumber as phone,IsActive as active,AdmittedBy as admittedby,concat(FirstName,' ',Lastname) as name,Fathername as father,PermanentAddress as address,AlternateNumber  FROM T_StudentDetails) as std on std.sid=sms.sid
 left join 
          T_Login as login on login.ID=sms.lid
 left join 
diff --git a/Apollo/assets/views/report_waiver_referal.html b/Apollo/assets/views/report_waiver_referal.html
index 10908f6d..48b9332a 100755
--- a/Apollo/assets/views/report_waiver_referal.html
+++ b/Apollo/assets/views/report_waiver_referal.html
@@ -122,7 +122,7 @@
                         <td>{{p.Father_name}}</td>
                         <td>{{p.Course_name}}</td>
                         <td>{{p.Sem_year}}</td>
-                        <td>{{p.University}}</td>
+                         <td>{{p.University}}</td>
 						<td>{{p.admittedby}}</td>
                         <td>{{p.staffname}}</td>
                         <td>{{p.Waiver_bill}}</td>