From 23634dba70b166ad3c79b5eadfbd32b5375d44be Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Mon, 25 Sep 2017 16:07:54 -0400
Subject: MariaDB Connector and Sonar Scans; clean nl

PORTAL-50: Fix to get the Sonar coverage for ONAP
PORTAL-72: Sonar scan - resolving severity Blocker issues
PORTAL-86: Remove internal att.com usages from tests and other files
PORTAL-102: Fixed the page refresh issue on App Account Management page
PORTAL-103: Fix to enhanced notification ticket source for ONAP
PORTAL-104: Replaced mysql DB connector with mariaDB

Issue: PORTAL-50 PORTAL-72 PORTAL-86 PORTAL-102 PORTAL-103 PORTAL-104
Change-Id: Iae78ad34ed9ce5ae1f2d36fcbb93fbc1e39944e5
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 .../user.notifications.modal.controller.js         | 51 ----------------------
 .../user.notifications.modal.page.html             |  6 +--
 2 files changed, 3 insertions(+), 54 deletions(-)

(limited to 'ecomp-portal-FE-common/client/app/views/user-notifications-admin')

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 366fb215..65395f16 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
@@ -793,55 +793,4 @@
     userNotificationsModalCtrl.$inject = ['$scope', '$log', 'functionalMenuService', 'confirmBoxService', 'notificationService', '$modal', 'ngDialog', '$state', '$filter', 'items'];
     angular.module('ecompApp').controller('userNotificationsModalCtrl', userNotificationsModalCtrl);
 
-    angular.module('ecompApp').directive('attDatepickerCustom', ['$log', function($log) {
-        return {
-            restrict: 'A',
-            require: 'ngModel',
-            scope: {},
-
-            controller: ['$scope', '$element', '$attrs', '$compile', 'datepickerConfig', 'datepickerService', function($scope, $element, $attrs, $compile, datepickerConfig, datepickerService) {
-                var dateFormatString = angular.isDefined($attrs.dateFormat) ? $scope.$parent.$eval($attrs.dateFormat) : datepickerConfig.dateFormat;
-                var selectedDateMessage = '<div class="sr-focus hidden-spoken" tabindex="-1">the date you selected is {{$parent.current | date : \'' + dateFormatString + '\'}}</div>';
-                $element.removeAttr('att-datepicker-custom');
-                $element.removeAttr('ng-model');
-                $element.attr('ng-value', '$parent.current |  date:"EEEE, MMMM d, y"');
-                $element.attr('aria-describedby', 'datepicker');
-
-                $element.attr('maxlength', 10);
-
-                var wrapperElement = angular.element('<div></div>');
-                wrapperElement.attr('datepicker-popup', '');
-                wrapperElement.attr('current', 'current');
-
-                datepickerService.setAttributes($attrs, wrapperElement);
-                datepickerService.bindScope($attrs, $scope);
-
-                wrapperElement.html('');
-                wrapperElement.append($element.prop('outerHTML'));
-                if (navigator.userAgent.match(/MSIE 8/) === null) {
-                    wrapperElement.append(selectedDateMessage);
-                }
-                var elm = wrapperElement.prop('outerHTML');
-                elm = $compile(elm)($scope);
-                $element.replaceWith(elm);
-            }],
-            link: function(scope, elem, attr, ctrl) {
-                if (!ctrl) {
-                    // do nothing if no ng-model
-                    $log.error("ng-model is required.");
-                    return;
-                }
-
-                scope.$watch('current', function(value) {
-                    ctrl.$setViewValue(value);
-                });
-                ctrl.$render = function() {
-                    scope.current = ctrl.$viewValue;
-                };
-
-            }
-        };
-    }]);
-
-
 })();
\ 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 5d1698e5..95da7812 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
@@ -6,7 +6,7 @@
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+  You may obtain a copy of the License at 
   
        http://www.apache.org/licenses/LICENSE-2.0
   
@@ -136,7 +136,7 @@
 							<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>
+							<small class="date-validation">Date should not be greater than 4 months from current date!</small>
 						</div>
 					</div>
 				</div>
@@ -158,7 +158,7 @@
 						<small class="mandatory-categories">Please enter valid date in MM/DD/YYYY format!</small>
 					</div>
 					<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>
+						<small class="endDate-validation">Date should not be greater than 4 months from 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>
-- 
cgit 1.2.3-korg