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 d5b7adfc..39ebe638 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -136,12 +136,12 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { $formData['EnrolmentNo'] = $this->post('enrolmentId');; $getDetails = $this->receive_model->getFormIDFeeDetails($formData); - if ($getDetails['status']=true) + if ($getDetails['formTypeStatus']=true) { // Set the response and exit $this->response($getDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code } - else if($getDetails['status']=false){ + else if($getDetails['formTypeStatus']=false){ $this->response([ 'message' => $getDetails['Message'], ], REST_Controller::HTTP_OK); // NOT_FOUND (404) being the HTTP response code @@ -151,7 +151,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { // Set the response and exit $this->response([ 'message' => 'Something went wrong.please try again!', - 'status' => false + 'formTypeStatus' => false ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code } } @@ -160,9 +160,13 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { $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) + if ($getUnmatchedFormDetails['unMatchedRecordStatus']) + { + // Set the response and exit + $this->response($getUnmatchedFormDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code + } + else if ($getUnmatchedFormDetails['unMatchedRecordStatus']==false) { - $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 } @@ -171,7 +175,7 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { // Set the response and exit $this->response([ 'message' => 'Something went wrong.please try again!', - 'status' => REST_Controller::HTTP_NOT_FOUND + 'formTypeStatus' => false ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code } } 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 e16502b3..2a9f6068 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -549,7 +549,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { } else { $resultArr['studentFeeCompareDetails'] = []; $resultArr['formTypeStatus'] = false; - $resultArr['message'] = "No record found"; + $resultArr['message'] = "No record found..."; } return $resultArr; } @@ -734,7 +734,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $resultArr['unMatchedRecordDetails'] = $mergeFormDetails; $resultArr['unMatchedRecordStatus'] = false; $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile'; - $resultArr['message'] = "Successfully data generated"; + $resultArr['message'] = "No record found..."; } @@ -743,7 +743,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $resultArr['unMatchedRecordDetails'] = []; $resultArr['unMatchedRecordStatus'] = false; $resultArr['unMatchedRecordFor'] = 'EnrolmentIDFile'; - $resultArr['message'] = "Successfully data generated"; + $resultArr['message'] = "No record found..."; } diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 81f26042..610733c7 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -118,6 +118,13 @@ "APPLICATION": "Application" } }, + "formupload": { + "MAIN": "UNIVERSITY FORMS", + "ENROLLMENT": "Enrollment", + "STUDENTFEEDETAILCOMPARE": "Form Enrolment", + "STUDENTFROMIDFEEDETAILS": "Form Fees", + "UNIVERSITYFORMPAYMENT": "Payment" + }, "status": { "MAIN": "STATUS", "APPLICATION": "Application", diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index ac339ca7..233770c9 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -307,30 +307,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'Manage Details' } - }).state('app.student.UnivFormEnroment', { - url: '/univformenrolment', - templateUrl: "assets/views/student/studentUnivFeeCompareDetails.html", - resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'student_university_fee_compareCtrl', 'ngTable'), - title: 'University Form Enrolment', + }) + .state('app.formupload', { + url: '/student', + template: '
STUDENT DETAILS
', + title: 'Student', ncyBreadcrumb: { - label: 'University Form Enrolment' + label: 'Student' } - }).state('app.student.studentUnivFormIdFeeDetails', { - url: '/studentUnivFormIdFeeDetails', - templateUrl: "assets/views/student/studentUnivFormIdFeeDetails.html", - resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'studentUnivFormIdFeeDetailsCtrl', 'ngTable'), - title: 'Student FormId Fees Details', - ncyBreadcrumb: { - label: 'Student FormId Fees Details' - } - }).state('app.student.universityformpayment', { - url: '/univformpayment', - templateUrl: "assets/views/student/UnivFormPaymentDetails.html", - resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'univFormPaymentCtrl', 'ngTable'), - title: 'University Form Payment Details', - ncyBreadcrumb: { - label: 'University Form Payment Details' - } }).state('app.student.status', { url: '/status', template: '
STUDENT STATUS UPDATE
', @@ -816,7 +800,31 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'Student Merge' }, - }); + }).state('app.formupload.UnivFormEnroment', { + url: '/univformenrolment', + templateUrl: "assets/views/student/studentUnivFeeCompareDetails.html", + resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'student_university_fee_compareCtrl', 'ngTable'), + title: 'University Form Enrolment', + ncyBreadcrumb: { + label: 'University Form Enrolment' + } + }).state('app.formupload.studentUnivFormIdFeeDetails', { + url: '/studentUnivFormIdFeeDetails', + templateUrl: "assets/views/student/studentUnivFormIdFeeDetails.html", + resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'studentUnivFormIdFeeDetailsCtrl', 'ngTable'), + title: 'Student FormId Fees Details', + ncyBreadcrumb: { + label: 'Student FormId Fees Details' + } + }).state('app.formupload.universityformpayment', { + url: '/univformpayment', + templateUrl: "assets/views/student/UnivFormPaymentDetails.html", + resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'univFormPaymentCtrl', 'ngTable'), + title: 'University Form Payment Details', + ncyBreadcrumb: { + label: 'University Form Payment Details' + } + }); // $locationProvider.html5Mode(true); diff --git a/Apollo/assets/js/controllers/student_university_fee_compare.js b/Apollo/assets/js/controllers/student_university_fee_compare.js index a2acd9ad..7da5390d 100644 --- a/Apollo/assets/js/controllers/student_university_fee_compare.js +++ b/Apollo/assets/js/controllers/student_university_fee_compare.js @@ -146,10 +146,10 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.Searchloader = false; $scope.studentData = false; - + $scope.statusMessage=""; $scope.onSubmit = function(){ - $scope.Searchloader = true; if($scope.searchData.University !== '' && $scope.searchData.Session !==''){ + $scope.statusMessage=""; $scope.Searchloader = true; var empListreq = { method: 'POST', @@ -168,15 +168,14 @@ app.controller('student_university_fee_compareCtrl', ["$scope", "toaster", "$fil $scope.studentData = true; $scope.data = response.data.studentFeeCompareDetails; $scope.studentListLength = $scope.data.length; - // $scope.statusMessage = $scope.data.message; + $scope.statusMessage=""; } else { $scope.Searchloader = false; $scope.studentData = false; - $scope.statusMessage = $scope.data.message; + $scope.statusMessage = response.data.message; + $scope.data=""; } }); - }else { - } } //export excel diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index ac7b1ce1..4a63052d 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -180,7 +180,7 @@ -->
  • - + Status Update
    • -
  • - - University Form Enrolment - -
    • -
  • - - STUDENT FORMID FEE DETAILS - -
    • -
  • - - University Form Payment - -
    • +
    @@ -67,7 +67,7 @@ Form ID - Enrolment No + Enrollment ID Bill No Date Payable diff --git a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html index 3c03b06a..08d5c891 100644 --- a/Apollo/assets/views/student/studentUnivFeeCompareDetails.html +++ b/Apollo/assets/views/student/studentUnivFeeCompareDetails.html @@ -2,8 +2,8 @@
    -

    {{ mainTitle }}

    - Student Form Enrolment Details. +

    {{ mainTitle }}

    + Student Form Enrollment Details.
    @@ -43,7 +43,7 @@
    - +
    - +
    @@ -60,7 +60,7 @@
    - Add Enrolment Details + Add Enrollment Details
    @@ -68,7 +68,7 @@
    Enrolment no is required + ng-hide="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enrollment no is required Enter a valid enrolment no + ng-if="manualEnForm.manualEnrolmentNo.$error.maxlength || manualEnForm.manualEnrolmentNo.$error.minlength || manualEnForm.manualEnrolmentNo.$error.pattern">Enter a valid enrollment no
    @@ -172,7 +172,7 @@
    @@ -334,7 +332,7 @@
    - +
    @@ -344,11 +342,11 @@
    Loading...
    -
    No Record Found ...
    +
    No record found ...
    -
    +
    @@ -359,7 +357,7 @@ - + @@ -377,7 +375,7 @@ - + @@ -402,7 +400,7 @@
    FormIDEnrolmentNoEnrollment ID SemesterYear MobileNumber StudentName
    {{p.FormID}} {{p.EnrolmentNo}}
    - +