Merge pull request #135 from nisum-inc/FEATURE/NEW_UI_Change

New validation as per requirement

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

@@ -118,8 +118,9 @@ myApp.controller("myProjectAllocationsController",function($scope, myFactory, $m
 				columnDefs : [ 
 					{field : 'employeeId',displayName: 'Emp ID', enableColumnMenu: true, enableSorting: true, width:100},
 					{field : 'employeeName',displayName: 'Empl Name ', enableColumnMenu: false, enableSorting: false},
-					{field : 'emailId',displayName: 'Email Id ', enableColumnMenu: false, enableSorting: false},
-					{field : 'experience',displayName: 'Exp', enableColumnMenu: true, enableSorting: true,width:80},
+					{field : 'role',displayName: 'Role', enableColumnMenu: false, enableSorting: false},
+//					{field : 'emailId',displayName: 'Email Id ', enableColumnMenu: false, enableSorting: false},
+//					{field : 'experience',displayName: 'Exp', enableColumnMenu: true, enableSorting: true,width:80},
 					{field : 'designation',displayName: 'Designation ', enableColumnMenu: false, enableSorting: false},
 					{field : 'billableStatus',displayName: 'Billability ', enableColumnMenu: false, enableSorting: false},
 				]

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

@@ -352,8 +352,17 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 	    		return obj;	
 		};
 		
-		
+		var today = new Date();
 		$scope.addTab = function () {
+			if(! (new Date(dataToPass.projectEndDate) >  today) ){
+				$mdDialog.show($mdDialog.alert({
+					skipHide: true,
+					title:"Attention",
+			        textContent: 'Employee cannot be added to Completed Project',
+			        ok: 'ok'
+			      }));
+			}
+			else{
 				if($scope.isSecondTab === false){
 					$scope.templateTitle = "Add";
 					$scope.employeeRole = undefined;
@@ -372,6 +381,8 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 					$scope.selectedTab = 1; 
 					$scope.searchTerm = "";				
 				}
+			}
+			
 		};		
 		var removeTab = function (action) {
 			if(action == "Add"){