From dbc0cf50d609cb4e85ebcff8320c9291701ba50e Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Sat, 18 Aug 2018 09:56:05 +0530 Subject: [PATCH] main nav details changes : kdk --- Apollo/assets/i18n/en.json | 4 +-- Apollo/assets/js/config.constant.js | 4 +-- Apollo/assets/js/config.router.js | 20 +++++------ .../js/controllers/certificateStatusCtrl.js | 35 +++++++++---------- .../js/controllers/markcardStatusCtrl.js | 35 ++++++++----------- Apollo/assets/views/partials/nav.html | 32 ++++++++--------- 6 files changed, 60 insertions(+), 70 deletions(-) diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 454c8886..a36e505b 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -104,8 +104,8 @@ "MAIN": "UPDATE STATUS ", "STUDYMATERIAL": "STUDY MATERIAL", "ANSWERBOOKLET": "ANSWER BOOKLET", - "CERTIFICATION": "MARK CARD", - "APPLICATION" : "DOCUMENTS" + "MARKCARD": "MARK CARD", + "CERTIFICATE" : "CERTIFICATE" } }, "status": { diff --git a/Apollo/assets/js/config.constant.js b/Apollo/assets/js/config.constant.js index 3eabac83..5fbe55ab 100755 --- a/Apollo/assets/js/config.constant.js +++ b/Apollo/assets/js/config.constant.js @@ -156,11 +156,11 @@ app.constant('JS_REQUIRES', { /* * student Certification status updation * */ - 'certificationStatusCtrl': 'assets/js/controllers/certificationStatusCtrl.js', + 'markcardStatusCtrl': 'assets/js/controllers/markcardStatusCtrl.js', /* * student Certification status updation * */ - 'applicationStatusCtrl': 'assets/js/controllers/applicationStatusCtrl.js', + 'certificateStatusCtrl': 'assets/js/controllers/certificateStatusCtrl.js', /* * Certificate Type * */ diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index bf4bb81e..0760db6b 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -315,22 +315,22 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'Answer Booklet' }, // resolve: loadSequence('wizardCtrl') - }).state('app.student.status.certificationstatus', { - url: '/certificationstatus', - templateUrl: "assets/views/status-update/certification_status.html", + }).state('app.student.status.markcard', { + url: '/markcard', + templateUrl: "assets/views/status-update/markcard_status.html", 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: { label: 'Mark Card' }, // resolve: loadSequence('wizardCtrl') - }).state('app.student.status.applicationstatus', { - url: '/applicationstatus', - templateUrl: "assets/views/status-update/application_status.html", - title: 'Documents Status', - resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'applicationStatusCtrl'), + }).state('app.student.status.certificate', { + url: '/certificate', + templateUrl: "assets/views/status-update/certificate_status.html", + title: 'Certificate Status', + resolve: loadSequence('ui.select','spin', 'ui.mask', 'spin', 'ladda', 'angular-ladda', 'ngTable', 'certificateStatusCtrl'), ncyBreadcrumb: { - label: 'Documents Status' + label: 'Certificate Status' }, // resolve: loadSequence('wizardCtrl') }).state('app.status.application', { diff --git a/Apollo/assets/js/controllers/certificateStatusCtrl.js b/Apollo/assets/js/controllers/certificateStatusCtrl.js index 54d7a0b0..4f632fed 100644 --- a/Apollo/assets/js/controllers/certificateStatusCtrl.js +++ b/Apollo/assets/js/controllers/certificateStatusCtrl.js @@ -28,32 +28,29 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetails = ipCookie('cookiechk'); - const localUpdateStatus = 'APPICATION_STATUS'; + const localUpdateStatus = 'CERTIFICATE_STATUS'; $scope.localTypeSuperAdmin = false; $scope.localBranchDetails = ''; $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' )) { - console.log("if"); - }else { - if(logcheck != 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'); - } - } - + // const LOCALTYPE = logcheck.localType; + // if (logcheck != null && (LOCALTYPE == 'R003' || LOCALTYPE == 'R004' )) { + // console.log("if"); + // }else { + // if(logcheck != 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 (localDetails.localType === 'R004') { diff --git a/Apollo/assets/js/controllers/markcardStatusCtrl.js b/Apollo/assets/js/controllers/markcardStatusCtrl.js index 4a263ded..8fb63ce8 100644 --- a/Apollo/assets/js/controllers/markcardStatusCtrl.js +++ b/Apollo/assets/js/controllers/markcardStatusCtrl.js @@ -32,28 +32,21 @@ app.controller('markcardStatusCtrl', ["$scope", "toaster", "$filter", "ngTablePa $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 { - - 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"); - //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 (localDetails.localType === 'R004') { diff --git a/Apollo/assets/views/partials/nav.html b/Apollo/assets/views/partials/nav.html index ec04b8a2..b5a0d5e4 100755 --- a/Apollo/assets/views/partials/nav.html +++ b/Apollo/assets/views/partials/nav.html @@ -199,13 +199,13 @@
  • - - Certification + + MarkCard
  • - - Application + + Certificate
    • @@ -650,13 +650,13 @@
  • - - Certification + + Markcard
  • - - Application + + Certificate
    • @@ -1025,13 +1025,13 @@
  • - - Certification + + Markcard
  • - - Application + + Certificate
    • @@ -1292,13 +1292,13 @@
  • - - Certification + + Markcard
  • - - Application + + Certificate