diff --git a/Apollo/api/application/models/Course_model.php b/Apollo/api/application/models/Course_model.php index 5cf1b980..abaf655c 100644 --- a/Apollo/api/application/models/Course_model.php +++ b/Apollo/api/application/models/Course_model.php @@ -15,7 +15,7 @@ class Course_model extends CI_Model { * created by kms * */ - public function addCourse($arrayDetails=null,$jsonData=null) + public function addCourse($arrayDetails=null,$jsonSemFeesData=null) { $this->db->select('CourseID'); @@ -26,14 +26,15 @@ class Course_model extends CI_Model { } else { $this->db->insert(COURSE, $arrayDetails); if ($this->db->affected_rows() == '1') { - if($jsonData){ - foreach($jsonData as $row){ + + if($jsonSemFeesData){ + foreach($jsonSemFeesData as $row){ $insertFeesArray['CourseID'] =$arrayDetails['CourseID']; $insertFeesArray['ProgramType'] =$row['program']; - $insertFeesArray['FeesType'] =$arrayDetails['FeesType']; + $insertFeesArray['FeesType'] =$row['FeesType']; $insertFeesArray['FeesAmount'] =$row['FeesAmount']; - $insertFeesArray['Sem_Year'] =$row['FeesName']; + $insertFeesArray['Sem_Year'] =$row['programName']; $insertFeesArray['UpdatedOn'] =$arrayDetails['CreatedOn']; $insertFeesArray['UpdatedBy'] =$arrayDetails['CreatedBy']; $this->db->insert(COURSE_FEES, $insertFeesArray); @@ -119,16 +120,24 @@ class Course_model extends CI_Model { if ($jsonData) { foreach ($jsonData as $row) { - $updateFeesArray['ID'] = $row['ID']; + $feesID = $row['ID']; + $updateFeesArray['CourseID'] = $arrayDetails['CourseID']; - // $insertFeesArray['ProgramType'] =$row['program']; - //$insertFeesArray['FeesType'] =$arrayDetails['FeesType']; $updateFeesArray['FeesAmount'] = $row['FeesAmount']; - $updateFeesArray['Sem_Year'] = $row['Sem_Year']; + $updateFeesArray['Sem_Year'] = $row['programName']; $updateFeesArray['UpdatedOn'] = $arrayDetails['UpdatedOn']; $updateFeesArray['UpdatedBy'] = $arrayDetails['UpdatedBy']; - $this->db->where('ID', $updateFeesArray['ID']); - $this->db->update(COURSE_FEES, $updateFeesArray); + + $updateFeesArray['ProgramType'] =$row['program']; + $updateFeesArray['FeesType'] =$row['FeesType']; + if($feesID!='' OR $feesID!=null){ + $this->db->where('ID', $feesID); + $this->db->update(COURSE_FEES, $updateFeesArray); + } + else{ + $this->db->insert(COURSE_FEES, $updateFeesArray); + } + } $result['courseStatus'] = true; @@ -214,6 +223,7 @@ class Course_model extends CI_Model { * */ public function getCourseFeesDetails($courseID=null){ + $this->db->select('ID,CourseID,ProgramType,FeesAmount,Sem_Year,PLD.ListName as programName'); $this->db->order_by('ID','ASC'); $this->db->where('CourseID',$courseID);