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) <clott@research.att.com>

4 files changed, 67 insertions, 37 deletions

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 @@
 				</div>		
 				
 				<a id="manage-role"  href="roleFunctions">Manage Role Functions</a><br><br>
-				
-				<div id="page-title-child" class="pageTitle">
-					<label>Child Roles</label>
-					<a id="add-child-role"  ng-click="addNewChildRoleModalPopup();" ng-style="{'cursor':'pointer'}" class="icon-primary-accordion-plus" size="small"></a>
-				</div>
-				
-				<div b2b-table table-data="role.childRoles"  ng-hide="users.isLoadingTable"	search-string="users.searchString" class="b2b-table-div">
-					<table>
-						<thead b2b-table-row type="header">
-							<tr >
-								<th id="table-header-name" b2b-table-header key="firstName" sortable="true" >Name</th>
-								<th id="table-header-remove" b2b-table-header key="lastName" sortable="true" >Remove</th>
-							</tr>
-						</thead>
-						<tbody b2b-table-row type="body" 	row-repeat="role in role.childRoles">
-							<tr >
-								<td id="role-function-{{role.name}}" b2b-table-body id="rowheader_t1_{{$index}}" headers="col1" ng-bind="role.name"></td>
-								<td b2b-table-body headers="rowheader_t1_{{$index}} col4" id="{{$index}}-button-remove-role" >
-					    			<div ng-click="removeChildRole(role);" ><a href="javascript:void(0)" class="icon-misc-trash"></a></div>
-								</td>							
-							</tr>
-						</tbody>
-					</table>
-				</div>					
+									
 			</div>
 			</div>
 		</div>
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(composedDate<CurrentDate)
+                	return false;
+                CurrentDate.setMonth(CurrentDate.getMonth() + x);
+                if(composedDate>CurrentDate)
+                	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 />
 					</div>
-					<div id="user-startdate-required" ng-show="!isDateValid(newNotifModel.startTime)">
-						<small class="mandatory-categories">Please enter valid date in MM/DD/YYYY format!</small>
+					<div style="{{( isEditMode )? 'opacity : 0; pointer-events: none;':' '}}">
+						<div id="user-startdate-required" ng-show="!isDateValid(newNotifModel.startTime)">
+							<small class="mandatory-categories">Please enter valid date in MM/DD/YYYY format!</small>
+						</div>
+						<div id="user-startdate-required" ng-show="!isStartDateValidFromToday(newNotifModel.startTime)">
+							<small class="date-validation">Date should be greater than or equal to current date!</small>
+						</div>
 					</div>
-					
 				</div>
 				<div ng-show="!isEditMode" ng-init="formatStartDate()"></div> 
 			</div>			
@@ -142,18 +146,23 @@
 			<div id="add-user-notif-enddate" class="add-widget-field"
 				style="padding-bottom: 12px; width: 301px !important; {{( isEditMode )? 'opacity : 0.6; pointer-events: none;':' '}}">
 				<div id="user-notification-enddate-label" class="user-notif-label">
-					<span runat="server" ID="required" class="notifcation-label-user-requiredId">*</span> End	Date (Local Time)
+					<span runat="server" ID="required" class="notifcation-label-user-requiredId">*</span> EndDate (Local Time)
 				</div>
 				<div class="datepicker-container">
 					<input class="notif-input-calendar" type="text" id="datepicker-end" 
 						ng-model="newNotifModel.endTime" b2b-datepicker min="minDate" max="maxDate" 
 						required />
 				</div>
-				<div id="user-endDate-required" ng-show="!isDateValid(newNotifModel.endTime)">
+				<div style="{{( isEditMode )? 'opacity : 0; pointer-events: none;':' '}}">
+					<div id="user-endDate-required" ng-show="!isDateValid(newNotifModel.endTime)">
 						<small class="mandatory-categories">Please enter valid date in MM/DD/YYYY format!</small>
 					</div>
-				<div id="user-enddate-error" ng-show="newNotifModel.endTime&&newNotifModel.startTime&&newNotifModel.startTime.getTime()>=newNotifModel.endTime.getTime()" class="user-enddate-error-txt">
-					<small class="mandatory-categories">End Date must be greater than start Date</small>
+					<div id="user-startdate-required"  ng-show="!isStartDateValidFromToday(newNotifModel.endTime)">
+						<small class="endDate-validation">Date should be greater than or equal to current date!</small>
+					</div>
+					<div id="user-enddate-error" ng-show="newNotifModel.endTime&&newNotifModel.startTime&&newNotifModel.startTime.getTime()>=newNotifModel.endTime.getTime()" class="user-enddate-error-txt">
+						<small class="mandatory-categories">End Date must be greater than start Date</small>
+					</div>
 				</div>
 				<div ng-show="!isEditMode" ng-init="formatEndDate()" ></div> 
 			</div>
@@ -181,7 +190,7 @@
 					ng-model="newNotifModel.msgDescription" name="content">
 				</textarea>
 				<div id="user-notif-message-required" ng-show="newNotifModel.msgDescription.length ==0 ">
-				<small class="mandatory-categories">Message is Required</small>
+					<small class="mandatory-categories">Message is Required</small>
 				</div>
 			</div>