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

main nav details changes : kdk

Browse Source
This commit is contained in:
dineshkumarkannan 2018-08-18 09:56:05 +05:30
parent cc726d115f
commit dbc0cf50d6
6 changed files with 60 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,8 +104,8 @@
"MAIN": "UPDATE STATUS ", "MAIN": "UPDATE STATUS ",
"STUDYMATERIAL": "STUDY MATERIAL", "STUDYMATERIAL": "STUDY MATERIAL",
"ANSWERBOOKLET": "ANSWER BOOKLET", "ANSWERBOOKLET": "ANSWER BOOKLET",
"CERTIFICATION": "MARK CARD", "MARKCARD": "MARK CARD",
"APPLICATION" : "DOCUMENTS" "CERTIFICATE" : "CERTIFICATE"
} }
}, },
"status": { "status": {

4
Apollo/assets/js/config.constant.js
View File

@ -156,11 +156,11 @@ app.constant('JS_REQUIRES', {
/* /*
* student Certification status updation * student Certification status updation
* */ * */
'certificationStatusCtrl': 'assets/js/controllers/certificationStatusCtrl.js', 'markcardStatusCtrl': 'assets/js/controllers/markcardStatusCtrl.js',
/* /*
* student Certification status updation * student Certification status updation
* */ * */
'applicationStatusCtrl': 'assets/js/controllers/applicationStatusCtrl.js', 'certificateStatusCtrl': 'assets/js/controllers/certificateStatusCtrl.js',
/* /*
* Certificate Type * Certificate Type
* */ * */

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

@ -315,22 +315,22 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
label: 'Answer Booklet' label: 'Answer Booklet'
}, },
// resolve: loadSequence('wizardCtrl') // resolve: loadSequence('wizardCtrl')
}).state('app.student.status.certificationstatus', { }).state('app.student.status.markcard', {
url: '/certificationstatus', url: '/markcard',
templateUrl: "assets/views/status-update/certification_status.html", templateUrl: "assets/views/status-update/markcard_status.html",
title: 'Mark Card', title: 'Mark Card',
resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificationStatusCtrl'), resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'markcardStatusCtrl'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Mark Card' label: 'Mark Card'
}, },
// resolve: loadSequence('wizardCtrl') // resolve: loadSequence('wizardCtrl')
}).state('app.student.status.applicationstatus', { }).state('app.student.status.certificate', {
url: '/applicationstatus', url: '/certificate',
templateUrl: "assets/views/status-update/application_status.html", templateUrl: "assets/views/status-update/certificate_status.html",
title: 'Documents Status', title: 'Certificate Status',
resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'), resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificateStatusCtrl'),
ncyBreadcrumb: { ncyBreadcrumb: {
label: 'Documents Status' label: 'Certificate Status'
}, },
// resolve: loadSequence('wizardCtrl') // resolve: loadSequence('wizardCtrl')
}).state('app.status.application', { }).state('app.status.application', {

35
Apollo/assets/js/controllers/certificateStatusCtrl.js
View File

@ -28,32 +28,29 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk'); var localDetails = ipCookie('cookiechk');
const localUpdateStatus = 'APPICATION_STATUS'; const localUpdateStatus = 'CERTIFICATE_STATUS';
$scope.localTypeSuperAdmin = false; $scope.localTypeSuperAdmin = false;
$scope.localBranchDetails = ''; $scope.localBranchDetails = '';
$scope.init = function () { $scope.init = function () {
// var logcheck = JSON.parse(localStorage.getItem('localObj'));
var logcheck = JSON.parse(localStorage.getItem('localObj')); // const LOCALTYPE = logcheck.localType;
// if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
const LOCALTYPE = logcheck.localType; // console.log("if");
if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { // }else {
console.log("if"); // if(logcheck != null && LOCALTYPE !='R001') {
}else { // console.log("else if");
if(logcheck != null && LOCALTYPE !='R001') { // $state.go('app.dashboard');
console.log("else if"); // } else {
$state.go('app.dashboard');
} else {
console.log("else else");
//ipCookie.remove('cookiechk');
window.localStorage.clear();
$state.go('login.signin');
}
}
// console.log("else else");
// //ipCookie.remove('cookiechk');
// window.localStorage.clear();
// $state.go('login.signin');
// }
// }
if (localDetail != null) { if (localDetail != null) {
if (localDetails.localType === 'R004') { if (localDetails.localType === 'R004') {

35
Apollo/assets/js/controllers/markcardStatusCtrl.js
View File

@ -32,28 +32,21 @@ app.controller('markcardStatusCtrl', ["$scope", "toaster", "$filter", "ngTablePa
$scope.init = function () { $scope.init = function () {
// const LOCALTYPE = localDetail.localType;
// if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) {
// console.log("if");
// }else {
// if(localDetail != null && LOCALTYPE !='R001') {
// console.log("else if");
// $state.go('app.dashboard');
// } else {
// console.log("else else");
const LOCALTYPE = localDetail.localType; // //ipCookie.remove('cookiechk');
if (localDetail != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { // //window.localStorage.clear();
console.log("if"); // $state.go('login.signin');
}else { // }
if(localDetail != null && LOCALTYPE !='R001') { // }
console.log("else if");
$state.go('app.dashboard');
} else {
console.log("else else");
//ipCookie.remove('cookiechk');
//window.localStorage.clear();
$state.go('login.signin');
}
}
if (localDetail != null) { if (localDetail != null) {
if (localDetails.localType === 'R004') { if (localDetails.localType === 'R004') {

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

@ -199,13 +199,13 @@
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkSuperAdmin()"> <a ui-sref="app.student.status.markcard" translate="sidebar.nav.student.status.MARKCARD" ng-click="checkSuperAdmin()">
Certification MarkCard
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkSuperAdmin()"> <a ui-sref="app.student.status.certificate" translate="sidebar.nav.student.status.CERTIFICATE" ng-click="checkSuperAdmin()">
Application Certificate
</a> </a>
</li> </li>
</ul> </ul>
@ -650,13 +650,13 @@
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkAdmin()"> <a ui-sref="app.student.status.markcard" translate="sidebar.nav.student.status.MARKCARD" ng-click="checkAdmin()">
Certification Markcard
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkAdmin()"> <a ui-sref="app.student.status.certificate" translate="sidebar.nav.student.status.CERTIFICATE" ng-click="checkAdmin()">
Application Certificate
</a> </a>
</li> </li>
</ul> </ul>
@ -1025,13 +1025,13 @@
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkStaff()"> <a ui-sref="app.student.status.markcard" translate="sidebar.nav.student.status.MARKCARD" ng-click="checkStaff()">
Certification Markcard
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkStaff()"> <a ui-sref="app.student.status.certificate" translate="sidebar.nav.student.status.CERTIFICATE" ng-click="checkStaff()">
Application Certificate
</a> </a>
</li> </li>
</ul> </ul>
@ -1292,13 +1292,13 @@
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.certificationstatus" translate="sidebar.nav.student.status.CERTIFICATION" ng-click="checkStaff()"> <a ui-sref="app.student.status.markcard" translate="sidebar.nav.student.status.MARKCARD" ng-click="checkStaff()">
Certification Markcard
</a> </a>
</li> </li>
<li ui-sref-active="active"> <li ui-sref-active="active">
<a ui-sref="app.student.status.applicationstatus" translate="sidebar.nav.student.status.APPLICATION" ng-click="checkStaff()"> <a ui-sref="app.student.status.certificate" translate="sidebar.nav.student.status.CERTIFICATE" ng-click="checkStaff()">
Application Certificate
</a> </a>
</li> </li>
</ul> </ul>