From 3d3b55c6797acaf31c1e7d3a352225bdabf82bf7 Mon Sep 17 00:00:00 2001
From: velz2020 <velmurugan.s@venbainfotech.com>
Date: Thu, 8 Feb 2018 15:58:50 +0530
Subject: [PATCH] BATCH CARD ISSUES FIXED

---
 application/controllers/batchcard.php        |  3 +++
 application/views/dailybatchcard.php         | 10 +++++-----
 application/views/editDailyData.php          |  8 ++++----
 application/views/edit_hourly_batch_card.php |  4 ++--
 application/views/hourly_batch_card.php      |  6 +++---
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/application/controllers/batchcard.php b/application/controllers/batchcard.php
index f34b4566..d45702ab 100755
--- a/application/controllers/batchcard.php
+++ b/application/controllers/batchcard.php
@@ -406,6 +406,9 @@ class batchcard extends BaseController
 											$this->excel->getActiveSheet()->setCellValue('J' . (string)($i),$row['Physical Stock']);
 											$this->excel->getActiveSheet()->getStyle('J'.(string)($i))->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
 											
+											$this->excel->getActiveSheet()->setCellValue('K' . (string)($i),$row['Difference']);
+											$this->excel->getActiveSheet()->getStyle('K'.(string)($i))->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT);
+											
 										
 											
 											//$this->excel->getActiveSheet()->setCellValue('A6','HI');
diff --git a/application/views/dailybatchcard.php b/application/views/dailybatchcard.php
index 73c9c68b..08b2600b 100755
--- a/application/views/dailybatchcard.php
+++ b/application/views/dailybatchcard.php
@@ -76,7 +76,7 @@ foreach($emplist as $r)
 			
 				<div class="col-md-3">
 				<label>Less Break down hours</label>
-			     <input type="text" id="less_break_down_hrs" name="less_break_down_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);"/>
+			     <input type="text" id="less_break_down_hrs" name="less_break_down_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" title="Enter 24 Hrs Format"/>
 			   </div> 
 				
 				<div class="col-md-3">
@@ -330,12 +330,12 @@ foreach($emplist as $r)
 						<legend>Time Taken for Maintenance</legend>
 						<div class="col-md-3">
 						<label>From</label>
-							<input type="text" id="maintenance_time_from" name="maintenance_time_from" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('h:i');?>" />
+							<input type="text" id="maintenance_time_from" name="maintenance_time_from" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format"/>
 						</div>
 						
 						<div class="col-md-3">
 						<label>To</label>
-							<input type="text" id="maintenance_time_to" name="maintenance_time_to" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('h:i');?>" />
+							<input type="text" id="maintenance_time_to" name="maintenance_time_to" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format"/>
 						</div>
 						
 						<div class="col-md-3">
@@ -421,8 +421,8 @@ $('#rdate').datepicker({
          dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
 		
 	});
-$('#total_burner_running_time').timeEntry({show24Hours: true});
-$('#total_feeding_hrs').timeEntry({show24Hours: true});	
+// $('#total_burner_running_time').timeEntry({show24Hours: true});
+// $('#total_feeding_hrs').timeEntry({show24Hours: true});	
 
 	
 	
diff --git a/application/views/editDailyData.php b/application/views/editDailyData.php
index bb20c414..6bc275a8 100755
--- a/application/views/editDailyData.php
+++ b/application/views/editDailyData.php
@@ -339,12 +339,12 @@ foreach($emplist as $r)
 						<legend>Time Taken for Maintenance</legend>
 						<div class="col-md-3">
 						<label>From</label>
-							<input type="text" id="maintenance_time_from" name="maintenance_time_from" class="form-control" style="text-align:right;" onchange="calculateTime();" value="<?php echo $dailydata[0]->maintenance_from_hrs;?>" placeholder="<?php echo date('h:i');?>" />
+							<input type="text" id="maintenance_time_from" name="maintenance_time_from" class="form-control" style="text-align:right;" onchange="calculateTime();" value="<?php echo $dailydata[0]->maintenance_from_hrs;?>" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format"/>
 						</div>
 						
 						<div class="col-md-3">
 						<label>To</label>
-							<input type="text" id="maintenance_time_to" name="maintenance_time_to" class="form-control" style="text-align:right;" onchange="calculateTime();" value="<?php echo $dailydata[0]->maintenance_to_hrs;?>" placeholder="<?php echo date('h:i');?>" />
+							<input type="text" id="maintenance_time_to" name="maintenance_time_to" class="form-control" style="text-align:right;" onchange="calculateTime();" value="<?php echo $dailydata[0]->maintenance_to_hrs;?>" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format"/>
 						</div>
 						
 						<div class="col-md-3">
@@ -430,8 +430,8 @@ $('#rdate').datepicker({
          dateFormat: 'dd-mm-yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
 		
 	});
-$('#total_burner_running_time').timeEntry({show24Hours: true});
-$('#total_feeding_hrs').timeEntry({show24Hours: true});	
+//$('#total_burner_running_time').timeEntry({show24Hours: true});
+//$('#total_feeding_hrs').timeEntry({show24Hours: true});	
 $('#approvedby').val('<?php echo $dailydata[0]->approvedby?>')	;
 	
 
diff --git a/application/views/edit_hourly_batch_card.php b/application/views/edit_hourly_batch_card.php
index 7cac6314..4017fcbe 100755
--- a/application/views/edit_hourly_batch_card.php
+++ b/application/views/edit_hourly_batch_card.php
@@ -77,12 +77,12 @@ foreach($emplist as $r)
 			   <div class="row">
 					<div class="col-md-2">
 					<label>Auto Start</label>
-					<input type="text" id="auto_start" value="<?php echo $batchdata[0]->auto_start?>" name="myData[auto_start]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('h:i');?>">
+					<input type="text" id="auto_start" value="<?php echo $batchdata[0]->auto_start?>" name="myData[auto_start]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format">
 			   </div>
 			   
 			   <div class="col-md-2">
 					<label>Auto Stop</label>
-					<input type="text" id="auto_stop" value="<?php echo $batchdata[0]->auto_stop?>" name="myData[auto_stop]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('h:i');?>">
+					<input type="text" id="auto_stop" value="<?php echo $batchdata[0]->auto_stop?>" name="myData[auto_stop]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format">
 			   </div>
 			   
 			   <div class="col-md-2">
diff --git a/application/views/hourly_batch_card.php b/application/views/hourly_batch_card.php
index b2afe3d4..2e4570f9 100755
--- a/application/views/hourly_batch_card.php
+++ b/application/views/hourly_batch_card.php
@@ -50,7 +50,7 @@ foreach($emplist as $r)
 			   <div class="col-md-2">
 			   
 			   <label>Batch Time</label></br>
-				<input type="text" name="myData[usr_time]" id="usr_time" class="form-control" style="text-align:right;" onblur="checkExist();">
+				<input type="text" name="myData[usr_time]" id="usr_time" class="form-control" style="text-align:right;" onblur="checkExist();" title="Enter 24 Hrs Format">
 			   </div>
 			   
 			    <div class="col-md-2">
@@ -75,12 +75,12 @@ foreach($emplist as $r)
 			   <div class="row">
 					<div class="col-md-2">
 					<label>Auto Start</label>
-					<input type="text" id="auto_start" name="myData[auto_start]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('h:i');?>">
+					<input type="text" id="auto_start" name="myData[auto_start]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format">
 			   </div>
 			   
 			   <div class="col-md-2">
 					<label>Auto Stop</label>
-					<input type="text" id="auto_stop" name="myData[auto_stop]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('h:i');?>">
+					<input type="text" id="auto_stop" name="myData[auto_stop]" class="form-control" style="text-align:right;" onchange="calculateTime();" placeholder="<?php echo date('H:i');?>" title="Enter 24 Hrs Format">
 			   </div>
 			   
 			   <div class="col-md-2">