changes for MT-78 (#55)

src/main/webapp/WEB-INF/controllers/DomainController.js

@@ -40,7 +40,7 @@ myApp.controller("domainController",
 					},
 					{
 						field : 'accountName',
-						displayName : 'Account ',
+						displayName : 'Account',
 						enableColumnMenu : false,
 						enableSorting : true,
 						enableFiltering : true
@@ -72,10 +72,11 @@ myApp.controller("domainController",
 		};
 
 		$scope.getRowData = function(row, action) {
-			$scope.parentData.id = row.entity._id;
+			$scope.parentData.id = row.entity.id;
 			$scope.parentData.domainId = row.entity.domainId;
 			$scope.parentData.domainName = row.entity.domainName;
-			$scope.parentData.account = row.entity.accountName;
+			$scope.parentData.AccountName = row.entity.accountName;
+			$scope.parentData.AccountId = row.entity.accountId;
 			$scope.parentData.deliveryManagers = row.entity.deliveryManagers;
 
 			if (action == "Update")
@@ -247,8 +248,8 @@ myApp.controller("domainController",
 
 			$scope.getAccountText = function() {
 
-				if ($scope.account !== undefined) {
-					return $scope.account.accountName;
+				if ($scope.AccountInfo !== undefined) {
+					return $scope.AccountInfo.accountName;
 				}
 
 				else {
@@ -329,28 +330,34 @@ myApp.controller("domainController",
 			}
 			if (dataToPass.action == "Add") {
 				$scope.domainName = "";
-				$scope.accountName = "";
+				$scope.AccountName = "";
 				$scope.deliveryManagers = "";
 			} else if (dataToPass.action == "Update") {
 				$scope.isDisabled = true;
 				$scope.id = dataToPass.id;
 				$scope.domainId = dataToPass.domainId;
 				$scope.domainName = dataToPass.domainName;
-				$scope.account = {};
-				$scope.account.accountName = dataToPass.account;
+				$scope.AccountInfo = dataToPass.AccountName;
+				$scope.AccountId = dataToPass.AccountId;
 				$scope.employeeModel = dataToPass.deliveryManagers;
+				var accounts1 = myFactory.getAccounts();
+				for (var i = 0; i < accounts1.length; i++) {
+					if (accounts1[i].accountName == dataToPass.AccountName) {
+						$scope.AccountInfo = accounts1[i];
+					}
+				}
 			}
 			$scope.validateFields = function(action){
 				var domainId = $scope.domainId;
-				var AccountName = $scope.account;
+				var AccountName = $scope.AccountInfo;
 				var domainName = $scope.domainName;
 				var deliveryManagers = $scope.employeeModel;
 				if(action == "Add"){
 				
 					if(AccountName == undefined){
 						$scope.alertMsg = "Please select a Account";
-					document.getElementById('account').focus();
-					}else if(domainName == undefined){
+					document.getElementById('AccountInfo').focus();
+					}else if(domainName == "" || undefined){
 						$scope.alertMsg = "Please enter a Domain Name";
 						document.getElementById('domainName').focus();
 					}else if(deliveryManagers == undefined){
@@ -360,19 +367,19 @@ myApp.controller("domainController",
 						$scope.alertMsg = "";
 						var record = {
 								"domainName" : $scope.domainName,
-								"accountName" : $scope.account.accountName,
+								"accountId" : $scope.AccountInfo.accountId,
 								"deliveryManagers" : $scope.deliveryHeads()
 							};
 						$scope.addOrUpdateDomain(record,action);
 					}
 				}else{
 					$scope.alertMsg = "";
-					var AccountName = $scope.account.accountName;
+					var AccountName = $scope.AccountInfo;
 					var domainName = $scope.domainName;
 					var deliveryManagers1 = $scope.deliveryHeads();
 					if(AccountName == undefined){
 						$scope.alertMsg = "Please select a Account";
-					document.getElementById('account').focus();
+					document.getElementById('AccountInfo').focus();
 					}else if(domainName == "" || undefined) {
 						$scope.alertMsg = "Please enter a Domain Name";
 						document.getElementById('domainName').focus();
@@ -383,7 +390,8 @@ myApp.controller("domainController",
 						$scope.alertMsg = "";
 						var record = {
 								"domainName" : $scope.domainName,
-								"accountName" : $scope.account.accountName,
+								"accountName" : $scope.AccountInfo,
+								"accountId": $scope.AccountId,
 								"deliveryManagers" : $scope.deliveryHeads(),
 								"id" : $scope.id,
 						        "domainId" : dataToPass.domainId

src/main/webapp/WEB-INF/controllers/LoginController.js

@@ -88,7 +88,7 @@ myApp.controller("loginController",function($scope, myFactory, $compile, $window
 	function getAllAccounts(){
 		$http({
 	        method : "GET",
-	        url : appConfig.appUri + "user/getAccounts"
+	        url : appConfig.appUri + "user/getAccountsInfo"
 	    }).then(function mySuccess(response) {
 	   	myFactory.setAccounts(response.data);
 	    }, function myError(response) {

src/main/webapp/WEB-INF/templates/newDomain.html

@@ -26,9 +26,9 @@
 					</tr>
 					<tr>
 						<td colspan="4"><b>Account</b></td>
-						<td colspan="8"><md-select ng-model="account" ng-disabled= "isDisabled"
-								md-selected-text="getAccountText()" id="account"> <md-optgroup
-								label="account"> <md-option ng-value="account1"
+						<td colspan="8"><md-select ng-model="AccountInfo" ng-disabled= "isDisabled"
+								md-selected-text="getAccountText()" id="AccountInfo"> <md-optgroup
+								label="AccountInfo"> <md-option ng-value="account1"
 								ng-repeat="account1 in accounts" >{{account1.accountName}}</md-option>
 							</md-optgroup> </md-select></td>
 					</tr>