From 12be2fd2f9639b63d91be7a834ef0aa6e38de0da Mon Sep 17 00:00:00 2001
From: gayathri1990 <maran7mca@gmail.com>
Date: Mon, 1 Oct 2018 18:57:58 +0530
Subject: [PATCH] lastchangesintracker

---
 Apollo/api/application/models/Reports_model.php  | 2 +-
 Apollo/assets/views/report_exam_writing_fee.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 b63e9bc1..9f940303 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -1268,7 +1268,7 @@ if($feeDetails)
        
        
         //staff Name
-        $sql_staf = "select StaffID,concat(Firstname,Lastname) as staff_name from T_StaffDetails where IsActive = 1 and BranchCode = '".$br."'";
+        $sql_staf = "select StaffID,concat(Firstname,Lastname) as staff_name from T_StaffDetails where BranchCode = '".$br."'";
         $staff=$this->db->query($sql_staf);
         $staff_list = $staff->result();
        
diff --git a/Apollo/assets/views/report_exam_writing_fee.html b/Apollo/assets/views/report_exam_writing_fee.html
index 4043ad6c..c6f9f99c 100755
--- a/Apollo/assets/views/report_exam_writing_fee.html
+++ b/Apollo/assets/views/report_exam_writing_fee.html
@@ -109,6 +109,7 @@
                             <th>Course</th>
                             <th>Sem/Year</th>
                             <th>University</th>
+							<th>Admitted By</th>
                             <th>Exam Writing Fee</th>
                             <th>Comments</th>
                             
@@ -127,6 +128,7 @@
                             <td>{{p.Course_name}}</td>
                             <td>{{p.Sem_year}}</td>
                             <td>{{p.University}}</td>
+							<td>{{p.AdmittedBy}}</td>
                             <td style="text-align:right;">{{p.Amount}}</td>
                             <td>{{p.Comments}}</td>