diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 49a074a0..3bc3e112 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -262,6 +262,8 @@ class Studentview_model extends CI_Model * created by kms * */ public function getStudentFeesDetails($studentID=null,$courseID=null){ + + $serachArray=[WAIVER,REFERRAL]; $this->db->distinct(); @@ -382,7 +384,7 @@ class Studentview_model extends CI_Model * created by kms * */ public function getDefaultCourseFees($studentID=null,$courseID=null){ - $serachArray = ["PC","TC","DC","MC","OTHER"]; + $serachArray = ["PPC","TC","DC","MC","OTHER"]; $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'); $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); @@ -491,9 +493,12 @@ class Studentview_model extends CI_Model * created by kms * */ public function getStudentCertificateDetails($studentID=null,$courseID=null){ + $this->db->select('AS.CertificationNo,AS.AppDate,AS.Comments,CM.CertificateName,PLD.ListName'); $this->db->from(APPLICATION_STATUS.' as AS'); - $this->db->join(CERTIFICATION_MASTER.' as CM','CM.CertificationID = AS.CertificationType'); + // $this->db->join(CERTIFICATION_MASTER.' as CM','CM.CertificationID = AS.CertificationType'); + + $this->db->join(CERTIFICATION_MASTER.' as CM','CM.CertificateName = AS.CertificationType'); //$this->db->join(COURSE_FEES.' as CF','CF.ID = AS.CourseID'); $this->db->join(COURSE.' as CU', 'CU.CourseID = AS.CourseID'); $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = AS.ListCode'); @@ -503,6 +508,8 @@ class Studentview_model extends CI_Model $this->db->order_by('AS.ID', 'DESC'); $getCertDetails = $this->db->get(); + // print_r($this->db->last_query());die(); + if($getCertDetails->result()){ return $getCertDetails->result(); } diff --git a/Apollo/assets/views/student/studentDetailsModal.html b/Apollo/assets/views/student/studentDetailsModal.html index 6c3cff62..67a967fa 100755 --- a/Apollo/assets/views/student/studentDetailsModal.html +++ b/Apollo/assets/views/student/studentDetailsModal.html @@ -232,7 +232,6 @@