Updated Reserved report

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

@@ -1358,7 +1358,8 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
 				} 
 				else if (!(($scope.newBillingStartDate >=  $scope.parentData.newBillingStartDate) && ($scope.newBillingStartDate <= $scope.endDate)) && action == "Update"){
 						$scope.alertMsg = $scope.empBillableStatus + " start date should be in between previous Billing start date and end date";
-				}else if($scope.endDate > new Date(dataToPass.projectEndDate)){
+				}
+				else if($scope.endDate > new Date(dataToPass.projectEndDate)){
 					$scope.alertMsg = "End date should not exceed project end date";
 				}
 				else {
@@ -1506,13 +1507,15 @@ myApp.controller("projectController", function ($scope,uiGridConstants, myFactor
 		       };
 		$scope.DataUpdate = function () {
 			var data = $scope.parentData;
-/*			if (data.role == "Individual Contributor") {
+			
+			if (data.role == "Individual Contributor") {
 				var roleselected = "Employee";
 			} else {
 				roleselected = data.role;
-			}*/
+			}
 			$scope.previousData = {
-				Role: data.role,
+	
+				Role: roleselected,
 				//Shift: data.shift,
 				Billabilitystatus: data.billableStatus,
 				newBilligStartDate: new Date(data.newBillingStartDate),

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

 myApp.controller("reservedReportsController",function($scope,exportUiGridService, myFactory, $mdDialog, $http, appConfig, $timeout, $element, $window){
 	$scope.records = [];
+	var today = new Date();
 	$scope.gridOptions = {
 			paginationPageSizes : [ 10, 20, 30, 40, 50, 100],
 			paginationPageSize : 10,
@@ -9,8 +10,8 @@ myApp.controller("reservedReportsController",function($scope,exportUiGridService
 			columnDefs : [
 				{field : 'employeeId',displayName: 'Employee Id', enableColumnMenu: false, enableSorting: false,enableFiltering: true},
 				{field : 'employeeName',displayName: 'Employee Name', enableColumnMenu: false, enableSorting: true,enableFiltering: true,cellClass:function(grid,row,col){
-					if(daysBetween(row.entity.billingStartDate,row.entity.billingEndDate) > '14') {
-						 return 'red';
+					if(daysBetween(row.entity.billingStartDate,today) > '14') {
+						return 'red';
 					 }
 				}}, 
 				{name : 'accountName', displayName: 'Client', enableColumnMenu: false, enableSorting: false, enableFiltering:false},