Merge pull request #178 from nisum-inc/FEATURE/MT-175-Timepicker-impl

Time picker implementation changes

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

@@ -74,12 +74,14 @@ myApp.controller("reportsController", function($scope, $http, myFactory, $mdDial
 	}
 
 	var parentData = {
-			"empId": "",
-			"fromDate": getFormattedDate($scope.fromDate),
-			"toDate": getFormattedDate($scope.toDate),
-			"toEmail": [],
-			"ccEmail": [],
-			"bccEmail": []
+			"empId"		: "",
+			"fromDate"	: getFormattedDate($scope.fromDate),
+			"toDate"	: getFormattedDate($scope.toDate),
+			"fromTime"	: $scope.fromTime,
+			"toTime"	: $scope.toTime,
+			"toEmail"	: [],
+			"ccEmail"	: [],
+			"bccEmail"	: []
 	};
 
 	$scope.validateEmpId = function(){
@@ -102,6 +104,13 @@ myApp.controller("reportsController", function($scope, $http, myFactory, $mdDial
 	function checkEmpIdRange(searchId){
 		return parseInt(searchId) >= appConfig.empStartId && parseInt(searchId) <= appConfig.empEndId;
 	}
+	
+	$scope.showOrHide = function() {
+		if (!$scope.isOverride) {
+			$scope.fromTime = "";
+			$scope.toTime = "";
+		}
+	}
 
 	$scope.generateReport = function(){
 		debugger;
@@ -111,14 +120,33 @@ myApp.controller("reportsController", function($scope, $http, myFactory, $mdDial
 		parentData.empId = $scope.searchId;
 		parentData.fromDate = getFormattedDate($scope.fromDate);
 		parentData.toDate = getFormattedDate($scope.toDate);
-		parentData.fromTime= $scope.fromTime;
-		parentData.toTime= $scope.toTime;
+		parentData.fromTime = changeTime($scope.fromTime);
+		parentData.toTime = changeTime($scope.toTime);
 		parentData.isOverride= $scope.isOverride;
 		generatePdfReport(parentData);
 		showProgressDialog();
 		$timeout(function(){previewPdfReport();},6000);
 	};
 
+	function changeTime(time) {
+		var today = new Date(time);
+		var hours = today.getHours();
+		var minutes = Math.round(today.getMinutes());
+		var ampm = hours >= 12 ? 'PM' : 'AM';
+		var time = hours + ':' + minutes;
+		return changeTimeFormat(time, ampm) + ' ' + ampm;
+	}
+	function changeTimeFormat(time, ampm) {
+		function appendZero(n) {
+			return (n < 10 ? '0' : '') + n;
+		}
+		var bits = time.split(':');
+		if (ampm == 'PM') {
+			bits[0] = bits[0] - 12;
+		}
+		return appendZero(bits[0]) + ':' + appendZero(bits[1]);
+	}
+
 	function deletePreviousReport(){
 		var empId = "";
 		if(parentData.empId != ""){
@@ -189,7 +217,6 @@ myApp.controller("reportsController", function($scope, $http, myFactory, $mdDial
 	    });
 	}
 
-
 	function getFormattedDate(date){
 		var day = date.getDate();
 		var month = date.getMonth() + 1;

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

@@ -55,19 +55,17 @@
 
 				<div class="form-group col-lg-4">
 					<label>Override Timings</label>
-					<input type="checkbox" ng-value="isOverride" ng-model="isOverride"/>
-					{{isOverride}}
+					<input type="checkbox" ng-value="isOverride" ng-model="isOverride" ng-change="showOrHide()"/>
 				</div>
-				<div class="form-group col-lg-4 col-md-4 col-sm-6 col-xs-12" >
-				<label for="">	FromTime:<input type="time" ng-model="fromTime" id="Hours"
-						placeholder="Enter Hours" class="form-control"
-						 /></label>
-
+				<div class="form-group col-lg-4 col-md-4 col-sm-6 col-xs-12" ng-show="isOverride">
+					<label for="fromTime">	FromTime:<input type="time" ng-model="fromTime" id="Hours"
+							placeholder="HH:mm aa" class="form-control"/>
+					</label>
 				</div>
-				<div class="form-group col-lg-4 col-md-4 col-sm-6 col-xs-12" >
-					<label for="">ToTime:<input type="time" ng-model="toTime" id="Hours"
-						placeholder="Enter Hours" class="form-control"
-						 /></label>
+				<div class="form-group col-lg-4 col-md-4 col-sm-6 col-xs-12" ng-show="isOverride">
+					<label for="toTime">ToTime:<input type="time" ng-model="toTime" id="Hours"
+						placeholder="HH:mm aa" class="form-control"/>
+					</label>
 				</div>
 
 			</div>