diff options
Diffstat (limited to 'vid-app-common/src')
5 files changed, 30 insertions, 29 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/CategoryParameterOption.java b/vid-app-common/src/main/java/org/onap/vid/model/CategoryParameterOption.java index 70f7b5aa2..219b4893c 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/CategoryParameterOption.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/CategoryParameterOption.java @@ -55,6 +55,7 @@ public class CategoryParameterOption extends DomainVo { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "CATEGORY_OPT_DB_ID") + @Override public Long getId() { return id; } diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/subscriberSearch.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/subscriberSearch.js index 3403cc2af..b83774889 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/subscriberSearch.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/subscriberSearch.js @@ -81,7 +81,7 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log // $scope.deleteServiceInstance();
// $scope.generateInvalidUrl405();
}, 100);
- }
+ };
$scope.autoGetSubDetails = function() {
/*
@@ -93,7 +93,7 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log // $scope.deleteServiceInstance();
// $scope.generateInvalidUrl405();
}, 100);
- }
+ };
$scope.autoPopulateViewEdit = function() {
/*
@@ -105,7 +105,7 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log // $scope.deleteServiceInstance();
// $scope.generateInvalidUrl405();
}, 100);
- }
+ };
$scope.refreshSubs = function() {
/*
@@ -117,7 +117,7 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log // $scope.deleteServiceInstance();
// $scope.generateInvalidUrl405();
}, 100);
- }
+ };
$scope.autoStartQueryTest = function() {
/*
@@ -127,7 +127,7 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log $timeout(function() {
// $scope.queryServiceInstance();
}, 100);
- }
+ };
$scope.queryServiceInstance = function() {
/*
@@ -136,7 +136,7 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log $scope.$broadcast(COMPONENT.QUERY_SERVICE_INSTANCE, {
serviceInstanceId: COMPONENT.SERVICE_INSTANCE_ID_1
});
- }
+ };
$scope.getSubscribers = function() {
/*
@@ -146,7 +146,7 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log url : FIELD.ID.AAI_GET_SUBSCRIBERS,
requestDetails : createServiceRequestDetails
});
- }
+ };
$scope.getSubDetails = function() {
/*
@@ -156,7 +156,7 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log url : FIELD.ID.AAI_SUB_DETAILS,
requestDetails : createServiceRequestDetails
});
- }
+ };
$scope.getComponentList = function() {
/*
@@ -166,7 +166,7 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log url : FIELD.ID.AAI_SUB_VIEWEDIT,
requestDetails : createServiceRequestDetails
});
- }
+ };
$scope.refreshSubscribers = function() {
@@ -177,7 +177,7 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log url : FIELD.ID.AAI_REFRESH_SUBSCRIBERS,
requestDetails : createServiceRequestDetails
});
- }
+ };
$scope.deleteServiceInstance = function() {
/*
@@ -187,21 +187,21 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log url : COMPONENT.MSO_DELETE_SVC_INSTANCE_PATH + COMPONENT.SERVICE_INSTANCE_ID_1,
requestDetails : deleteServiceRequestDetails
});
- }
+ };
$scope.createNetworkInstance = function() {
$scope.$broadcast(COMPONENT.MSO_CREATE_REQ, {
url : COMPONENT.MSO_CREATE_NW_INSTANCE,
requestDetails : createNetworkRequestDetails
});
- }
+ };
$scope.deleteNetworkInstance = function() {
$scope.$broadcast(COMPONENT.MSO_DELETE_REQ, {
url : COMPONENT.MSO_CREATE_NW_INSTANCE_PATH + COMPONENT.SERVICE_INSTANCE_ID_1 + COMPONENT.FORWARD_SLASH + COMPONENT.NETWORKS + COMPONENT.FORWARD_SLASH + COMPONENT.DELETE_INSTANCE_ID_1,
requestDetails : deleteNetworkRequestDetails
});
- }
+ };
$scope.generateError = function(testName) {
// Clone example request object
@@ -211,7 +211,7 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log url : COMPONENT.MSO_CREATE_SVC_INSTANCE,
requestDetails : request
});
- }
+ };
$scope.generateInvalidUrl404 = function() {
var properties = UtilityService.getProperties(properties);
@@ -227,14 +227,14 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log properties.msoDefaultBaseUrl = $scope.baseUrl;
UtilityService.setProperties(properties);
$scope.$broadcast(COMPONENT.REFRESH_PROPERTIES);
- }
+ };
$scope.generateInvalidUrl405 = function() {
$scope.$broadcast(COMPONENT.MSO_CREATE_REQ, {
url : COMPONENT.INVALID_STRING_MSO_CREATE_SVC_INSTANCE,
requestDetails : createServiceRequestDetails
});
- }
+ };
/*
* Test data objects:
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js b/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js index 5b8cb7445..bf4941f28 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/directives/parameterBlockDirective.js @@ -397,7 +397,7 @@ var parameterBlockDirective = function($log, PARAMETER, UtilityService, $compile element.find("input, select").bind("change.namespace2", function() {
callback(this, scope);
});
- }
+ };
control.getList = function(expectedId) {
var parameterList = new Array();
@@ -411,7 +411,7 @@ var parameterBlockDirective = function($log, PARAMETER, UtilityService, $compile parameterList.push({id: key, value: value});
});
return parameterList;
- }
+ };
control.getRequiredFields = function() {
var requiredFields = "";
@@ -433,10 +433,10 @@ var parameterBlockDirective = function($log, PARAMETER, UtilityService, $compile } else {
return requiredFields + " and " + count + " other fields";
}
- }
+ };
}
}
-}
+};
appDS2.directive('parameterBlock', [ "$log", "PARAMETER", "UtilityService", "$compile",
parameterBlockDirective ]);
@@ -469,7 +469,7 @@ appDS2.directive('onlyIntegers', function () { }
});
}
- }
+ };
});
appDS2.directive('onlyFloat', function () {
@@ -487,5 +487,5 @@ appDS2.directive('onlyFloat', function () { }
});
}
- }
+ };
});
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/directives/popupWindowDirective.js b/vid-app-common/src/main/webapp/app/vid/scripts/directives/popupWindowDirective.js index 1ca32034c..a26744d38 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/directives/popupWindowDirective.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/directives/popupWindowDirective.js @@ -64,7 +64,7 @@ var popupWindowDirective = function($log, $window) { scrollPosition = {
x : $window.pageXOffset,
y : $window.pageYOffset
- }
+ };
$window.scrollTo(0, 0);
element.css("display", "table");
element.prev().css("display", "block");
@@ -74,7 +74,7 @@ var popupWindowDirective = function($log, $window) { $window.scrollTo(scrollPosition.x, scrollPosition.y);
}
});
- }
+ };
return {
restrict : "EA",
@@ -83,6 +83,6 @@ var popupWindowDirective = function($log, $window) { link : link,
template : '<table style="display: none; position: absolute; left: 0; top: 0; width: 100%; height: 100%; border-collapse: collapse; margin: 0; padding: 0"> <tr><td align="center" style="vertical-align: top; padding: 10px"><div style="display: inline-block; padding: 5px; background-color: white" ng-transclude></div></td></tr></table>'
};
-}
+};
appDS2.directive("popupWindow", [ "$log", "$window", popupWindowDirective ]);
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/directives/progressBarDirective.js b/vid-app-common/src/main/webapp/app/vid/scripts/directives/progressBarDirective.js index 2f60d65dc..8294597bd 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/directives/progressBarDirective.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/directives/progressBarDirective.js @@ -127,7 +127,7 @@ var progressBarDirective = function() { */
element.html("");
}
- }
+ };
return {
restrict : "EA",
@@ -153,7 +153,7 @@ var progressBarDirective = function() { control.reset = function() {
previousValue = 0;
updateProgress(element, attrs, 0);
- }
+ };
attrs.$observe("value", function(valueString) {
updateProgress(element, attrs, valueString);
@@ -167,7 +167,7 @@ var progressBarDirective = function() { }
});
}
- }
-}
+ };
+};
appDS2.directive("progressBar", progressBarDirective);
|