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 @@ Sem/Year + Batch Session From/Session To Session Roll Number @@ -407,6 +408,7 @@ {{p.Sem_Year}} + {{p.BatchName}} {{p.MasterSessionName}}/{{p.MasterToSessionName}} {{p.MasterSessionName}} {{p.RollNo}}