Merge pull request #172 from nisum-inc/FEATURE/MT-167_Bug

Filtered repeatedly adding 'All' in the shift list

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

@@ -4,7 +4,10 @@ myApp.controller("attendanceReportController", function($scope, $http, myFactory
 	$scope.empName = myFactory.getEmpName();
 	$scope.empEmailId = myFactory.getEmpEmailId();
 	$scope.shifts = myFactory.getShifts();
-	$scope.shifts.unshift("All");
+	if($scope.shifts.indexOf("All") == "-1"){
+		$scope.shifts.unshift("All");
+	}
+	
 	// Date picker related code
 	var today = new Date();
 	$scope.maxDate = today;

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

@@ -71,7 +71,9 @@ myApp.controller("shiftDetailsController",function($scope, myFactory,exportUiGri
 	$scope.getShiftDetails = function(){
 		
 		$scope.shifts = myFactory.getShifts(); //["Shift 1(09:00 AM - 06:00 PM)","Shift 2(03:30 PM - 12:30 PM)", "Shift 3(09:00 PM - 06:00 AM)"];
-		
+		if($scope.shifts.indexOf("All") != "-1"){
+			$scope.shifts.shift();
+		}
 		var shiftV = $scope.shiftValue;
 		if(shiftV == undefined || shiftV==""){
 			shiftV="Shift 1(9:00 AM - 6:00 PM)";