Updated add employee alocation to bench project and some ui change

src/main/java/com/nisum/myteam/service/impl/ResourceService.java

@@ -594,7 +594,7 @@ public class ResourceService implements IResourceService {
         resourceBench.setBillingStartDate(employee.getDateOfJoining() != null ? employee.getDateOfJoining() : new Date());
         resourceBench.setBillableStatus(MyTeamUtils.BENCH_BILLABILITY_STATUS);
         resourceBench.setEmployeeId(employee.getEmployeeId());
-        resourceBench.setBillingEndDate(employee.getEndDate());
+        resourceBench.setBillingEndDate(projectService.getProjectByProjectId(MyTeamUtils.BENCH_PROJECT_ID).getProjectEndDate());
         resourcePersisted = addResource(resourceBench, loginEmpId);
 
         return resourcePersisted;

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

@@ -1655,12 +1655,12 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
 				url: appConfig.appUri + "resources/project/"+ $scope.projectId + "?status=" + $scope.status
 			}).then(function mySuccess(response) {
 				$scope.gridOptions.data = response.data.records;
-				if(status == "InActive" || status == "Both"||  dataToPass.status == "InActive"){
-		    		$scope.gridOptions.columnDefs[5].visible = false;
-		    	}
-		    	else{
-		    		$scope.gridOptions.columnDefs[5].visible = true;
-		    	}
+//				if(status == "InActive" ||  dataToPass.status == "InActive"){
+//		    		$scope.gridOptions.columnDefs[5].visible = false;
+//		    	}
+//		    	else{
+//		    		$scope.gridOptions.columnDefs[5].visible = true;
+//		    	}
 				for(i=0;i<$scope.gridOptions.data.length;i++){
 		    		if($scope.gridOptions.data[i].resourceRole == 'Lead'){
 			    		  $scope.gridOptions.data[i].resourceRole = "Lead";