diff --git a/Apollo/api/application/models/Course_model.php b/Apollo/api/application/models/Course_model.php index 3b91345a..178bd819 100755 --- a/Apollo/api/application/models/Course_model.php +++ b/Apollo/api/application/models/Course_model.php @@ -15,11 +15,12 @@ class Course_model extends CI_Model { * created by kms * */ - public function addCourse($arrayDetails=null,$jsonSemFeesData=null,$subjectDetails=null) + public function addCourse($arrayDetails=null,$jsonSemFeesData=null) //$subjectDetails=null { $this->db->select('CourseCode'); $this->db->where('CourseCode', $arrayDetails['CourseCode']); $this->db->where('UniversityID', $arrayDetails['UniversityID']); + $this->db->where('BranchCode', $arrayDetails['BranchCode']); if($this->db->get(COURSE)->first_row()){ $result['courseStatus'] = false; $result['message'] = "This course id is already exist in same university"; @@ -40,9 +41,11 @@ class Course_model extends CI_Model { $this->db->insert(COURSE_FEES, $insertFeesArray); } - if($subjectDetails){ + /* + // hide subject insert query + if($subjectDetails){ $this->insertCourseSubjects($arrayDetails,$insert_id,$subjectDetails); - } + }*/ $result['courseStatus'] = true; $result['message'] = "Successfully course details added"; @@ -71,12 +74,14 @@ class Course_model extends CI_Model { * created by kms * */ - public function getCourse() + public function getCourse($requestedBy,$branchCode) { $this->db->select('CU.CourseID,CU.CourseCode,CU.CourseName,CU.FeesType,CU.Specilization1,CU.Specilization2,CU.PC,CU.DC,CU.TC,CU.MC,CU.OtherFees,CU.IsActive,US.UniversityID,US.UniversityName'); $this->db->from(COURSE.' as CU'); $this->db->join(UNIVERSITY.' as US', 'US.UniversityID = CU.UniversityID'); - $this->db->order_by('CU.CreatedOn','DESC'); + $this->db->where('CU.BranchCode',$branchCode); + $this->db->where('US.BranchCode',$branchCode); + $this->db->order_by('CU.CourseID','DESC'); $courseDetails = $this->db->get(); if($courseDetails->result()){ @@ -99,27 +104,24 @@ class Course_model extends CI_Model { $fetchData['UniversityID']=$row->UniversityID; $fetchData['UniversityName']=$row->UniversityName; $fetchData['feesStructures'] = $this->getCourseFeesDetails($row->CourseID); - $fetchData['existSubjects'] = $this->getExistCourseSubjectDetails($row->CourseID); - // print_r($fetchData);exit(); + // $fetchData['existSubjects'] = $this->getExistCourseSubjectDetails($row->CourseID); $storeCourseArray[]=$fetchData; } $result['details'] = $storeCourseArray; - // print_r($storeCourseArray);exit(); } else { $result['courseStatus'] = false; $result['message'] = "No records found!"; } - - // print_r($result);exit(); + return $result; } - public function getCourseUnivFeesTypes() { - $result['universityDetails'] = $this->getUniversityDetails(); + public function getCourseUnivFeesTypes($requestedBy=null,$requestedBranch=null) { + $result['universityDetails'] = $this->getUniversityDetails($requestedBy,$requestedBranch); $result['feesDetails'] = $this->getFeesDetails(); - $result['subjectetails'] = $this->getSubjectDetails(); + // $result['subjectetails'] = $this->getSubjectDetails($requestedBy,$requestedBranch); $result['courseStatus'] = true; return $result; } @@ -128,11 +130,12 @@ class Course_model extends CI_Model { * update course details * created by kms * */ - public function updateCourse($arrayDetails=null,$jsonData=null,$subjectDetails=null) + public function updateCourse($arrayDetails=null,$jsonData=null) //$subjectDetails=null { $this->db->select('CourseCode'); $this->db->where('CourseCode', $arrayDetails['CourseCode']); $this->db->where('UniversityID', $arrayDetails['UniversityID']); + $this->db->where('BranchCode', $arrayDetails['BranchCode']); $this->db->where('CourseID !=', $arrayDetails['CourseID']); if($this->db->get(COURSE)->first_row()){ $result['courseStatus'] = false; @@ -140,6 +143,7 @@ class Course_model extends CI_Model { } else{ $this->db->where('CourseID',$arrayDetails['CourseID']); + $this->db->where('BranchCode', $arrayDetails['BranchCode']); $upateStatus=$this->db->update(COURSE, $arrayDetails); if($upateStatus) { @@ -165,7 +169,7 @@ class Course_model extends CI_Model { } // update course subject details - $this->updateCourseSubjcetDetails($subjectDetails); + // $this->updateCourseSubjcetDetails($subjectDetails); $result['courseStatus'] = true; @@ -189,11 +193,12 @@ class Course_model extends CI_Model { * get university details * created by kms * */ - public function getUniversityDetails() + public function getUniversityDetails($requestedBy,$requestedBranch) { $this->db->select('UniversityID,UniversityName'); $this->db->order_by('UniversityID','ASC'); $this->db->where('IsActive','1'); + $this->db->where('BranchCode',$requestedBranch); $universityDetails = $this->db->get(UNIVERSITY); return $universityDetails->result(); } @@ -269,10 +274,11 @@ class Course_model extends CI_Model { * get subject details * created by kms * */ - public function getSubjectDetails(){ + public function getSubjectDetails($requestedBy,$requestedBranch){ $this->db->select('SubjectID,SubjectCode,SubjectName'); $this->db->order_by('SubjectID','DESC'); $this->db->where('IsActive','1'); + $this->db->where('BranchCode',$requestedBranch); $subjectDetails = $this->db->get(SUBJECTMASTER); return $subjectDetails->result(); }