diff --git a/Apollo/api/application/config/routes.php b/Apollo/api/application/config/routes.php index 74942f98..3c1a8a47 100755 --- a/Apollo/api/application/config/routes.php +++ b/Apollo/api/application/config/routes.php @@ -349,4 +349,7 @@ $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['getExistStudentEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/getExistStudentEnrolmentDetails'; +$route['addManualEnrolmentDetails'] = 'Receive_Enrolment_Fees_Univ_Controller/addManualEnrolmentDetails'; + 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..8d669667 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -34,6 +34,9 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { $this->methods['receiveEnrolmentFromUniv_post']['limit'] = 500; // 500 requests per hour per user/key $this->methods['formIDFeeCompareDetails_post']['limit'] = 500; $this->methods['getUniversitySessionDetails_post']['limit'] = 500; + $this->methods['getExistStudentEnrolmentDetails_post']['limit'] = 1000; + + $this->methods['addManualEnrolmentDetails_post']['limit'] = 1000; // load the model $this->load->model('Receive_Enrolment_Fees_Univ_model', 'receive_model'); @@ -193,6 +196,65 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { $this->response(['message' => 'No list were found', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code } + + } + /* + * get exist enrolment student details + * created by kms + * */ + public function getExistStudentEnrolmentDetails_post(){ + $localData = $this->post('localDetails'); + $enrolmentID=$this->post('enrolmentID'); + $getEnrolmentDetails=$this->receive_model->getExistStudentEnrolmentDetails($enrolmentID,$localData); + if($getEnrolmentDetails['status']==true){ + $this->response($getEnrolmentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + + } + else if($getEnrolmentDetails['status']==false){ + $this->response($getEnrolmentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + + + } + else{ + $this->response(['message' => 'No list were found', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + + } + } + /* + * add manual enrolment details + * cretaed by kms + * */ + public function addManualEnrolmentDetails_post(){ + $now = new DateTime(); + $now->setTimezone(new DateTimezone('Asia/Kolkata')); + $localData = $this->post('localDetails'); + $studentInfo=$this->post('studentInfo'); + $semDetails=$this->post('sem'); + $studentInfo['CreatedOn'] = $now->format('Y-m-d H:i:s'); + $studentInfo['FormID'] = $this->post('formID'); + $studentInfo['SemesterYear'] = $semDetails['sem']; + $studentInfo['FormType'] = $semDetails['FormType']; + $studentInfo['SessionName'] = $semDetails['SessionName']; + $studentInfo['EnrolmentNo'] = $this->post('enrolmentID'); + $studentInfo['CreatedBy'] = $localData['localUserID']; + $studentInfo['BranchCode'] = $localData['localBranchID']; + $studentInfo['ManualEntry'] = 1; + $addEnrolmentDetails=$this->receive_model->addManualEnrolmentDetails($studentInfo); + if($addEnrolmentDetails['status']==true){ + $this->response($addEnrolmentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + + } + else if($addEnrolmentDetails['status']==false){ + $this->response($addEnrolmentDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + + + } + else{ + $this->response(['message' => 'No list were found', 'status' => false], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code + + } + } + } \ 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 71357c3f..2ab1c705 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -15,7 +15,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil // load when html page load $scope.init = function () { - + var logcheck = JSON.parse(localStorage.getItem('localObj')); const LOCALTYPE = logcheck.localType; @@ -134,7 +134,7 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil }); - + $scope.Searchloader = false; $scope.studentData = false; @@ -278,8 +278,6 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil } $scope.receiveFormIdFeeDetails = function(details) { - console.log(details); - var updateUniversityEnrolment = { method: 'POST', url: apiPoint.url + 'insertFormIdUnivFeeDetails/', @@ -369,6 +367,120 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.unMatchedRecordDetails=response.data.unMatchedRecordDetails; } }); + } + $scope.manualEnModel={ + "enrolmentNo": '', + "formID":"", + "sem":'', + }; + /* + * add manual enrolment details + * */ + $scope.enableEnrolment=false; + $scope.addManualEnrolemntDetails=function (values) { + if(values=='1'){ + $scope.enableEnrolment=!$scope.enableEnrolment; + } + else{ + $scope.enableEnrolment=!$scope.enableEnrolment; + } + + } + /* + * check enrolment exist or not in student details + * */ + $scope.semList=[]; + $scope.studentInfo=[]; + $scope.checkEnrolmentExistDetails=function (form,entryModel) { + $scope.semList=[]; + $scope.studentInfo=[]; + var getExistEnrol = { + method: 'POST', + url: apiPoint.url + 'getExistStudentEnrolmentDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + enrolmentID: entryModel + } + }; + $http(getExistEnrol).then(function (response) { + if (response.data.status == true) { + if(response.data.semDetails.length==0){ + swal("Warning","Already form enrolment is created for all semester", "warning"); + } + else{ + $scope.studentInfo=response.data.StudentInfo; + $scope.semList=response.data.semDetails; + } + + } else { + $scope.semList=[]; + $scope.studentInfo=[]; + swal("Failed",response.data.message, "error"); + + } + }); + + } + /* + * cancel manual entry for enrolment details + * */ + $scope.cancelManualEntry=function (form) { + $scope.semList=[]; + $scope.enableEnrolment=!$scope.enableEnrolment; + } + /* + * submit manual entry form details + * */ + $scope.manualEnrolmentSubmit = function (form) { + if($scope.manualEnModel.enrolmentNo=='' || $scope.manualEnModel.enrolmentNo==null || $scope.manualEnModel.enrolmentNo==undefined){ + swal("Wraning","Please enter enrolment id", "warning"); + + } + else if($scope.manualEnModel.sem=='' || $scope.manualEnModel.sem==null){ + swal("Wraning","Please select sem", "warning"); + + } + else if($scope.manualEnModel.formID=='' || $scope.manualEnModel.formID==null){ + swal("Wraning","Please enter form id", "warning"); + + } + else{ + var addEntry = { + method: 'POST', + url: apiPoint.url + 'addManualEnrolmentDetails/', + headers: { + 'Content-Type': 'application/json' + }, + data: { + localDetails: localDetail, + enrolmentID: $scope.manualEnModel.enrolmentNo, + formID: $scope.manualEnModel.formID, + sem: $scope.manualEnModel.sem, + studentInfo:$scope.studentInfo + } + }; + $http(addEntry).then(function (response) { + if (response.data.status == true) { + $scope.studentInfo=""; + $scope.semList=[]; + form.manualFormID.$setPristine(true); + form.manualSem.$setPristine(true); + swal("Success",response.data.message, "success"); + } else { + swal("Failed",response.data.message, "error"); + + } + }); + } + + + + + + } }]); diff --git a/Apollo/assets/js/directives/convert-words.js b/Apollo/assets/js/directives/convert-words.js index 53674596..5568af9a 100755 --- a/Apollo/assets/js/directives/convert-words.js +++ b/Apollo/assets/js/directives/convert-words.js @@ -184,4 +184,21 @@ app.service('dateListDescService', function() { }); return listDetails; } +}); +app.directive('numberOnly', function () { + return { + require: 'ngModel', + restrict: 'A', + link: function (scope, element, attrs, ctrl) { + ctrl.$parsers.push(function (input) { + if (input == undefined) return '' + var inputNumber = input.toString().replace(/[^0-9]/g, ''); + if (inputNumber != input) { + ctrl.$setViewValue(inputNumber); + ctrl.$render(); + } + return inputNumber; + }); + } + }; }); \ No newline at end of file diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index 0b9764ec..71cc90fd 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -43,7 +43,7 @@
- + +
+ +
+
+
+
+
+
+ + Add Enrolment Details + + +
+
+
+ + + + Enrolment no is required + Enter a valid enrolment no + +
+
+ +
+
+
+
+ + + Sem is required +
+ +
+ + + + Form id is required +
+
+
+ + + +
+
+
+ + +
+ +
+
+
+
+ +
@@ -104,6 +187,8 @@ FormID + Enrolment No + Form Type Student Name @@ -116,12 +201,7 @@ Sem/Year - Enrolment ID - - University Paid - - Student Paid - + @@ -129,6 +209,7 @@ {{p.FormID}} + {{p.EnrolmentNo}} {{p.FormType}} @@ -142,9 +223,7 @@ {{p.UniversityName}} {{p.CourseName}} {{p.SemesterYear}} - {{p.EnrolmentNo}} - {{p.UniversityPaidAmount}} - {{p.StudentPaidAmount}} +