From 184340e8295b9f89f6aa7532a98be590d4d64a7a Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Wed, 5 Sep 2018 09:37:48 +0530 Subject: [PATCH] university and course search details changes : kdk --- Apollo/api/application/config/routes.php | 3 +- ...Receive_Enrolment_Fees_Univ_Controller.php | 18 ++++++++++ .../controllers/StatusUpdation_Controller.php | 1 + .../Receive_Enrolment_Fees_Univ_model.php | 35 ++++++++++++++++--- 4 files changed, 51 insertions(+), 6 deletions(-) diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 74942f98..bf5c2175 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -349,4 +349,5 @@ $route['insertFormIdUnivFeeDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/i $route['getStudentUnivFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFeeCompareDetails'; $route['formIDFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/formIDFeeCompareDetails'; $route['getUnmatchedRecordDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnmatchedRecordDetails'; -$route['getUniversitySessionDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUniversitySessionDetails'; \ No newline at end of file +$route['getUniversitySessionDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUniversitySessionDetails'; +$route['getUnivCourseFromFileDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnivCourseFromFileDetails'; \ No newline at end of file diff --git a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php index 527680d4..dc3a7ce5 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -195,4 +195,22 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + + public function getUnivCourseFromFileDetails_post(){ + // $reqData = $this->post('data'); + // $reqBranch = $this->post('reqBranch'); + $getUnivCourseFromFileDetails = $this->receive_model->getUnivCourseFromFileDetails(); // Check if the employee exist + if ($getUnivCourseFromFileDetails) { + $getUnivCourseFromFileDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getUnivCourseFromFileDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + + } else { + // Set the response and exit + $this->response(['message' => 'No list were found', 'status' => REST_Controller::HTTP_NOT_FOUND], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + + } + } + + } \ No newline at end of file diff --git a/Apollo/api/application/controllers/StatusUpdation_Controller.php b/Apollo/api/application/controllers/StatusUpdation_Controller.php index 056244b7..bc18a9f6 100755 --- a/Apollo/api/application/controllers/StatusUpdation_Controller.php +++ b/Apollo/api/application/controllers/StatusUpdation_Controller.php @@ -280,4 +280,5 @@ class StatusUpdation_Controller extends REST_Controller { } + } \ No newline at end of file diff --git a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php index 1c0c0a23..0f429ebd 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -15,6 +15,36 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { * created by kms * */ + public function getUnivCourseFromFileDetails(){ + $selectQuery = "SELECT UniversityCode, UniversityName FROM T_Enrolment_Received_From_University GROUP BY UniversityCode"; + $queryDetails = $this->db->query($selectQuery); + + if($queryDetails->result()){ + foreach ($queryDetails->result() as $formIdDetails){ + + $result['univCode'] = $formIdDetails->UniversityCode; + $result['univName'] = $formIdDetails->UniversityName; + + $selectCourseQuery = "SELECT CourseCode, CourseName FROM T_Enrolment_Received_From_University WHERE UniversityCode = '$formIdDetails->UniversityCode' GROUP BY CourseCode"; + $queryCourseDetails = $this->db->query($selectCourseQuery); + $result['univCourseDetails'] = $queryCourseDetails->result(); + + $selectSessionQuery = "SELECT SessionName FROM T_Enrolment_Received_From_University WHERE UniversityCode = '$formIdDetails->UniversityCode' GROUP BY CourseCode"; + $querySessionDetails = $this->db->query($selectSessionQuery); + $result['univSessionDetails'] = $querySessionDetails->result(); + + } + $finalArray['status'] = true; + $finalArray['message'] = "Success."; + $finalArray['details'] = $result; + } else { + $finalArray['status'] = false; + $finalArray['message'] = "No record found."; + $finalArray['details'] = []; + } + return $finalArray; + + } @@ -345,7 +375,6 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { foreach ($formFeeDetails as $formIdDetails){ - if(array_key_exists('FormId',$formIdDetails) && $formIdDetails['FormId'] != '' && $formIdDetails['FormId'] != null && array_key_exists('Form Type',$formIdDetails) && array_key_exists('CentreCode',$formIdDetails) && array_key_exists('Course_Code',$formIdDetails) && array_key_exists('Actual_Course_Fee',$formIdDetails) && array_key_exists('Course_Fee',$formIdDetails) && array_key_exists('Exam_Fee',$formIdDetails) @@ -354,7 +383,6 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { && array_key_exists('Semester',$formIdDetails) && array_key_exists('Student_Name',$formIdDetails) && array_key_exists('Father_Name',$formIdDetails) ){ //select query for the check the fields are entered - //echo $formIdDetails['FormId']; echo '===='; $formIds = $formIdDetails['FormId']; @@ -413,7 +441,6 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { // echo count($queryDetails->result());exit(); if(count($queryDetails->result()) == 0){ - $query = "INSERT INTO T_FormId_FeeDetails_Received_From_University (FormID, FormType, CentreCode,Session,Year,Semester,Student_Name,Father_Name,CourseCode, ActualCourseFee, CourseFee, ExamFee, EnrollmentFee, ProspectusFee, ReRegFee, CreditTransferFee, LateralEntryFee, DualSpclFee, OtherFee, NRIFEE, ProvisionalFee, MigrationFee, UrgentResultDMCFee, AdditionalFee, Amount, CreatedBy, CreatedOn, BranchCode) VALUES @@ -422,7 +449,6 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { } else { echo 'else con'; } - // -- ON DUPLICATE KEY UPDATE // -- FormType = '$formType', // -- CentreCode = '$CentreCode', @@ -443,7 +469,6 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { // -- UrgentResultDMCFee = '$UrgentResultDMCFee', // -- AdditionalFee = '$AdditionalFee', // -- Amount = '$Amount'"; - } continue; }