Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common files changes for nav options

Browse Source
This commit is contained in:
gandhimathi 2018-09-11 14:38:57 +05:30
parent de7cee569a
commit f2f8b99f7e
4 changed files with 73 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
View File

@ -165,9 +165,8 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller {
// Set the response and exit // Set the response and exit
$this->response($getUnmatchedFormDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code $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 // Set the response and exit
$this->response($getUnmatchedFormDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code $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 // Set the response and exit
$this->response([ $this->response([
'message' => 'Something went wrong.please try again!', '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 ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
} }
} }

7
Apollo/assets/i18n/en.json
View File

@ -118,6 +118,13 @@
"APPLICATION": "Application" "APPLICATION": "Application"
} }
}, },
"formupload": {
"MAIN": "UNIVERSITY FORMS",
"ENROLLMENT": "Enrollment",
"STUDENTFEEDETAILCOMPARE": "Form Enrolment",
"STUDENTFROMIDFEEDETAILS": "Form Fees",
"UNIVERSITYFORMPAYMENT": "Payment"
},
"status": { "status": {
"MAIN": "STATUS", "MAIN": "STATUS",
"APPLICATION": "Application", "APPLICATION": "Application",

54
Apollo/assets/js/config.router.js
View File

@ -307,30 +307,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Manage Details' label: 'Manage Details'
} }
}).state('app.student.UnivFormEnroment', { })
url: '/univformenrolment', .state('app.formupload', {
templateUrl: "assets/views/student/studentUnivFeeCompareDetails.html", url: '/student',
resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'student_university_fee_compareCtrl', 'ngTable'), template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT DETAILS </div> </div>',
title: 'University Form Enrolment', title: 'Student',
ncyBreadcrumb: { 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', { }).state('app.student.status', {
url: '/status', url: '/status',
template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>', template: '<div ui-view class="fade-in-up"> <div style="margin: auto; width: 50%;padding: 10px;"> STUDENT STATUS UPDATE </div> </div>',
@ -816,7 +800,31 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
label: 'Student Merge' 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); // $locationProvider.html5Mode(true);

49
Apollo/assets/views/partials/nav.html
View File

@ -180,7 +180,7 @@
</a> </a>
</li>--> </li>-->
<li> <li>
<a href="javascript:;"> <a href="javascript:void(0);">
<span translate="sidebar.nav.student.status.MAIN">Status Update</span> <i class="icon-arrow"></i> <span translate="sidebar.nav.student.status.MAIN">Status Update</span> <i class="icon-arrow"></i>
</a> </a>
<ul class="sub-menu"> <ul class="sub-menu">
@ -216,23 +216,9 @@
</li> </li>
</ul> </ul>
</li> </li>
<li ui-sref-active="active">
<a ui-sref="app.student.UnivFormEnroment" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.STUDENTFEEDETAILCOMPARE"> University Form Enrolment </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.studentUnivFormIdFeeDetails" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.STUDENTFROMIDFEEDETAILS"> STUDENT FORMID FEE DETAILS </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.student.universityformpayment" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.student.UNIVERSITYFORMPAYMENT"> University Form Payment </span>
</a>
</li>
</ul> </ul>
</li> </li>
<!--<li ng-class="{'active open':$state.includes('app.call')}"> <!--<li ng-class="{'active open':$state.includes('app.call')}">
<a ui-sref="app.call.tracking"> <a ui-sref="app.call.tracking">
<div class="item-content"> <div class="item-content">
@ -426,6 +412,7 @@
</ul> </ul>
</li> </li>
<li ng-class="{'active open':$state.includes('app.reports')}"> <li ng-class="{'active open':$state.includes('app.reports')}">
<a href="javascript:void(0)"> <a href="javascript:void(0)">
@ -522,6 +509,36 @@
</ul> </ul>
</li> </li>
<li ng-class="{'active open':$state.includes('app.formupload')}">
<a href="javascript:void(0)">
<div class="item-content">
<div class="item-media">
<i class="ti-check"></i>
</div>
<div class="item-inner">
<span class="title" translate="sidebar.nav.formupload.MAIN"> University Form Upload </span><i class="icon-arrow"></i>
</div>
</div>
</a>
<ul class="sub-menu">
<li ui-sref-active="active">
<a ui-sref="app.formupload.UnivFormEnroment" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.formupload.STUDENTFEEDETAILCOMPARE"> Form Enrolment </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.formupload.studentUnivFormIdFeeDetails" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.formupload.STUDENTFROMIDFEEDETAILS"> Form Fees </span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.formupload.universityformpayment" ng-click="checkSuperAdmin()">
<span class="title" translate="sidebar.nav.formupload.UNIVERSITYFORMPAYMENT"> Payment </span>
</a>
</li>
</ul>
</li>
<!--<li ng-class="{'active open':$state.includes('app.myprofile')}"> <!--<li ng-class="{'active open':$state.includes('app.myprofile')}">
<a ui-sref="app.myprofile" ng-click="checkSuperAdmin()"> <a ui-sref="app.myprofile" ng-click="checkSuperAdmin()">
<div class="item-content"> <div class="item-content">