Defects of 113 and 114 (#76)

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

@@ -171,7 +171,7 @@ myApp.controller("domainController",
 					'Ok').cancel('Cancel');
 			$mdDialog.show(confirm).then(function() {
 				deleteDomainRow(row.entity.domainId);
-				showAlert("Domain Inactived successfully");
+				showAlert("Domain Inactivated successfully");
 			}, function() {
 				console.log("Cancelled dialog");
 			});

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

@@ -299,6 +299,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 				document.getElementsByClassName("md-tab")[1].style.visibility = "visible" ;
 				$scope.isSecondTab = true;
 				$scope.selectedTab = 1; 
+				$scope.searchTerm = "";
 			}	
 		};
 		
@@ -308,6 +309,7 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 				if($scope.isSecondTab === true){			
 					$('.md-select-value')[0].childNodes[0].innerHTML = null
 					$('.md-select-value')[1].childNodes[0].innerHTML = null
+					$('.md-select-value')[2].childNodes[0].innerHTML = null
 					$('.md-datepicker-input')[0].value = null;
 					$('.md-datepicker-input')[1].value = null;
 					$('.md-datepicker-input')[2].value = null;
@@ -696,7 +698,6 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 			var account = $scope.account;
 			var managerId=$scope.managerId;
 			var managerName=$scope.managerName;
-			
 			var employeeModel = $scope.employeeModel;
 			var projectModel = $scope.projectModel;
 			var domain = $scope.domain.domainName;

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

@@ -90,7 +90,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
 		$('#home').addClass('md-scroll-mask');
 	    var confirm = $mdDialog.confirm()
 	    	  .clickOutsideToClose(true)
-	          .textContent('Are you sure you want to delete this account?')
+	          .textContent('Are you sure you want to inactive this account?')
 	          .ok('Ok')
 	          .cancel('Cancel');
 	    $mdDialog.show(confirm).then(function() {
@@ -114,7 +114,7 @@ myApp.controller("assignAccountsController",function($scope, myFactory, $mdDialo
 	function updateGridAfterDelete(){
 		if($scope.result == "Success"){
 			$scope.refreshPage();
-			showAlert('Account deleted successfully');
+			showAlert('Account is inactivated successfully');
 		}else if($scope.result == "Error"){
 			showAlert('Something went wrong while deleting the account.')
 		}

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

@@ -28,7 +28,7 @@
                                             </div>
                                             <div class="col-xs-6 text-right ">
                                                 <p>
-                                                    <b>Manager Name:</b><p><span ng-repeat="x in managerIds"> {{x.name}}<br></span></p>
+                                                    <b>Manager Name: </b><span ng-repeat="manager in managerIds">{{manager.employeeName}}<span ng-hide="$last">,</span></span>
                                                 </p>
                                             </div>
 
@@ -66,7 +66,7 @@
                                             </div>
                                             <div class="col-xs-6 text-center ">
                                                 <p>
-                                                    <b>Manager Name:</b><p><span ng-repeat="x in managerIds"> {{x.name}}<br></span></p>
+                                                    <b>Manager Name: </b><span ng-repeat="manager in managerIds">{{manager.employeeName}}<span ng-hide="$last">,</span></span>
                                                 </p>
                                             </div>
                                         </div>
@@ -86,12 +86,12 @@
                                         <output>Role : {{employeeModel.role}}</output>
                                         <output>Designation : {{employeeModel.designation}}</output>
                                         <md-select ng-model="employeeRole"
-md-selected-text="getSelectedEmpRole()"
-id="empRole"> <md-optgroup
-label="employee role"> <md-option
-ng-value="empRole"
-ng-repeat="empRole in employeeRoles">{{empRole}}</md-option>
-</md-optgroup> </md-select>
+											md-selected-text="getSelectedEmpRole()"
+											id="empRole"> <md-optgroup
+											label="employee role"> <md-option
+											ng-value="empRole"
+											ng-repeat="empRole in employeeRoles">{{empRole}}</md-option>
+											</md-optgroup> </md-select>
 
                                         <md-select ng-model="empBillableStatus " md-selected-text="getSelectedBillableStatus() " id="empBillableStatus"  name="empBillableStatus">
                                             <md-optgroup label="billable statuses ">