Merge pull request #7 from nisum-inc/MT-52

Mt 52

build.gradle

@@ -57,4 +57,4 @@ dependencies {
 	compile('javax.servlet:servlet-api')
 	compile('com.github.ozlerhakan:poiji:1.11')
 	
-}
\ No newline at end of file
+}

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

@@ -89,7 +89,7 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
 		$scope.parentData.mobileNumber = row.entity.mobileNumber;
 		$scope.parentData.startDate = row.entity.startDate;
 		$scope.parentData.endDate = row.entity.endDate;
-		
+
 		if(action == "Update"){
 			$scope.updateEmployee(action, $scope.parentData);
 		}
@@ -313,6 +313,9 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
 			$scope.empName = "";
 			$scope.empRole;
 			$scope.empShift;
+			$scope.empBillableStatus;
+			$scope.startDate;
+			$scope.endDate;
 			$scope.empEmail = "";
 			$scope.isDisabled = false;
 		}else if(dataToPass.action == "Update"){
@@ -575,13 +578,6 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
 				return "Please select a designation";
 			}
 		};
-		$scope.getSelectedBillableStatus = function(){
-			if ($scope.empBillableStatus !== undefined) {
-				return $scope.empBillableStatus;
-			} else {
-				return "Please select a billable status";
-			}
-		};
 		$scope.getEmployeeSelected = function(){
 			if ($scope.employeeModel !== undefined) {
 				$scope.employee=$scope.employeeModel;
@@ -605,8 +601,13 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
 				return "Please select a shift";
 			}
 		};
-		
-		
+		$scope.getSelectedBillableStatus = function(){
+            if ($scope.empBillableStatus !== undefined) {
+                return $scope.empBillableStatus;
+            } else {
+                return "Please select a billable status";
+            }
+        };
 		$scope.validateFields = function(action){
 			if(action == "Add"){
 				var employeeModel = $scope.employeeModel;
@@ -620,7 +621,17 @@ myApp.controller("projectTeamController",function($scope, myFactory, $mdDialog,
 				}else if(employeeModel != undefined && projectModel != undefined 
 						&& getExistingRecordProjectStatus(employeeModel.employeeId, projectModel.projectName)){
 					$scope.alertMsg = "Employee is already assigned to the selected project";
-				} else {
+				}else if($scope.empBillableStatus == undefined){
+				    $scope.alertMsg = "Please select a billable status";
+				    document.getElementById('empBillableStatus').focus();
+				}else if($scope.startDate == undefined) {
+				    $scope.alertMsg = "Please select StartDate";
+                    document.getElementById('startDate').focus();
+				}else if($scope.endDate == undefined) {
+                    $scope.alertMsg = "Please select EndDate";
+                     document.getElementById('endDate').focus();
+                }
+				else {
 					$scope.alertMsg = "";
 					var record = {"employeeId":employeeModel.employeeId, "employeeName":employeeModel.employeeName, "emailId": employeeModel.emailId, "role": employeeModel.role, "designation":employeeModel.designation,"shift": employeeModel.shift,"projectId":projectModel.projectId,"projectName":projectModel.projectName,"account":$scope.projectModel.account,"managerId":myFactory.getEmpId(),"managerName":myFactory.getEmpName(),"mobileNumber":employeeModel.mobileNumber,"active":true,"billableStatus":$scope.empBillableStatus,"startDate":$scope.startDate,"endDate":$scope.endDate};
 					addOrUpdateRole(record, $scope.templateTitle);

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

@@ -28,11 +28,11 @@
 			<md-select ng-model="empBillableStatus" md-selected-text="getSelectedBillableStatus()" id="empBillableStatus">
 			<md-optgroup label="billable statuses"> <md-option ng-value="billableStatus"
 				ng-repeat="billableStatus in billableStatuses">{{billableStatus}}</md-option> </md-optgroup> </md-select>
-			<md-datepicker ng-model="startDate" md-placeholder="Start Date"
+			<md-datepicker ng-model="startDate" md-placeholder="Start Date" id ="startDate"
 						md-min-date="minDate" md-max-date="maxDate"
 						onkeydown="return false"
 						></md-datepicker></br>
-			<md-datepicker ng-model="endDate" md-placeholder="Projected End Date"
+			<md-datepicker ng-model="endDate" md-placeholder="Projected End Date" id="endDate"
 						md-min-date="minDate" md-max-date="maxDate"
 						onkeydown="return false"
 						></md-datepicker>