FEATURE/DEFECT-ADDTEAMMATE (#108)

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

@@ -522,10 +522,10 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 			}).then(function mySuccess(response) {
 				$scope.gridOptions.data = response.data;
 				  for(i=0;i<response.data.length;i++){
-			    		if(response.data[i].role == 'Employee'){
-				    		  $scope.gridOptions.data[i].role = "Individual Contributor";
-				    	  }else{
+			    		if(response.data[i].role == 'Lead'){
 				    		  $scope.gridOptions.data[i].role = "Lead";
+				    	  }else{
+				    		  $scope.gridOptions.data[i].role = "Individual Contributor"; 
 				    	  }	
 			    	}
 			}, function myError(response) {
@@ -1009,10 +1009,12 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 				}else if($scope.startDate == undefined) {
 				    $scope.alertMsg = "Please select Start Date";
 				    angular.element(document.getElementById('startDate')).focus();
-				}else if($scope.endDate == undefined) {
-	                $scope.alertMsg = "Please select End Date";
-	                angular.element(document.getElementById('endDate')).focus();
-	            }else if($scope.newBillingStartDate == undefined){
+				}
+				// else if($scope.endDate == undefined) {
+	            //     $scope.alertMsg = "Please select End Date";
+	            //     angular.element(document.getElementById('endDate')).focus();
+				// }
+				else if($scope.newBillingStartDate == undefined){
 	            	 $scope.alertMsg = "Please select new Billing StartDate";
 	            	 angular.element(document.getElementById('newBillingStartDate')).focus();
 	            }
@@ -1285,10 +1287,10 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 						$scope.gridOptions.data.push(record);
 						console.log($scope.gridOptions.data);
 						for(i=0;i<$scope.gridOptions.data.length;i++){
-				    		if($scope.gridOptions.data[i].role == 'Employee'){
-					    		  $scope.gridOptions.data[i].role = "Individual Contributor";
-					    	  }else{
+				    		if($scope.gridOptions.data[i].role == 'Lead'){
 					    		  $scope.gridOptions.data[i].role = "Lead";
+					    	  }else{
+					    		  $scope.gridOptions.data[i].role = "Individual Contributor"; 
 					    	  }	
 				    	}
 					}
@@ -1325,10 +1327,10 @@ myApp.controller("projectController", function ($scope, myFactory, exportUiGridS
 			}).then(function mySuccess(response) {
 				$scope.gridOptions.data = response.data;
 				for(i=0;i<$scope.gridOptions.data.length;i++){
-		    		if($scope.gridOptions.data[i].role == 'Employee'){
-			    		  $scope.gridOptions.data[i].role = "Individual Contributor";
-			    	  }else{
+		    		if($scope.gridOptions.data[i].role == 'Lead'){
 			    		  $scope.gridOptions.data[i].role = "Lead";
+			    	  }else{
+			    		  $scope.gridOptions.data[i].role = "Individual Contributor"; 
 			    	  }	
 		    	}
 			}, function myError(response) {

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

@@ -45,7 +45,7 @@
 						<td colspan="8"><input type="text" class="form-control"
 							id="empEmail" name="empEmail" ng-model="empEmail"
 							placeholder="Email ID" ng-blur="validateEmailId()"
-							ng-disabled="isDisabled" /></td>
+							ng-disabled="isDisabled" style="text-transform: lowercase;"/></td>
 					</tr>
 
 					<tr>

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

@@ -109,7 +109,7 @@
                                         </md-select>
                                         <table>
                                         <tr ng-show="empBillableStatus">
-                                        <td>Current Billability Start Date  </td>
+                                        <td>{{empBillableStatus}} Start Date  </td>
                                         <td>
                                          <md-datepicker ng-model="newBillingStartDate" md-placeholder="Plase select Date " id="newBillingStartDate " md-min-date="minDate " md-max-date="maxDate "
                                             onkeydown="return false " ng-change="currentBillabilityDateChange()"name="newBillingStartDate"></md-datepicker>
@@ -214,7 +214,7 @@
                                         
                                         <table>
                                         	<tr ng-show="empBillableStatus">
-                                       			<td>Current Billability Start Date  </td>
+                                       			<td>{{empBillableStatus}} Start Date  </td>
                                        			<td>
                                          			<md-datepicker ng-model="newBillingStartDate" md-placeholder="Please select Date " id="newBillingStartDate " md-min-date="minDate " md-max-date="maxDate "
                                            			onkeydown="return false" name="newBillingStartDate"></md-datepicker>