From f2f8b99f7edb6be5a0d1c932a9f0522116625775 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 11 Sep 2018 14:38:57 +0530 Subject: [PATCH] common files changes for nav options --- ...Receive_Enrolment_Fees_Univ_Controller.php | 5 +- Apollo/assets/i18n/en.json | 7 +++ Apollo/assets/js/config.router.js | 54 +++++++++++-------- Apollo/assets/views/partials/nav.html | 49 +++++++++++------ 4 files changed, 73 insertions(+), 42 deletions(-) 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 6aa47610..39ebe638 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -165,9 +165,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { // Set the response and exit $this->response($getUnmatchedFormDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code } - if ($getUnmatchedFormDetails['unMatchedRecordStatus']==false) + else if ($getUnmatchedFormDetails['unMatchedRecordStatus']==false) { - $getUnmatchedFormDetails['status'] = false; // Set the response and exit $this->response($getUnmatchedFormDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code } @@ -176,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/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/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 - -
    • +