[ONAP-rebase] Rebase as 1.1.0-SNAPSHOT

Consolidate into a single maven project; no more separate model and client jars.

Change-Id: Ibbba982250b74c0dfd09ee1c65c0fb6c158dd632
Signed-off-by: Christopher Lott <cl778h@att.com>
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 77 insertions, 0 deletions

diff --git a/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/home/dbc-modal-service.js b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/home/dbc-modal-service.js
new file mode 100644
index 0000000..3cdc87f
--- /dev/null
+++ b/dcae_dmaapbc_webapp/dbca-overlay/src/main/webapp/app/dbcapp/home/dbc-modal-service.js
@@ -0,0 +1,77 @@
+angular.module("modalServices",[]).service('modalService', ['$modal', function ($modal) {
+
+	/* 
+	 * Defines the same functions available in DS1 using DS2 icons etc.
+	 * Relies on templates defined in dbc_popup_templates.html
+	 */
+	
+	var ModalInstanceCtrl = function ($scope, $modalInstance, $rootScope, items) {
+		// Pass thru to template as object "msg"
+		$scope.msg = items;
+		
+	    $scope.cancel = function () {
+	        $modalInstance.dismiss('cancel');
+	    };
+	};
+	
+	this.showIconTitleTextOkModal = function (icon, title, text) {
+    	var modalInstance = $modal.open({
+			templateUrl: 'dbc_title_text_ok_modal.html',
+			controller: ModalInstanceCtrl,
+			sizeClass: 'modal-small',
+			resolve: {
+                items: function () {
+					return {
+						icon: icon,
+						title: title,
+	                   	text:  text
+	                };
+                }
+	        }
+	});
+    };
+
+	/* modals used in many DBC pages */
+	this.showFailure = function (title, text) {
+		this.showIconTitleTextOkModal('icon-primary-alert', title, text);
+	};
+
+	this.showSuccess = function (title, text) {
+		this.showIconTitleTextOkModal('icon-primary-approval', title, text);
+	};
+    
+    /* Replicate modals defined by ds2-modal/modalService.js */
+	errorPopUp = function(text) {
+		this.showFailure('Error', text);
+	};	
+	successPopUp = function(text) {
+		this.showSuccess('Success', text);
+	};
+		
+	this.popupConfirmWin = function(title, text, callback) {
+    	var modalInstance = $modal.open({
+			templateUrl: 'dbc_title_text_ok_cancel_modal.html',
+			controller: ModalInstanceCtrl,
+			sizeClass: 'modal-small',
+			resolve: {
+                items: function () {
+					return {
+						icon: 'icon-primary-questionmark',
+						title: title,
+	                   	text:  text
+	                };
+                }
+	        }
+		});
+    	var args = Array.prototype.slice.call(arguments, 0);
+   		args.splice(0, 3); 
+   		modalInstance.result.then(function(){
+   			callback.apply(null, args);
+   		}, function() {
+   			//
+   		})['finally'](function(){
+   			modalInstance = undefined;
+   		});
+   	};
+   		
+ }]);