From 6efc2f7ffffed6c8c473caeaebb26bb087a0b6cd Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Tue, 5 Sep 2017 17:03:50 -0400 Subject: Remove unused files with company keywords Drop the static FE pages that were once used to redirect users. Issue: PORTAL-86 Change-Id: Idb1f3b07f2b30319b58d993fcafd7e95b1c6d5a3 Signed-off-by: Christopher Lott (cl778h) --- .../client/app/views/role/role.html | 25 +------------ .../user.notifications.modal.controller.js | 41 +++++++++++++++++++--- .../user.notifications.modal.less | 13 +++++++ .../user.notifications.modal.page.html | 25 ++++++++----- 4 files changed, 67 insertions(+), 37 deletions(-) (limited to 'ecomp-portal-FE-common/client/app') diff --git a/ecomp-portal-FE-common/client/app/views/role/role.html b/ecomp-portal-FE-common/client/app/views/role/role.html index 9febc978..63073aeb 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role.html +++ b/ecomp-portal-FE-common/client/app/views/role/role.html @@ -94,30 +94,7 @@ Manage Role Functions

- -
- - -
- -
- - - - - - - - - - - - - -
NameRemove
-
-
-
+ diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.controller.js b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.controller.js index 81384ad0..366fb215 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.controller.js +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.controller.js @@ -187,7 +187,7 @@ // // pre-processing if (!($scope.isEditMode)) { var validation = false; - if ($scope.isDateValid($scope.newNotifModel.startTime) && $scope.isDateValid($scope.newNotifModel.endTime) && $scope.newNotifModel.msgHeader != '' && $scope.newNotifModel.msgDescription != '' && ($scope.newNotifModel.startTime < $scope.newNotifModel.endTime)) { + if ($scope.isStartDateValidFromToday($scope.newNotifModel.startTime)&&$scope.isStartDateValidFromToday($scope.newNotifModel.endTime)&&$scope.isDateValid($scope.newNotifModel.startTime) && $scope.isDateValid($scope.newNotifModel.endTime) && $scope.newNotifModel.msgHeader != '' && $scope.newNotifModel.msgDescription != '' && ($scope.newNotifModel.startTime < $scope.newNotifModel.endTime)) { validation = true; if ($scope.newNotifModel.isForAllRoles == 'N') { validation = $scope.checkTreeSelect(); @@ -212,6 +212,8 @@ $scope.newNotifModel.endTime = $filter('date')($scope.endTime, 'medium'); } } + + /*To validate the manual entry of date in MM/DD/YYYY Format*/ $scope.isDateValid = function(time) { if (time == undefined) { @@ -228,10 +230,39 @@ var year = startDateformat[2]; if (year.length != 4) return false; var composedDate = new Date(year, month, day); - return composedDate.getDate() == day && - composedDate.getMonth() == month && - composedDate.getFullYear() == year; - + return composedDate.getDate() == day && + composedDate.getMonth() == month && + composedDate.getFullYear() == year; + }; + + /*The manual and drop down calendar should be consistent. + Start date must be greater than or equal to current date.The end dates are not allowed after the 3 months from current dates*/ + + $scope.isStartDateValidFromToday = function (time) { + if(time == undefined){ + return false; + } + if(typeof time == 'object'){ + return true; + } + var startDateformat =time.split('/'); + if (startDateformat.length != 3) return true; + var day = startDateformat[1]; + var month = startDateformat[0]; + month= parseInt(month)-1; + var year = startDateformat[2]; + if(year.length!=4) return true; + var composedDate = new Date(year, month, day); + /* As end dates are not allowed after the 3 months from current dates*/ + var x = 3; //or whatever offset + var CurrentDate = new Date(); + /*If composed date is less than the current date,error message should display*/ + if(composedDateCurrentDate) + return false; + return true; }; diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.less b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.less index 79c2bae2..17bbdab8 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.less +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.less @@ -169,3 +169,16 @@ right: 10px; top: 8px; } + +.date-validation{ + top:185px; + color: #cf2a2a; + font-size: 10px; + position:absolute; +} +.endDate-validation{ + top:270px; + color: #cf2a2a; + font-size: 10px; + position:absolute; +} \ No newline at end of file diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.page.html b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.page.html index 57433c1c..5d1698e5 100644 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.page.html +++ b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.modal.page.html @@ -131,10 +131,14 @@ ng-model="newNotifModel.startTime" b2b-datepicker min="minDate" max="maxDate" required /> -
- Please enter valid date in MM/DD/YYYY format! +
+
+ Please enter valid date in MM/DD/YYYY format! +
+
+ Date should be greater than or equal to current date! +
-
@@ -142,18 +146,23 @@
- * End Date (Local Time) + * EndDate (Local Time)
-
+
+
Please enter valid date in MM/DD/YYYY format!
-
- End Date must be greater than start Date +
+ Date should be greater than or equal to current date! +
+
+ End Date must be greater than start Date +
@@ -181,7 +190,7 @@ ng-model="newNotifModel.msgDescription" name="content">
- Message is Required + Message is Required
-- cgit 1.2.3-korg