From e1d6cc2268799fbe3f3a5a2f31ad601a7bf77d76 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Sat, 24 Feb 2018 12:27:16 +0530
Subject: [PATCH] course details changes done

---
 Apollo/api/application/models/Studentview_model.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php
index aa0546a4..516ddcac 100755
--- a/Apollo/api/application/models/Studentview_model.php
+++ b/Apollo/api/application/models/Studentview_model.php
@@ -123,7 +123,7 @@ class Studentview_model extends CI_Model
      * */
     public function getStudentFeesDetails($studentID=null,$courseID=null){
         $this->db->distinct();
-        $this->db->select('SFS.FeesID,SFS.FeesType,SFS.SessionName,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,CF.Sem_Year');
+        $this->db->select('SFS.FeesID,SFS.FeesType,SFS.SessionName,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,CF.Sem_Year,CF.FeesType as CourseFeesType');
         $this->db->from(STUDENTS_FEES_STATUS.' as SFS');
         $this->db->join(STUDENTS_FEES_PAID.' as SFP','SFP.FeesId = SFS.FeesID','left');
         $this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType');
@@ -141,6 +141,7 @@ class Studentview_model extends CI_Model
                 $storePaidDetails['STFOrWR'] = $feeRow->STFOrWR;
                 $storePaidDetails['Waiver'] = $feeRow->Waiver;
                 $storePaidDetails['Others'] = $feeRow->Others;
+                $storePaidDetails['CourseFeesType'] = $feeRow->CourseFeesType;
                 $storePaidDetails['PayableAmount'] = $feeRow->CourseFees+$feeRow->STFOrWR+$feeRow->Others-$feeRow->Waiver;
 
                 $this->db->select('ifnull(SUM((BillAmount)),0) as PaidBillAmount');
@@ -242,7 +243,7 @@ class Studentview_model extends CI_Model
      * created by kms
      * */
     public function  getStudentMaterialDetails($studentID=null,$courseID=null){
-        $this->db->select('SMS.CourseID,SMS.SDate,SMS.Comments,CF.Sem_Year,PLD.ListName');
+        $this->db->select('SMS.CourseID,SMS.SDate,SMS.Comments,SMS.Sem,CF.Sem_Year,CF.FeesType,PLD.ListName');
         $this->db->from(STUDY_MATERIAL_STATUS.' as SMS');
         $this->db->join(COURSE_FEES.' as CF','CF.ID = SMS.CourseID');
         $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID');
@@ -289,7 +290,7 @@ class Studentview_model extends CI_Model
      * */
     public function getMarkcardDetails($studentID=null,$courseID=null){
 
-        $this->db->select('CS.CourseID,CS.CertificationNo,CS.CDate,CS.Comments,CS.CertificationType as CertificateName,CF.Sem_Year,PLD.ListName');
+        $this->db->select('CS.CourseID,CS.CertificationNo,CS.CDate,CS.Comments,CS.CertificationType as CertificateName,CF.Sem_Year,CF.FeesType,CS.Sem,PLD.ListName');
         $this->db->from(CERTIFICATION_STATUS.' as CS');
         $this->db->join(COURSE_FEES.' as CF','CF.ID = CS.CourseID');
         $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID');