diff --git a/Apollo/api/application/models/Studentview_model.php b/Apollo/api/application/models/Studentview_model.php index 0c9e30a0..1af601d4 100755 --- a/Apollo/api/application/models/Studentview_model.php +++ b/Apollo/api/application/models/Studentview_model.php @@ -62,10 +62,10 @@ class Studentview_model extends CI_Model $fetchData['feesDetails']=$this->getStudentFeesDetails($studentId,$row->CourseID); // get student boollet details $fetchData['studyMaterialDetails']=$this->getStudentMaterialDetails($studentId,$row->CourseID); - // get certificate details - $fetchData['certificateDetails']=$this->getStudentCertificateDetails($studentId,$row->CourseID); - // get student application details - // $fetchData['applicationDetails']=$this->getStudentApplicationDetails($studentId,$row->CourseID); + // get application details + $fetchData['applicationDetails']=$this->getStudentCertificateDetails($studentId,$row->CourseID); + // get student Mark crad details + $fetchData['markCardDetails']=$this->getMarkcardDetails($studentId,$row->CourseID); $CourseArray[]=$fetchData; @@ -226,36 +226,32 @@ class Studentview_model extends CI_Model * created by kms * */ public function getStudentCertificateDetails($studentID=null,$courseID=null){ - $this->db->select('CS.CertificationNo,CS.CDate,CS.Comments,CM.CertificateName,CF.Sem_Year,PLD.ListName'); - $this->db->from(CERTIFICATION_STATUS.' as CS'); - $this->db->join(CERTIFICATION_MASTER.' as CM','CM.CertificationID = CS.CertificationType'); - $this->db->join(COURSE_FEES.' as CF','CF.ID = CS.CourseID'); - $this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID'); - $this->db->join(PICK_LIST_DETAILS.' as PLD', 'PLD.ListCode = CS.ListCode'); + $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(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'); $this->db->where('CU.CourseID', $courseID); - $this->db->where('CS.StudentID', $studentID); - $this->db->order_by('CS.ID', 'DESC'); + $this->db->where('AS.StudentID', $studentID); + $this->db->order_by('AS.ID', 'DESC'); $getCertDetails = $this->db->get(); - if ($getCertDetails->result()){ - $storeArray1 = $getCertDetails->result(); - $storeArray2 = $this->getMarkcardDetails($studentID,$courseID); - if($storeArray2 != false){ - return array_merge($storeArray1,$storeArray2); - } - else{ - return $storeArray1; - } + if($getCertDetails->result()){ + return $getCertDetails->result(); } - else{ + + else { return false; } + } /* * get mark card details * created by kms * */ public function getMarkcardDetails($studentID=null,$courseID=null){ + $this->db->select('CS.CertificationNo,CS.CDate,CS.Comments,CS.CertificationType as CertificateName,CF.Sem_Year,PLD.ListName'); $this->db->from(CERTIFICATION_STATUS.' as CS'); $this->db->join(COURSE_FEES.' as CF','CF.ID = CS.CourseID'); @@ -265,9 +261,9 @@ class Studentview_model extends CI_Model $this->db->where('CS.StudentID', $studentID); $this->db->where_in('CS.CertificationType', 'MARK CARD'); $this->db->order_by('CS.ID', 'DESC'); - $getCertDetails = $this->db->get(); - if ($getCertDetails->result()){ - return $getCertDetails->result(); + $getMarkDetails = $this->db->get(); + if ($getMarkDetails->result()){ + return $getMarkDetails->result(); } else{ return false;