diff --git a/Email/NMSReportingSuite/pom.xml b/Email/NMSReportingSuite/pom.xml index 0a7c9105e..2ebe7c768 100644 --- a/Email/NMSReportingSuite/pom.xml +++ b/Email/NMSReportingSuite/pom.xml @@ -8,7 +8,7 @@ NMSReportingSuite Maven Webapp http://maven.apache.org - 4.2.5.RELEASE + 6.0.0 4.0.4.RELEASE 4.3.11.Final 5.1.31 diff --git a/app/views/aboutKilkari.html b/app/htpagesmis/aboutKilkari.html similarity index 100% rename from app/views/aboutKilkari.html rename to app/htpagesmis/aboutKilkari.html diff --git a/app/views/aboutMA.html b/app/htpagesmis/aboutMA.html similarity index 100% rename from app/views/aboutMA.html rename to app/htpagesmis/aboutMA.html diff --git a/app/views/aboutUs.html b/app/htpagesmis/aboutUs.html similarity index 100% rename from app/views/aboutUs.html rename to app/htpagesmis/aboutUs.html diff --git a/app/views/bulkUser.html b/app/htpagesmis/bulkUser.html similarity index 100% rename from app/views/bulkUser.html rename to app/htpagesmis/bulkUser.html diff --git a/app/views/changePassword.html b/app/htpagesmis/changePassword.html similarity index 100% rename from app/views/changePassword.html rename to app/htpagesmis/changePassword.html diff --git a/app/views/contactUs.html b/app/htpagesmis/contactUs.html similarity index 100% rename from app/views/contactUs.html rename to app/htpagesmis/contactUs.html diff --git a/app/views/contactUsResponse.html b/app/htpagesmis/contactUsResponse.html similarity index 100% rename from app/views/contactUsResponse.html rename to app/htpagesmis/contactUsResponse.html diff --git a/app/views/copyrightPolicy.html b/app/htpagesmis/copyrightPolicy.html similarity index 100% rename from app/views/copyrightPolicy.html rename to app/htpagesmis/copyrightPolicy.html diff --git a/app/views/createUser.html b/app/htpagesmis/createUser.html similarity index 100% rename from app/views/createUser.html rename to app/htpagesmis/createUser.html diff --git a/app/views/disclaimer.html b/app/htpagesmis/disclaimer.html similarity index 100% rename from app/views/disclaimer.html rename to app/htpagesmis/disclaimer.html diff --git a/app/views/downloads.html b/app/htpagesmis/downloads.html similarity index 100% rename from app/views/downloads.html rename to app/htpagesmis/downloads.html diff --git a/app/views/editUser.html b/app/htpagesmis/editUser.html similarity index 100% rename from app/views/editUser.html rename to app/htpagesmis/editUser.html diff --git a/app/views/faq.html b/app/htpagesmis/faq.html similarity index 100% rename from app/views/faq.html rename to app/htpagesmis/faq.html diff --git a/app/views/faqAggregateInfo.html b/app/htpagesmis/faqAggregateInfo.html similarity index 100% rename from app/views/faqAggregateInfo.html rename to app/htpagesmis/faqAggregateInfo.html diff --git a/app/views/faqGeneralInfo.html b/app/htpagesmis/faqGeneralInfo.html similarity index 100% rename from app/views/faqGeneralInfo.html rename to app/htpagesmis/faqGeneralInfo.html diff --git a/app/views/faqLineListingInfo.html b/app/htpagesmis/faqLineListingInfo.html similarity index 100% rename from app/views/faqLineListingInfo.html rename to app/htpagesmis/faqLineListingInfo.html diff --git a/app/views/faqLoginInfo.html b/app/htpagesmis/faqLoginInfo.html similarity index 100% rename from app/views/faqLoginInfo.html rename to app/htpagesmis/faqLoginInfo.html diff --git a/app/views/faqReportsInfo.html b/app/htpagesmis/faqReportsInfo.html similarity index 100% rename from app/views/faqReportsInfo.html rename to app/htpagesmis/faqReportsInfo.html diff --git a/app/views/feedbackForm.html b/app/htpagesmis/feedbackForm.html similarity index 100% rename from app/views/feedbackForm.html rename to app/htpagesmis/feedbackForm.html diff --git a/app/views/feedbackResponse.html b/app/htpagesmis/feedbackResponse.html similarity index 100% rename from app/views/feedbackResponse.html rename to app/htpagesmis/feedbackResponse.html diff --git a/app/views/forgotPassword.html b/app/htpagesmis/forgotPassword.html similarity index 100% rename from app/views/forgotPassword.html rename to app/htpagesmis/forgotPassword.html diff --git a/app/views/helpPage.html b/app/htpagesmis/helpPage.html similarity index 100% rename from app/views/helpPage.html rename to app/htpagesmis/helpPage.html diff --git a/app/views/hyperLinkingPolicy.html b/app/htpagesmis/hyperLinkingPolicy.html similarity index 100% rename from app/views/hyperLinkingPolicy.html rename to app/htpagesmis/hyperLinkingPolicy.html diff --git a/app/views/login.html b/app/htpagesmis/login.html similarity index 100% rename from app/views/login.html rename to app/htpagesmis/login.html diff --git a/app/views/pagination.html b/app/htpagesmis/pagination.html similarity index 100% rename from app/views/pagination.html rename to app/htpagesmis/pagination.html diff --git a/app/views/privacyPolicy.html b/app/htpagesmis/privacyPolicy.html similarity index 100% rename from app/views/privacyPolicy.html rename to app/htpagesmis/privacyPolicy.html diff --git a/app/views/profile.html b/app/htpagesmis/profile.html similarity index 100% rename from app/views/profile.html rename to app/htpagesmis/profile.html diff --git a/app/views/reports.html b/app/htpagesmis/reports.html similarity index 100% rename from app/views/reports.html rename to app/htpagesmis/reports.html diff --git a/app/views/sitemap.html b/app/htpagesmis/sitemap.html similarity index 100% rename from app/views/sitemap.html rename to app/htpagesmis/sitemap.html diff --git a/app/views/tAndC.html b/app/htpagesmis/tAndC.html similarity index 100% rename from app/views/tAndC.html rename to app/htpagesmis/tAndC.html diff --git a/app/views/userManagement.html b/app/htpagesmis/userManagement.html similarity index 100% rename from app/views/userManagement.html rename to app/htpagesmis/userManagement.html diff --git a/app/views/userManual.html b/app/htpagesmis/userManual.html similarity index 100% rename from app/views/userManual.html rename to app/htpagesmis/userManual.html diff --git a/app/views/userManual_Management.html b/app/htpagesmis/userManual_Management.html similarity index 100% rename from app/views/userManual_Management.html rename to app/htpagesmis/userManual_Management.html diff --git a/app/views/userManual_Profile.html b/app/htpagesmis/userManual_Profile.html similarity index 100% rename from app/views/userManual_Profile.html rename to app/htpagesmis/userManual_Profile.html diff --git a/app/views/userManual_kilkari.html b/app/htpagesmis/userManual_kilkari.html similarity index 100% rename from app/views/userManual_kilkari.html rename to app/htpagesmis/userManual_kilkari.html diff --git a/app/views/userManual_kilkariAgg.html b/app/htpagesmis/userManual_kilkariAgg.html similarity index 100% rename from app/views/userManual_kilkariAgg.html rename to app/htpagesmis/userManual_kilkariAgg.html diff --git a/app/views/userManual_mobileAcademy.html b/app/htpagesmis/userManual_mobileAcademy.html similarity index 100% rename from app/views/userManual_mobileAcademy.html rename to app/htpagesmis/userManual_mobileAcademy.html diff --git a/app/views/userManual_mobileAcademyAgg.html b/app/htpagesmis/userManual_mobileAcademyAgg.html similarity index 100% rename from app/views/userManual_mobileAcademyAgg.html rename to app/htpagesmis/userManual_mobileAcademyAgg.html diff --git a/app/views/userManual_websiteInformation.html b/app/htpagesmis/userManual_websiteInformation.html similarity index 100% rename from app/views/userManual_websiteInformation.html rename to app/htpagesmis/userManual_websiteInformation.html diff --git a/app/views/userTable.html b/app/htpagesmis/userTable.html similarity index 100% rename from app/views/userTable.html rename to app/htpagesmis/userTable.html diff --git a/app/scripts/app.js b/app/scripts/app.js index 6f34de75b..4a031fbbf 100644 --- a/app/scripts/app.js +++ b/app/scripts/app.js @@ -82,15 +82,17 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', $stateProvider.state('userManagement', { url: '/userManagement', abstract: true, - templateUrl: 'views/userManagement.html', + templateUrl: 'htpagesmis/userManagement.html', resolve : { - user : function (authorizationRole) { - return authorizationRole.authorize(); + user : function (authorizationRole,authorization){ + if(authorization.authorize()){ + return authorizationRole.authorize(); + } } } }).state('userManagement.bulkUpload', { url: '/bulkUpload', - templateUrl: 'views/bulkUser.html', + templateUrl: 'htpagesmis/bulkUser.html', resolve : { user : function (authorizationRole) { return authorizationRole.authorize(); @@ -98,7 +100,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('userManagement.createUser', { url: '/create', - templateUrl: 'views/createUser.html', + templateUrl: 'htpagesmis/createUser.html', resolve : { user : function ( authorizationRole) { return authorizationRole.authorize(); @@ -106,7 +108,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('userManagement.userTable', { url: '/:pageNum', - templateUrl: 'views/userTable.html', + templateUrl: 'htpagesmis/userTable.html', reloadOnSearch: false, resolve : { user : function ( authorizationRole) { @@ -118,7 +120,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('userManagement.editUser', { url: '/:pageNum/edit/:id', - templateUrl: 'views/editUser.html', + templateUrl: 'htpagesmis/editUser.html', resolve : { user : function ( authorizationRole) { return authorizationRole.authorize(); @@ -126,13 +128,13 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('login', { url: '/login', - templateUrl: 'views/login.html' + templateUrl: 'htpagesmis/login.html' }).state('logout', { url: '/logout', - templateUrl: 'views/login.html' + templateUrl: 'htpagesmis/login.html' }).state('reports', { url: '/reports', - templateUrl: 'views/reports.html', + templateUrl: 'htpagesmis/reports.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -140,7 +142,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('profile', { url: '/profile', - templateUrl: 'views/profile.html', + templateUrl: 'htpagesmis/profile.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -148,10 +150,10 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('forgotPassword', { url: '/forgotPassword', - templateUrl: 'views/forgotPassword.html' + templateUrl: 'htpagesmis/forgotPassword.html' }).state('feedbackForm', { url: '/feedbackForm', - templateUrl: 'views/feedbackForm.html', + templateUrl: 'htpagesmis/feedbackForm.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -159,7 +161,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('feedbackResponse', { url: '/feedbackResponse', - templateUrl: 'views/feedbackResponse.html', + templateUrl: 'htpagesmis/feedbackResponse.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -167,11 +169,11 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('contactUs', { url: '/contactUs', - templateUrl: 'views/contactUs.html' + templateUrl: 'htpagesmis/contactUs.html' }).state('contactUsResponse', { url: '/contactUsResponse', - templateUrl: 'views/contactUsResponse.html', + templateUrl: 'htpagesmis/contactUsResponse.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -179,11 +181,11 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('sitemap', { url: '/sitemap', - templateUrl: 'views/sitemap.html' + templateUrl: 'htpagesmis/sitemap.html' }).state('AboutKilkari', { url: '/kilkari', - templateUrl: 'views/aboutKilkari.html', + templateUrl: 'htpagesmis/aboutKilkari.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -191,7 +193,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('AboutMA', { url: '/aboutMA', - templateUrl: 'views/aboutMA.html', + templateUrl: 'htpagesmis/aboutMA.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -199,27 +201,27 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('PrivacyPolicy', { url: '/privacyPolicy', - templateUrl: 'views/privacyPolicy.html' + templateUrl: 'htpagesmis/privacyPolicy.html' }).state('CopyrightPolicy', { url: '/copyrightPolicy', - templateUrl: 'views/copyrightPolicy.html' + templateUrl: 'htpagesmis/copyrightPolicy.html' }).state('TandC', { url: '/termsAndConditions', - templateUrl: 'views/tAndC.html' + templateUrl: 'htpagesmis/tAndC.html' }).state('HLPolicy', { url: '/hyperLinkingPolicy', - templateUrl: 'views/hyperLinkingPolicy.html' + templateUrl: 'htpagesmis/hyperLinkingPolicy.html' }).state('Disclaimer', { url: '/disclaimer', - templateUrl: 'views/disclaimer.html' + templateUrl: 'htpagesmis/disclaimer.html' }).state('Help', { url: '/help', - templateUrl: 'views/helpPage.html', + templateUrl: 'htpagesmis/helpPage.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -227,7 +229,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('changePassword', { url: '/changePassword', - templateUrl: 'views/changePassword.html', + templateUrl: 'htpagesmis/changePassword.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -235,7 +237,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('userManual', { url: '/userManual', - templateUrl: 'views/userManual.html', + templateUrl: 'htpagesmis/userManual.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -243,7 +245,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('userManual.kilkari', { url: '/kilkari', - templateUrl: 'views/userManual_kilkari.html', + templateUrl: 'htpagesmis/userManual_kilkari.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -251,7 +253,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('userManual.kilkariAggregate', { url: '/kilkariAggregate', - templateUrl: 'views/userManual_kilkariAgg.html', + templateUrl: 'htpagesmis/userManual_kilkariAgg.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -259,7 +261,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('userManual.websiteInformation', { url: '/WebsiteInformation', - templateUrl: 'views/userManual_websiteInformation.html', + templateUrl: 'htpagesmis/userManual_websiteInformation.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -267,7 +269,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('userManual.mobileAcademy', { url: '/mobileAcademy', - templateUrl: 'views/userManual_mobileAcademy.html', + templateUrl: 'htpagesmis/userManual_mobileAcademy.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -275,7 +277,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('userManual.mobileAcademyAggregate', { url: '/mobileAcademyAggregate', - templateUrl: 'views/userManual_mobileAcademyAgg.html', + templateUrl: 'htpagesmis/userManual_mobileAcademyAgg.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -283,7 +285,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('userManual.userManual_Management', { url: '/userManual_Management', - templateUrl: 'views/userManual_Management.html', + templateUrl: 'htpagesmis/userManual_Management.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -291,7 +293,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('userManual.userManual_Profile', { url: '/userManual_Profile', - templateUrl: 'views/userManual_Profile.html', + templateUrl: 'htpagesmis/userManual_Profile.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -299,7 +301,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('faq', { url: '/faq', - templateUrl: 'views/faq.html', + templateUrl: 'htpagesmis/faq.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -307,7 +309,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('faq.faqGeneralInfo', { url: '/general-info', - templateUrl: 'views/faqGeneralInfo.html', + templateUrl: 'htpagesmis/faqGeneralInfo.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -315,7 +317,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('faq.faqLoginInfo', { url: '/login-info', - templateUrl: 'views/faqLoginInfo.html', + templateUrl: 'htpagesmis/faqLoginInfo.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -323,7 +325,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('faq.faqReportsInfo', { url: '/reports-info', - templateUrl: 'views/faqReportsInfo.html', + templateUrl: 'htpagesmis/faqReportsInfo.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -331,7 +333,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('faq.faqLineListingInfo', { url: '/line-listing-info', - templateUrl: 'views/faqLineListingInfo.html', + templateUrl: 'htpagesmis/faqLineListingInfo.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -339,7 +341,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('faq.faqAggregateInfo', { url: '/aggregate-info', - templateUrl: 'views/faqAggregateInfo.html', + templateUrl: 'htpagesmis/faqAggregateInfo.html', resolve : { user : function ( authorization) { return authorization.authorize(); @@ -347,7 +349,7 @@ var nmsReportsApp = angular.module('nmsReports', ['vcRecaptcha','ui.bootstrap', } }).state('Downloads', { url: '/Downloads', - templateUrl: 'views/downloads.html' + templateUrl: 'htpagesmis/downloads.html' }); $urlRouterProvider.otherwise('/login'); $httpProvider.defaults.headers.common = {}; diff --git a/app/scripts/controllers/reports.js b/app/scripts/controllers/reports.js index a115eceb5..f3e06c825 100644 --- a/app/scripts/controllers/reports.js +++ b/app/scripts/controllers/reports.js @@ -234,7 +234,7 @@ $scope.datePickerOptions.minMode = ''; $scope.datePickerOptions.datepickerMode = 'year'; $scope.datePickerOptions.minMode = 'year'; - if(new Date().getMonth()>3){ + if(new Date().getMonth()>2){ $scope.datePickerOptions.maxDate = new Date().setYear(new Date().getFullYear()); }else{ $scope.datePickerOptions.maxDate = new Date().setYear(new Date().getFullYear() -1); @@ -247,7 +247,7 @@ $scope.datePickerOptions.minMode = ''; $scope.datePickerOptions.datepickerMode = 'year'; $scope.datePickerOptions.minMode = 'year'; - if(new Date().getMonth()>3){ + if(new Date().getMonth()>2){ $scope.datePickerOptions.maxDate = new Date().setYear(new Date().getFullYear()); }else{ $scope.datePickerOptions.maxDate = new Date().setYear(new Date().getFullYear() -1); @@ -648,7 +648,7 @@ $scope.datePickerOptions.minMode = ''; $scope.datePickerOptions.datepickerMode = 'year'; $scope.datePickerOptions.minMode = 'year'; - if(new Date().getMonth()>3){ + if(new Date().getMonth()>2){ $scope.datePickerOptions.maxDate = new Date().setYear(new Date().getFullYear()); }else{ $scope.datePickerOptions.maxDate = new Date().setYear(new Date().getFullYear() -1); @@ -661,7 +661,7 @@ $scope.datePickerOptions.minMode = ''; $scope.datePickerOptions.datepickerMode = 'year'; $scope.datePickerOptions.minMode = 'year'; - if(new Date().getMonth()>3){ + if(new Date().getMonth()>2){ $scope.datePickerOptions.maxDate = new Date().setYear(new Date().getFullYear()); }else{ $scope.datePickerOptions.maxDate = new Date().setYear(new Date().getFullYear() -1); @@ -1175,7 +1175,7 @@ else{ reportRequest.toDate = new Date($scope.dt1.getFullYear(),8,30); } - reportRequest.toDate = new Date($scope.dt1.getFullYear(),8,30); + // reportRequest.toDate = new Date($scope.dt1.getFullYear(),8,30); } if($scope.quarterDisplayType == 'Q4 (Oct to Dec)'){ reportRequest.fromDate = new Date($scope.dt1.getFullYear(),9,1); diff --git a/app/scripts/directives/bulkUser.js b/app/scripts/directives/bulkUser.js index 1a4b39063..af9c81608 100644 --- a/app/scripts/directives/bulkUser.js +++ b/app/scripts/directives/bulkUser.js @@ -4,7 +4,7 @@ .directive('bulkUser', function() { return { restrict: 'AC', - templateUrl: '../views/bulkUser.html', + templateUrl: '../htpagesmis/bulkUser.html', }; }) diff --git a/app/scripts/directives/contactUs.js b/app/scripts/directives/contactUs.js index d5a071fdf..1aa63d015 100644 --- a/app/scripts/directives/contactUs.js +++ b/app/scripts/directives/contactUs.js @@ -4,7 +4,7 @@ .directive('contactUs', function() { return { restrict: 'AC', - templateUrl: '../views/contactUs.html', + templateUrl: '../htpagesmis/contactUs.html', }; }) diff --git a/app/scripts/directives/createUser.js b/app/scripts/directives/createUser.js index 0565d750e..2b8ee9be1 100644 --- a/app/scripts/directives/createUser.js +++ b/app/scripts/directives/createUser.js @@ -5,7 +5,7 @@ return { require: 'ngMessages', restrict: 'AC', - templateUrl: '../views/createUser.html', + templateUrl: '../htpagesmis/createUser.html', scope:{ 'newUser':'=' } diff --git a/app/scripts/directives/editUser.js b/app/scripts/directives/editUser.js index 84e0102d7..78b855eba 100644 --- a/app/scripts/directives/editUser.js +++ b/app/scripts/directives/editUser.js @@ -4,7 +4,7 @@ .directive('editUser', function() { return { restrict: 'AC', - templateUrl: '../views/editUser.html', + templateUrl: '../htpagesmis/editUser.html', scope:{ 'user':'=' } diff --git a/app/scripts/directives/pagination.js b/app/scripts/directives/pagination.js index 2233a4514..43ee0fd7b 100644 --- a/app/scripts/directives/pagination.js +++ b/app/scripts/directives/pagination.js @@ -7,7 +7,7 @@ itemsPerPage: '=', currentPage: '=' }, - templateUrl: 'views/pagination.html' + templateUrl: 'htpagesmis/pagination.html' }; }); })() \ No newline at end of file diff --git a/app/scripts/directives/reports.js b/app/scripts/directives/reports.js index ace42a54a..a7606d20a 100644 --- a/app/scripts/directives/reports.js +++ b/app/scripts/directives/reports.js @@ -4,7 +4,7 @@ .directive('reports', function() { return { restrict: 'AC', - templateUrl: '../views/reports.html', + templateUrl: '../htpagesmis/reports.html', }; }) diff --git a/app/scripts/directives/userManagement.js b/app/scripts/directives/userManagement.js index abae52617..0f9ddbabf 100644 --- a/app/scripts/directives/userManagement.js +++ b/app/scripts/directives/userManagement.js @@ -4,7 +4,7 @@ .directive('userManagement', function() { return { restrict: 'AC', - templateUrl: '../views/userManagement.html', + templateUrl: '../htpagesmis/userManagement.html', }; }) diff --git a/app/scripts/directives/userTable.js b/app/scripts/directives/userTable.js index 67c5e5cbb..6e019f804 100644 --- a/app/scripts/directives/userTable.js +++ b/app/scripts/directives/userTable.js @@ -4,7 +4,7 @@ .directive('userTable', function() { return { restrict: 'EAC', - templateUrl: '../views/userTable.html', + templateUrl: '../htpagesmis/userTable.html', }; })