Added shifts list and displaying reports based on shifts (#171)

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

@@ -3,6 +3,8 @@ myApp.controller("attendanceReportController", function($scope, $http, myFactory
 	$scope.empId = myFactory.getEmpId();
 	$scope.empName = myFactory.getEmpName();
 	$scope.empEmailId = myFactory.getEmpEmailId();
+	$scope.shifts = myFactory.getShifts();
+	$scope.shifts.unshift("All");
 	// Date picker related code
 	var today = new Date();
 	$scope.maxDate = today;
@@ -17,7 +19,7 @@ myApp.controller("attendanceReportController", function($scope, $http, myFactory
 		columnDefs : [ 
 				{field : 'employeeId',displayName: 'Employee Id', enableColumnMenu: false, enableSorting: true,enableFiltering: true},
 				{field : 'employeeName',displayName: 'Employee Name', enableColumnMenu: false, enableSorting: false, enableFiltering: true},
-				{field : 'ifPresent',displayName: 'Status', enableColumnMenu: false, enableSorting: false, enableFiltering: false}
+				{field : 'present',displayName: 'Status', enableColumnMenu: false, enableSorting: false, enableFiltering: false}
 			],
 			enableGridMenu: true,
 		    enableSelectAll: true,
@@ -74,9 +76,15 @@ myApp.controller("attendanceReportController", function($scope, $http, myFactory
 			console.log("");
 		}
 		var reportDate = getFormattedDate($scope.reportDate);
+		var shiftV = $scope.shiftValue;
+		if(shiftV == undefined || shiftV==""){
+			shiftV="All";
+		}
+		$scope.shiftValue=shiftV;
+		$scope.selectedshiftValue=shiftV;
 		$http({
 	        method : "GET",
-	        url : appConfig.appUri + "attendance/attendanciesReport/" + reportDate
+	        url : appConfig.appUri + "attendance/attendanciesReport/" + reportDate+"?shift="+shiftV
 	    }).then(function mySuccess(response) {
 	    	$mdDialog.hide();
 	    	if(response.data.length == 0){
@@ -91,9 +99,9 @@ myApp.controller("attendanceReportController", function($scope, $http, myFactory
 	    		$scope.presentArray=[];
 	    		$scope.absentArray=[];
 	    		angular.forEach(response.data, function(attendance) {	    			
-	    			if(attendance.ifPresent =='P'){
+	    			if(attendance.present =='P'){
 	    				$scope.presentArray.push(attendance);
-	    			}else if(attendance.ifPresent =='A'){
+	    			}else if(attendance.present =='A'){
 	    				$scope.absentArray.push(attendance);
 	    			}
 	    			});	    		    		
@@ -117,6 +125,14 @@ myApp.controller("attendanceReportController", function($scope, $http, myFactory
 		$scope.reportDate = dateValue;
 	};
 	
+	$scope.getSelectedShift = function(){
+		if ($scope.shiftValue !== undefined) {
+			return $scope.shiftValue;
+		} else {
+			return "Please select a shift";
+		}
+	};
+	
 	$scope.refreshPage = function(){
 		$scope.gridOptions.data = [];
 		$scope.reportDate = today;

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

@@ -15,7 +15,6 @@
 	<br />
 	<div class="text-center">
 		<div class="row col-lg-12">
-			<div class="col-lg-3"></div>
 			<div class="col-lg-4 col-xs-12">
 				<p>
 					<b>Search Date:</b>
@@ -24,13 +23,23 @@
 						onkeydown="return false" ng-change="setSearchDate(reportDate)"></md-datepicker>
 				</p>
 			</div>
+			<div class="col-lg-2 col-xs-12">
+				<p style="margin-top: 15px;"><b>Select Shift:</b></p>
+			</div>
+			<div class="col-lg-4 col-xs-12">
+					<md-select ng-model="shiftValue" md-selected-text="getSelectedShift()" id="shiftValue" style="margin:0px;">
+						<md-optgroup label="shifts"> 
+							<md-option ng-value="shiftValue" ng-repeat="shiftValue in shifts">{{shiftValue}}</md-option> 
+						</md-optgroup> 
+				    </md-select>
+			</div>
+			
 			<div class="col-lg-2 col-xs-12" style="cursor: pointer;" align="right">
 				<md-button class="md-raised md-primary"
 					style="width:100px;background: cadetblue;" ng-click="getEmployeePresent('onclick')">
 				<i class="fa fa-search fa-2x"
 					style="margin-top: 5px; font-size: 1.5em; float: left"></i> Search</md-button>
 			</div>
-			<div class="col-lg-3"></div>
 		</div>
 		<div class="row col-lg-12" style="height: 15px;"></div>
 		<div class="row col-lg-12">
@@ -66,3 +75,4 @@
 			data available</div>
 	</div>
 </div>
+     
\ No newline at end of file