From d2208aead138a1c693e62a5f5ab0102e76e3799f Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 4 Feb 2019 16:18:41 +0530
Subject: [PATCH] batch add in set fee screen issue no : 1653

---
 Apollo/api/application/models/Fees_status_model.php      | 6 +++++-
 Apollo/assets/views/status-update/setFeesForStudent.html | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php
index 89482d47..7057f348 100755
--- a/Apollo/api/application/models/Fees_status_model.php
+++ b/Apollo/api/application/models/Fees_status_model.php
@@ -796,15 +796,18 @@ class Fees_status_model extends CI_Model
             $result_array['feesStatus']=true;
             foreach ($feesDetails->result() as $row){
                 $SNoValue=$SNoValue+1;
-                $this->db->select('SFS.FeesID,SFS.CourseFees,SFS.Comments,SFS.STFOrWR,SFS.Waiver,SFS.Others,SFS.SessionName,SFS.ToSessionName,SFS.RollNo,SFS.BatchCode,SM.SessionName as MasterSessionName,SM1.SessionName as MasterToSessionName');
+                $this->db->select('SFS.FeesID,SFS.CourseFees,SFS.Comments,SFS.STFOrWR,SFS.Waiver,SFS.Others,SFS.SessionName,SFS.ToSessionName,SFS.RollNo,SFS.BatchCode,SM.SessionName as MasterSessionName,SM1.SessionName as MasterToSessionName,bm.BatchName');
                 $this->db->from(STUDENTS_FEES_STATUS.' as SFS');
                 $this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = SFS.SessionName');
                 $this->db->join(SESSIONMASTER.' as SM1', 'SM1.SessionID = SFS.ToSessionName','left');
+                $this->db->join(BATCH.' as bm','bm.BatchCode = SFS.BatchCode','left');
                // $this->db->join(STUDENTS_FEES_PAID.' as SFP', 'SFP.FeesId = SFS.FeesID','left');
                 $this->db->where('SFS.StudentID',$student['StudentID']);
                 $this->db->where('SFS.CourseID',$student['CourseID']);
                 $this->db->where('SFS.FeesType',$row->ID);
                 $existFeesDetails = $this->db->get();
+
+               // print_r($this->db->last_query());die();
                 if($existData=$existFeesDetails->result()){
                     // count the total paid fees details
                     $this->db->select('FeesId');
@@ -834,6 +837,7 @@ class Fees_status_model extends CI_Model
                     $fetchData['SessionName']=$existData[0]->SessionName;
                     $fetchData['ToSessionName']=$existData[0]->ToSessionName;
                     $fetchData['MasterSessionName']=$existData[0]->MasterSessionName;
+                    $fetchData['BatchName']=$existData[0]->BatchName;
                     if($existData[0]->MasterToSessionName=='' OR $existData[0]->MasterToSessionName==null){
                         $fetchData['MasterToSessionName']="Not Applicable";
                     }
diff --git a/Apollo/assets/views/status-update/setFeesForStudent.html b/Apollo/assets/views/status-update/setFeesForStudent.html
index 658138cc..60c6b61b 100755
--- a/Apollo/assets/views/status-update/setFeesForStudent.html
+++ b/Apollo/assets/views/status-update/setFeesForStudent.html
@@ -391,6 +391,7 @@
                                     <thead>
                                     <tr>
                                         <th>Sem/Year</th>
+                                        <th>Batch</th>
                                         <th ng-if="feesStructureInfo[0].ProgramType=='P001' || feesStructureInfo[0].ProgramType=='P002'">Session From/Session To</th>
                                         <th ng-if="feesStructureInfo[0].ProgramType=='Y001'">Session</th>
                                         <th>Roll Number</th>
@@ -407,6 +408,7 @@
                                     <tbody ng-repeat="p in feesStructureInfo|orderBy:sortKey:reverse|filter:search:strict">
                                     <tr ng-if="p.ExistValue=='1'">
                                         <td>{{p.Sem_Year}}</td>
+                                        <td>{{p.BatchName}}</td>
                                         <td ng-if="feesStructureInfo[0].ProgramType=='P001' || feesStructureInfo[0].ProgramType=='P002'">{{p.MasterSessionName}}/{{p.MasterToSessionName}}</td>
                                         <td ng-if="feesStructureInfo[0].ProgramType=='Y001'">{{p.MasterSessionName}}</td>
                                         <td>{{p.RollNo}}</td>