motech-implementations · dependabot · Sep 1, 2020 · Sep 1, 2020 · Oct 6, 2020 · Dec 18, 2020
diff --git a/Email/NMSReportingSuite/pom.xml b/Email/NMSReportingSuite/pom.xml
@@ -8,7 +8,7 @@
     <name>NMSReportingSuite Maven Webapp</name>
     <url>http://maven.apache.org</url>
     <properties>
-        <springframework.version>4.2.5.RELEASE</springframework.version>
+        <springframework.version>6.0.0</springframework.version>
         <springsecurity.version>4.0.4.RELEASE</springsecurity.version>
         <hibernate.version>4.3.11.Final</hibernate.version>
         <mysql.connector.version>5.1.31</mysql.connector.version>

diff --git a/app/views/aboutKilkari.html → app/htpagesmis/aboutKilkari.html b/app/views/aboutKilkari.html → app/htpagesmis/aboutKilkari.html
diff --git a/app/views/aboutMA.html → app/htpagesmis/aboutMA.html b/app/views/aboutMA.html → app/htpagesmis/aboutMA.html
diff --git a/app/views/aboutUs.html → app/htpagesmis/aboutUs.html b/app/views/aboutUs.html → app/htpagesmis/aboutUs.html
diff --git a/app/views/bulkUser.html → app/htpagesmis/bulkUser.html b/app/views/bulkUser.html → app/htpagesmis/bulkUser.html
diff --git a/app/views/changePassword.html → app/htpagesmis/changePassword.html b/app/views/changePassword.html → app/htpagesmis/changePassword.html
diff --git a/app/views/contactUs.html → app/htpagesmis/contactUs.html b/app/views/contactUs.html → app/htpagesmis/contactUs.html
diff --git a/app/views/contactUsResponse.html → app/htpagesmis/contactUsResponse.html b/app/views/contactUsResponse.html → app/htpagesmis/contactUsResponse.html
diff --git a/app/views/copyrightPolicy.html → app/htpagesmis/copyrightPolicy.html b/app/views/copyrightPolicy.html → app/htpagesmis/copyrightPolicy.html
diff --git a/app/views/createUser.html → app/htpagesmis/createUser.html b/app/views/createUser.html → app/htpagesmis/createUser.html
diff --git a/app/views/disclaimer.html → app/htpagesmis/disclaimer.html b/app/views/disclaimer.html → app/htpagesmis/disclaimer.html
diff --git a/app/views/downloads.html → app/htpagesmis/downloads.html b/app/views/downloads.html → app/htpagesmis/downloads.html
diff --git a/app/views/editUser.html → app/htpagesmis/editUser.html b/app/views/editUser.html → app/htpagesmis/editUser.html
diff --git a/app/views/faq.html → app/htpagesmis/faq.html b/app/views/faq.html → app/htpagesmis/faq.html
diff --git a/app/views/faqAggregateInfo.html → app/htpagesmis/faqAggregateInfo.html b/app/views/faqAggregateInfo.html → app/htpagesmis/faqAggregateInfo.html
diff --git a/app/views/faqGeneralInfo.html → app/htpagesmis/faqGeneralInfo.html b/app/views/faqGeneralInfo.html → app/htpagesmis/faqGeneralInfo.html
diff --git a/app/views/faqLineListingInfo.html → app/htpagesmis/faqLineListingInfo.html b/app/views/faqLineListingInfo.html → app/htpagesmis/faqLineListingInfo.html
diff --git a/app/views/faqLoginInfo.html → app/htpagesmis/faqLoginInfo.html b/app/views/faqLoginInfo.html → app/htpagesmis/faqLoginInfo.html
diff --git a/app/views/faqReportsInfo.html → app/htpagesmis/faqReportsInfo.html b/app/views/faqReportsInfo.html → app/htpagesmis/faqReportsInfo.html
diff --git a/app/views/feedbackForm.html → app/htpagesmis/feedbackForm.html b/app/views/feedbackForm.html → app/htpagesmis/feedbackForm.html
diff --git a/app/views/feedbackResponse.html → app/htpagesmis/feedbackResponse.html b/app/views/feedbackResponse.html → app/htpagesmis/feedbackResponse.html
diff --git a/app/views/forgotPassword.html → app/htpagesmis/forgotPassword.html b/app/views/forgotPassword.html → app/htpagesmis/forgotPassword.html
diff --git a/app/views/helpPage.html → app/htpagesmis/helpPage.html b/app/views/helpPage.html → app/htpagesmis/helpPage.html
diff --git a/app/views/hyperLinkingPolicy.html → app/htpagesmis/hyperLinkingPolicy.html b/app/views/hyperLinkingPolicy.html → app/htpagesmis/hyperLinkingPolicy.html
diff --git a/app/views/login.html → app/htpagesmis/login.html b/app/views/login.html → app/htpagesmis/login.html
diff --git a/app/views/pagination.html → app/htpagesmis/pagination.html b/app/views/pagination.html → app/htpagesmis/pagination.html
diff --git a/app/views/privacyPolicy.html → app/htpagesmis/privacyPolicy.html b/app/views/privacyPolicy.html → app/htpagesmis/privacyPolicy.html
diff --git a/app/views/profile.html → app/htpagesmis/profile.html b/app/views/profile.html → app/htpagesmis/profile.html
diff --git a/app/views/reports.html → app/htpagesmis/reports.html b/app/views/reports.html → app/htpagesmis/reports.html
diff --git a/app/views/sitemap.html → app/htpagesmis/sitemap.html b/app/views/sitemap.html → app/htpagesmis/sitemap.html
diff --git a/app/views/tAndC.html → app/htpagesmis/tAndC.html b/app/views/tAndC.html → app/htpagesmis/tAndC.html
diff --git a/app/views/userManagement.html → app/htpagesmis/userManagement.html b/app/views/userManagement.html → app/htpagesmis/userManagement.html
diff --git a/app/views/userManual.html → app/htpagesmis/userManual.html b/app/views/userManual.html → app/htpagesmis/userManual.html
diff --git a/app/views/userManual_Management.html → app/htpagesmis/userManual_Management.html b/app/views/userManual_Management.html → app/htpagesmis/userManual_Management.html
diff --git a/app/views/userManual_Profile.html → app/htpagesmis/userManual_Profile.html b/app/views/userManual_Profile.html → app/htpagesmis/userManual_Profile.html
diff --git a/app/views/userManual_kilkari.html → app/htpagesmis/userManual_kilkari.html b/app/views/userManual_kilkari.html → app/htpagesmis/userManual_kilkari.html
diff --git a/app/views/userManual_kilkariAgg.html → app/htpagesmis/userManual_kilkariAgg.html b/app/views/userManual_kilkariAgg.html → app/htpagesmis/userManual_kilkariAgg.html
diff --git a/app/views/userManual_mobileAcademy.html → app/htpagesmis/userManual_mobileAcademy.html b/app/views/userManual_mobileAcademy.html → app/htpagesmis/userManual_mobileAcademy.html
diff --git a/app/views/userManual_mobileAcademyAgg.html → ...pagesmis/userManual_mobileAcademyAgg.html b/app/views/userManual_mobileAcademyAgg.html → ...pagesmis/userManual_mobileAcademyAgg.html
diff --git a/app/views/userManual_websiteInformation.html → ...gesmis/userManual_websiteInformation.html b/app/views/userManual_websiteInformation.html → ...gesmis/userManual_websiteInformation.html
diff --git a/app/views/userTable.html → app/htpagesmis/userTable.html b/app/views/userTable.html → app/htpagesmis/userTable.html
diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -82,31 +82,33 @@ 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();
                 }
             }
         }).state('userManagement.createUser', {
             url: '/create',
-            templateUrl: 'views/createUser.html',
+            templateUrl: 'htpagesmis/createUser.html',
             resolve : {
                 user : function ( authorizationRole) {
                     return authorizationRole.authorize();
                 }
             }
         }).state('userManagement.userTable', {
             url: '/:pageNum',
-            templateUrl: 'views/userTable.html',
+            templateUrl: 'htpagesmis/userTable.html',
             reloadOnSearch: false,
             resolve : {
                 user : function ( authorizationRole) {
@@ -118,236 +120,236 @@ 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();
                 }
             }
         }).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();
                 }
             }
         }).state('profile', {
             url: '/profile',
-            templateUrl: 'views/profile.html',
+            templateUrl: 'htpagesmis/profile.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).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();
                 }
             }
         }).state('feedbackResponse', {
             url: '/feedbackResponse',
-            templateUrl: 'views/feedbackResponse.html',
+            templateUrl: 'htpagesmis/feedbackResponse.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).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();
                 }
             }
         }).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();
                 }
             }
         }).state('AboutMA', {
             url: '/aboutMA',
-            templateUrl: 'views/aboutMA.html',
+            templateUrl: 'htpagesmis/aboutMA.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).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();
                 }
             }
         }).state('changePassword', {
             url: '/changePassword',
-            templateUrl: 'views/changePassword.html',
+            templateUrl: 'htpagesmis/changePassword.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('userManual', {
             url: '/userManual',
-            templateUrl: 'views/userManual.html',
+            templateUrl: 'htpagesmis/userManual.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('userManual.kilkari', {
             url: '/kilkari',
-            templateUrl: 'views/userManual_kilkari.html',
+            templateUrl: 'htpagesmis/userManual_kilkari.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('userManual.kilkariAggregate', {
             url: '/kilkariAggregate',
-            templateUrl: 'views/userManual_kilkariAgg.html',
+            templateUrl: 'htpagesmis/userManual_kilkariAgg.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('userManual.websiteInformation', {
             url: '/WebsiteInformation',
-            templateUrl: 'views/userManual_websiteInformation.html',
+            templateUrl: 'htpagesmis/userManual_websiteInformation.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('userManual.mobileAcademy', {
             url: '/mobileAcademy',
-            templateUrl: 'views/userManual_mobileAcademy.html',
+            templateUrl: 'htpagesmis/userManual_mobileAcademy.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('userManual.mobileAcademyAggregate', {
             url: '/mobileAcademyAggregate',
-            templateUrl: 'views/userManual_mobileAcademyAgg.html',
+            templateUrl: 'htpagesmis/userManual_mobileAcademyAgg.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('userManual.userManual_Management', {
             url: '/userManual_Management',
-            templateUrl: 'views/userManual_Management.html',
+            templateUrl: 'htpagesmis/userManual_Management.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('userManual.userManual_Profile', {
             url: '/userManual_Profile',
-            templateUrl: 'views/userManual_Profile.html',
+            templateUrl: 'htpagesmis/userManual_Profile.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('faq', {
             url: '/faq',
-            templateUrl: 'views/faq.html',
+            templateUrl: 'htpagesmis/faq.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('faq.faqGeneralInfo', {
             url: '/general-info',
-            templateUrl: 'views/faqGeneralInfo.html',
+            templateUrl: 'htpagesmis/faqGeneralInfo.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('faq.faqLoginInfo', {
             url: '/login-info',
-            templateUrl: 'views/faqLoginInfo.html',
+            templateUrl: 'htpagesmis/faqLoginInfo.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('faq.faqReportsInfo', {
             url: '/reports-info',
-            templateUrl: 'views/faqReportsInfo.html',
+            templateUrl: 'htpagesmis/faqReportsInfo.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('faq.faqLineListingInfo', {
             url: '/line-listing-info',
-            templateUrl: 'views/faqLineListingInfo.html',
+            templateUrl: 'htpagesmis/faqLineListingInfo.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).state('faq.faqAggregateInfo', {
             url: '/aggregate-info',
-            templateUrl: 'views/faqAggregateInfo.html',
+            templateUrl: 'htpagesmis/faqAggregateInfo.html',
             resolve : {
                 user : function ( authorization) {
                     return authorization.authorize();
                 }
             }
         }).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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
 			return {
 			    require: 'ngMessages',
 				restrict: 'AC',
-				templateUrl: '../views/createUser.html',
+				templateUrl: '../htpagesmis/createUser.html',
 				scope:{
 					'newUser':'='
 				}