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 b89a2e01..be1938e8 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -112,8 +112,9 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { public function getStudentUnivFeeCompareDetails_post(){ $searchData = $this->post('search'); + $UniversityID = $this->post('University'); - $getUnivStudentFeeCompare = $this->receive_model->getStudentUnivFeeCompareDetails($searchData);// Check if the users data store contains users (in case the database result returns NULL) + $getUnivStudentFeeCompare = $this->receive_model->getStudentUnivFeeCompareDetails($searchData,$UniversityID);// Check if the users data store contains users (in case the database result returns NULL) if ($getUnivStudentFeeCompare) { $getUnivStudentFeeCompare['status'] = REST_Controller::HTTP_OK; 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 ad14832f..bd2fba49 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -259,6 +259,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $insert['CreatedBy'] = $local['CreatedBy']; $insert['CreatedOn'] = $local['CreatedOn']; + // print_r($insert);die(); + $get_data[count($get_data)]=array( 'FormID' => $insert['FormID'], 'EnrolmentNo' => $insert['EnrolmentNo'], @@ -300,6 +302,10 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { 'CreatedOn' => $insert['CreatedOn'], ); + + //print_r($get_data); + + } else{ // for capture error message @@ -314,13 +320,17 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { // check form id exit in table for insert / update $formIDData = $this->db->select('FormID')->order_by('SubmitID', 'ASC')->get(ENROLMENTRECEIVEDFROMUNIV)->result_array(); + //print_r($formIDData); + $form_ids = array(); $insertForms = array(); $updateForms = array(); foreach ($formIDData as $fkey => $fvalue): - if(sizeof($get_data)>0){ - + if(sizeof($get_data)>0){ + $matchedKey = array_search($fvalue['FormID'], array_column($get_data, 'FormID')); + + if ($matchedKey!== false) { // $updateForms[count($updateForms)] = $get_data[$matchedKey]; // $form_ids[]=$fvalue['FormID']; @@ -331,7 +341,10 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { endforeach; - if (sizeof($get_data) > 0) { + + //print_r($get_data); + + if (sizeof($get_data) > 0) { $this->db->insert_batch(ENROLMENTRECEIVEDFROMUNIV, $get_data); if ($this->db->affected_rows() > 0) { $finalArray['status'] = true; @@ -480,7 +493,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $results['stuFeeList_details'] = "details updated successfully."; return $results; } - public function getStudentUnivFeeCompareDetails($search=null){ + public function getStudentUnivFeeCompareDetails($search=null,$UniversityID) + { $mergeFormDetails=array(); $this->db->distinct('ENU.FormID'); $this->db->select('ENU.FormID, ENU.FormType, ENU.SemesterYear, ENU.EnrolmentNo,ENU.RollNo, ST.*,UN.UniversityID, UN.UniversityName,CM.CourseID,CM.CourseCode,CM.CourseName'); @@ -499,8 +513,12 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->where('ENU.SemesterYear',$search['Sem']); } + $this->db->where('STC.UniversityID',$search['University']); + $details = $this->db->get(); $detailsList = $details->result(); + + ///print_r($this->db->last_query());die(); if($detailsList){ foreach ($detailsList as $fetchStudentRow){ // form id bases get student paid details @@ -552,6 +570,9 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $resultArr['formTypeStatus'] = false; $resultArr['message'] = "No record found..."; } + + + return $resultArr; } /*form id bases get student paid details for getStudentUnivFeeCompareDetails methods*/ diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 85bd0ebd..92b8b72d 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -132,6 +132,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.studentData = false; $scope.statusMessage=""; $scope.onSubmit = function(){ + if($scope.searchData.University !== '' && $scope.searchData.Session !==''){ $scope.statusMessage=""; $scope.Searchloader = true; @@ -144,6 +145,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil data: { data: localDetails, search: $scope.searchData, + University : $scope.searchData.University, } }; $http(empListreq).then(function (response) {