Handled Service side exception as well as client side validation when user...

Handled Service side exception as well as client side validation when user does not enter empId and time

src/main/java/com/nisum/mytime/service/EmployeeDataService.java

@@ -78,7 +78,9 @@ public class EmployeeDataService implements IEmployeeDataService {
 			query = MyTimeUtils.LOGIN_REPORT_BY_TIME + "'" + fromDateTime + "'" + MyTimeUtils.LOGIN_REPORT_BY_TIME2 + "'"
 					+ toDateTime + "'" + MyTimeUtils.LOGIN_REPORT_BY_TIME3 + employeeId + MyTimeUtils.LOGIN_REPORT_BY_TIME4;
 			resultSetData = executeQuery(query, 2);
-			listOfEmpLoginDetails.add(resultSetData.get(0));
+			if (resultSetData.size() > 0) {
+				listOfEmpLoginDetails.add(resultSetData.get(0));
+			}
 			MyTimeLogger.getInstance().info(
 					" Time Taken fecth Employee data based on Dates ::: " + (System.currentTimeMillis() - start_ms));
 		}

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

@@ -113,19 +113,39 @@ myApp.controller("reportsController", function($scope, $http, myFactory, $mdDial
 	}
 
 	$scope.generateReport = function(){
-		debugger;
-		deletePreviousReport();
-		$scope.pdfUrl = "";
-		$scope.reportMsg ="";
-		parentData.empId = $scope.searchId;
-		parentData.fromDate = getFormattedDate($scope.fromDate);
-		parentData.toDate = getFormattedDate($scope.toDate);
-		parentData.fromTime = changeTime($scope.fromTime);
-		parentData.toTime = changeTime($scope.toTime);
-		parentData.isOverride= $scope.isOverride;
-		generatePdfReport(parentData);
-		showProgressDialog();
-		$timeout(function(){previewPdfReport();},6000);
+		var isValid = true;
+		if ($scope.isOverride) {
+			var validationMessage = 'Please Enter ';
+			if ($scope.searchId == "") {
+				isValid = false;
+				validationMessage = validationMessage + 'Employee ID';
+			}
+			if ($scope.fromTime == undefined || $scope.toTime == undefined) {
+				if (!isValid) {
+					validationMessage = validationMessage + ', ';
+				}
+				validationMessage = validationMessage + 'FromTime and ToTime';
+				isValid = false;
+			}
+			if (!isValid) {
+				showAlert(validationMessage);
+			}
+			
+		}
+		if (isValid) {
+			deletePreviousReport();
+			$scope.pdfUrl = "";
+			$scope.reportMsg ="";
+			parentData.empId = $scope.searchId;
+			parentData.fromDate = getFormattedDate($scope.fromDate);
+			parentData.toDate = getFormattedDate($scope.toDate);
+			parentData.fromTime = changeTime($scope.fromTime);
+			parentData.toTime = changeTime($scope.toTime);
+			parentData.isOverride= $scope.isOverride;
+			generatePdfReport(parentData);
+			showProgressDialog();
+			$timeout(function(){previewPdfReport();},6000);
+		}
 	};
 
 	function changeTime(time) {
@@ -192,7 +212,6 @@ myApp.controller("reportsController", function($scope, $http, myFactory, $mdDial
 	}
 
 	function generatePdfReport(data){
-		debugger;
 		var empId = "";
 		if(data.empId == ""){
 			empId = 0;