diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 2aa9297b..a72c044d 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -347,4 +347,5 @@ $route['getApplicationFormStatusList'] = 'StatusUpdation_Controller/getApplicati $route['receiveEnrolmentFromUniv'] = 'Receive_Enrolment_Fees_Univ_Controller/receiveEnrolmentFromUniv'; $route['insertFormIdUnivFeeDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/insertFormIdUnivFeeDetails'; $route['getStudentUnivFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getStudentUnivFeeCompareDetails'; -$route['formIDFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/formIDFeeCompareDetails'; \ No newline at end of file +$route['formIDFeeCompareDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/formIDFeeCompareDetails'; +$route['getUnmatchedRecordDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getUnmatchedRecordDetails'; \ 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 08bbe12e..972ac103 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -127,7 +127,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { * created by kms * */ public function formIDFeeCompareDetails_post(){ - $formData['FormID'] = $this->post('formId');; + $formData['FormID'] = $this->post('formId'); $formData['EnrolmentNo'] = $this->post('enrolmentId');; $getDetails = $this->receive_model->getFormIDFeeDetails($formData); @@ -151,4 +151,24 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { } } + public function getUnmatchedRecordDetails_post(){ + + $getDetailsFor = $this->post('getDetailsFor'); + $getUnmatchedFormDetails = $this->receive_model->getUnmatchedFormDetails($getDetailsFor);// Check if the users data store contains users (in case the database result returns NULL) + if ($getUnmatchedFormDetails) + { + $getUnmatchedFormDetails['status'] = REST_Controller::HTTP_OK; + // Set the response and exit + $this->response($getUnmatchedFormDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else + { + // Set the response and exit + $this->response([ + 'message' => 'Something went wrong.please try again!', + '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/models/Receive_Enrolment_Fees_Univ_model.php b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php index e8d8d6ac..8e96038e 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -538,4 +538,55 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { } return $feesArray; } + /** + * Unmached file details + */ + + public function getUnmatchedFormDetails($reqType){ + // $this->db->select('t1.*'); + // $this->db->from('T_Enrolment_Received_From_University as t1'); + // $this->db->join('T_Student_CourseDetails as t2', 't2.EnrollmentID = t1.EnrolmentNo'); + + if($reqType == 'EnrolmentIDFile'){ + $query = "select * + from T_Enrolment_Received_From_University as t1 + where t1.EnrolmentNo NOT IN (select EnrollmentID from T_Student_CourseDetails)"; + $details = $this->db->query($query); + $detailsList = $details->result(); + + if($detailsList){ + $resultArr['unMatchedRecordDetails'] = $detailsList; + $resultArr['unMatchedRecordStatus'] = true; + $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile'; + $resultArr['message'] = "Successfully data generated"; + } else { + $resultArr['unMatchedRecordDetails'] = []; + $resultArr['unMatchedRecordStatus'] = false; + $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile'; + $resultArr['message'] = "No record found"; + } + }else if($reqType == 'FormIDFile'){ + $query = "select * + from T_FormId_FeeDetails_Received_From_University as t1 + where t1.FormID NOT IN (select FormID from T_Enrolment_Received_From_University)"; + $details = $this->db->query($query); + $detailsList = $details->result(); + + if($detailsList){ + $resultArr['unMatchedRecordDetails'] = $detailsList; + $resultArr['unMatchedRecordStatus'] = true; + $resultArr['unMatchedRecordFor'] = 'FormIDFile'; + $resultArr['message'] = "Successfully data generated"; + } else { + $resultArr['unMatchedRecordDetails'] = []; + $resultArr['unMatchedRecordStatus'] = false; + $resultArr['unMatchedRecordFor'] = 'FormIDFile'; + $resultArr['message'] = "No record found"; + } + } + + + return $resultArr; + } + } \ No newline at end of file diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index 6baa2a57..07189033 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -286,6 +286,9 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.popupLoad = false; $scope.popupLoadData = false; $scope.formPaymentDetails=""; + + // Fee compare details get + $scope.getFeeCompareDetails = function(formId, enrolmentId){ $scope.popupLoadData = false; $scope.formPaymentDetails=""; @@ -317,4 +320,36 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil }); } + $scope.unMatchedLoadingStatus = false; + // Get unmached details + $scope.getUnmatchedRecord = function(ss){ + $scope.unMatchedRecordDetails = ''; + $scope.unMatchedNoRecordFound = false; + $scope.unMatchedLoadingStatus = true; + var getDetailsFor = ss == 1 ? 'EnrolmentIDFile' : 'FormIDFile'; + var getFeeCompareDetailsList = { + method: 'POST', + url: apiPoint.url + 'getUnmatchedRecordDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + getDetailsFor: getDetailsFor + } + }; + $http(getFeeCompareDetailsList).then(function (response) { + if (response.data.unMatchedRecordStatus == true) { + $scope.unMatchedLoadingStatus = false; + $scope.unMatchedNoRecordFound = false; + $scope.unMatchedRecordDetails=response.data.unMatchedRecordDetails; + $scope.unMatchedRecordDetailsType= response.data.unMatchedRecordFor; + } else { + $scope.unMatchedLoadingStatus = false; + $scope.unMatchedNoRecordFound = true; + $scope.unMatchedRecordDetails=response.data.unMatchedRecordDetails; + } + }); + } + }]); diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index 5a93b6ab..e6548e12 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -223,6 +223,106 @@ + + +
+
+
+ + +
+
+
+
+ +
+
+
+
Loading...
+
+
+
No Record Found ...
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
FormIDEnrolmentNoRollNoCentreCodeCentreStateMobileNumberStudentNameFatherNameMotherNameEmailIDUniversityCodeUniversityNameCourseCodeCourseNameSemesterYear
{{p.FormID}}{{p.EnrolmentNo}}{{p.RollNo}}{{p.CentreCode}}{{p.CentreState}}{{p.MobileNumber}}{{p.StudentName}}{{p.FatherName}}{{p.MotherName}}{{p.EmailID}}{{p.UniversityCode}}{{p.UniversityName}}{{p.CourseCode}}{{p.CourseName}}{{p.SemesterYear}}
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + +
FormIDFormTypeCentreCodeCourseCodeActualCourseFeeCourseFeeAmount
{{p.FormID}}{{p.FormType}}{{p.CentreCode}}{{p.CourseCode}}{{p.ActualCourseFee}}{{p.CourseFee}}{{p.Amount}}
+ + +
+
+ +