From 04d2e8da338682d432d4bcca1f757a0894967286 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 22 Feb 2018 10:55:47 +0530
Subject: [PATCH] issue fixed in batchcard

---
 application/views/dailyBatchCardListing.php | 54 +++++++++++----------
 application/views/dailybatchcard.php        | 14 +++---
 application/views/editDailyData.php         | 14 +++---
 3 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/application/views/dailyBatchCardListing.php b/application/views/dailyBatchCardListing.php
index bc4f2693..578926e8 100755
--- a/application/views/dailyBatchCardListing.php
+++ b/application/views/dailyBatchCardListing.php
@@ -431,12 +431,12 @@ td{ padding:3px;}
 									if($lfs_minutes != ''){
 										$final_lfs_hrs = $lfs_hrs+$lfs_hours;
 										if($lfs_minutes == 60){$final_lfs_mins = 00;}
-										else{$final_lfs_mins = round($lfs_minutes);}
+										                  else{$final_lfs_mins = round($lfs_minutes);}
 									}
 									else{
 										$final_lfs_hrs = $lfs_hrs+$lfs_hours;	
-										if($lfs_min == 60){$final_lfs_mins = 00;}
-										else{$final_lfs_mins = $lfs_min;}
+										if($lfs_min == 60 || $lfs_minutes == ' '){$final_lfs_mins = 00;}
+										                                     else{$final_lfs_mins = $lfs_min;}
 									}
 									
 									
@@ -460,12 +460,12 @@ td{ padding:3px;}
 								$final_lm_hrs = $lm_hrs+$lm_hours;
 								//$final_lm_mins = round($lm_minutes);
 								if($lm_minutes == 60){$final_lm_mins = 00;}
-								else{$final_lm_mins = round($lm_minutes);}
+								                 else{$final_lm_mins = round($lm_minutes);}
 							}
 							else{
 								$final_lm_hrs = $lm_hrs+$lm_hours;	
-								if($lm_min == 60){$final_lm_mins = 00;}
-								else{$final_lm_mins = $lm_min;}
+								if($lm_min == 60 || $lm_minutes == ' '){$final_lm_mins = 00;}
+								                                   else{$final_lm_mins = $lm_min;}
 							}
 							
 							
@@ -490,12 +490,12 @@ td{ padding:3px;}
 								$final_lb_hrs = $lb_hrs+$lb_hours;
 								//$final_lb_mins = round($lb_minutes);
 								if($lb_minutes == 60){$final_lb_mins = 00;}
-								else{$final_lb_mins = round($lb_minutes);}
+								                 else{$final_lb_mins = round($lb_minutes);}
 							}
 							else{
 								$final_lb_hrs = $lb_hrs+$lb_hours;
-								if($lb_min == 60){$final_lb_mins = '00';}
-								else{$final_lb_mins = $lb_min;}
+								if($lb_min == 60 || $lb_minutes == ' '){$final_lb_mins = '00';}
+								                                   else{$final_lb_mins = $lb_min;}
 							}
 							
 							$total_less_break_down_hrs = $final_lb_hrs .'.'. $final_lb_mins;
@@ -517,12 +517,12 @@ td{ padding:3px;}
 							if($tbr_minutes != ''){
 							      $final_tbr_hrs = $tbr_hrs+$tbr_hours;
 								  if($tbr_minutes == 60){$final_tbr_mins = 00;}
-								  else{$final_tbr_mins = round($tbr_minutes);}
+								                    else{$final_tbr_mins = round($tbr_minutes);}
 							}
 							else{
 							     $final_tbr_hrs = $tbr_hrs+$tbr_hours;
-								 if($tbr_min == 60){$final_tbr_mins = 00;}
-								 else{$final_tbr_mins = $tbr_min;} 
+								 if($tbr_min == 60 || $tbr_minutes == ' '){$final_tbr_mins = 00;}
+								                                      else{$final_tbr_mins = $tbr_min;} 
 						    }
 							
 							$total_burner_running_time = $final_tbr_hrs .'.'. $final_tbr_mins;
@@ -545,12 +545,12 @@ td{ padding:3px;}
 									$final_tfh_hrs = $tfh_hrs+$tfh_hours;
 									//$final_tfh_mins = round($tfh_minutes);
 									if($tfh_minutes == 60){$final_tfh_mins = 00;}
-									else{$final_tfh_mins = round($tfh_minutes);}
+									                  else{$final_tfh_mins = round($tfh_minutes);}
 							}
 							else{
 									$final_tfh_hrs = $tfh_hrs+$tfh_hours;
-									if($tfh_min == 60){$final_tfh_mins = 00;}
-									else{$final_tfh_mins = $tfh_min;}
+									if($tfh_min == 60 || $tfh_minutes == ' '){$final_tfh_mins = 00;}
+									                                     else{$final_tfh_mins = $tfh_min;}
 						}
 							
 							$total_feeding_hrs = $final_tfh_hrs .'.'. $final_tfh_mins;
@@ -573,13 +573,13 @@ td{ padding:3px;}
 								$final_edrh_hrs = $edrh_hrs+$edrh_hours;
 								//$final_edrh_mins = round($edrh_minutes);
 								if($edrh_minutes == 60){$final_edrh_mins = 00;}
-								else{$final_edrh_mins = round($edrh_minutes);}
+								                   else{$final_edrh_mins = round($edrh_minutes);}
 							}
 							else{
 								$final_edrh_hrs = $edrh_hrs+$edrh_hours;
 								//$final_edrh_mins = $edrh_min;
-								if($edrh_min == 60){$final_edrh_mins = 00;}
-								else{$final_edrh_mins = round($edrh_min);}
+								if($edrh_min == 60 || $edrh_minutes == ' '){$final_edrh_mins = 00;}
+								                                       else{$final_edrh_mins = round($edrh_min);}
 							}
 							
 							$total_ed_rhrs = $final_edrh_hrs .'.'. $final_edrh_mins;
@@ -609,23 +609,25 @@ td{ padding:3px;}
 							$drh_time = explode('.',$hdata->diesel_runninig_hrs);
 							$drh_hrs += $drh_time[0];
 							$drh_min += $drh_time[1];
-							
+							//echo $drh_min;
 							if ($drh_min >= 60)
 							{
   								$drh_hours = floor($drh_min/60);
-  								$drh_minutes = $drh_min % 60;
+								  $drh_minutes = $drh_min % 60;
+								  
 							}
 							if($drh_minutes != ''){
+								//echo $drh_minutes;
 									$final_drh_hrs = $drh_hrs+$drh_hours;
 									//$final_drh_mins = round($drh_minutes);
 									if($drh_minutes == 60){$final_drh_mins = 00;}
-									else{$final_drh_mins = round($drh_minutes);}
+									                  else{$final_drh_mins = round($drh_minutes);}
 						    } 
 							else{
 									$final_drh_hrs = $drh_hrs+$drh_hours;
 									//$final_drh_mins = $drh_min;
-									if($drh_min == 60){$final_drh_mins = 00;}
-									else{$final_drh_mins = $drh_min;}
+									if($drh_min == 60 || $drh_minutes == ' '){$final_drh_mins = 00;}
+									                                     else{$final_drh_mins = $drh_min;}
 							}
 							
 						$total_diesel_bull_rh = $final_drh_hrs .'.'. $final_drh_mins;
@@ -650,13 +652,13 @@ td{ padding:3px;}
 								$final_ddrh_hrs = $ddrh_hrs+$ddrh_hours;
 								//$final_ddrh_mins = round($ddrh_minutes);
 								if($ddrh_minutes == 60){$final_ddrh_mins = 00;}
-								else{$final_ddrh_mins = round($ddrh_minutes);}
+								                   else{$final_ddrh_mins = round($ddrh_minutes);}
 							}
 							else{
 								$final_ddrh_hrs = $ddrh_hrs+$ddrh_hours;
 								//$final_ddrh_mins = $ddrh_min;
-								if($ddrh_min == 60){$final_ddrh_mins = 00;}
-								else{$final_ddrh_mins = $ddrh_min;}
+								if($ddrh_min == 60 || $ddrh_minutes == ' '){$final_ddrh_mins = 00;}
+								                                      else{$final_ddrh_mins = $ddrh_min;}
 							}
 							
 							$total_diesel_rotary_bull_rh = $final_ddrh_hrs .'.'. $final_ddrh_mins;
diff --git a/application/views/dailybatchcard.php b/application/views/dailybatchcard.php
index 1bb69021..099eb033 100755
--- a/application/views/dailybatchcard.php
+++ b/application/views/dailybatchcard.php
@@ -58,12 +58,12 @@ foreach($emplist as $r)
 				
 				<div class="col-md-3">
 			      <label>Total TRP Running Hrs</label>
-			     <input type="text" id="trp_running_hrs" name="trp_running_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);"/>
+			     <input type="text" id="trp_running_hrs" name="trp_running_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);"/>
 			   </div>
 			   
 			   <div class="col-md-3">
 			      <label>Less Up To Feeding Start</label>
-			     <input type="text" id="feeding_start" name="feeding_start" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);"/>
+			     <input type="text" id="feeding_start" name="feeding_start" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);"/>
 			   </div>
 			   
 			   </div>
@@ -81,12 +81,12 @@ foreach($emplist as $r)
 				
 				<div class="col-md-3">
 			      <label>Total burner running time</label>
-			     <input type="text" id="total_burner_running_time" name="total_burner_running_time" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);"/>
+			     <input type="text" id="total_burner_running_time" name="total_burner_running_time" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);"/>
 			   </div>
 			   
 			   <div class="col-md-3">
 			      <label>Total Feeding Hours</label>
-			     <input type="text" id="total_feeding_hrs" name="total_feeding_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);"/>
+			     <input type="text" id="total_feeding_hrs" name="total_feeding_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);"/>
 			   </div>
 			   
 			   </div>
@@ -115,7 +115,7 @@ foreach($emplist as $r)
 					  <legend>Ed Details</legend>
 						<div class="col-md-3">
 						<label>Running Hrs</label>
-							<input type="text" id="ed_running_hrs" name="ed_running_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);"/>
+							<input type="text" id="ed_running_hrs" name="ed_running_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);"/>
 						</div>
 						
 						<div class="col-md-3" >
@@ -226,7 +226,7 @@ foreach($emplist as $r)
 						
 						<div class="col-md-3">
 						<label>Running Hrs</label>
-							<input type="text" id="diesel_running_hrs" name="diesel_running_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);"/>
+							<input type="text" id="diesel_running_hrs" name="diesel_running_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);"/>
 						</div>
 						
 						
@@ -246,7 +246,7 @@ foreach($emplist as $r)
 						
 						<div class="col-md-3">
 						<label>Running Hrs</label>
-							<input type="text" id="diesel_rotary_running_hrs" name="diesel_rotary_running_hrs" class="form-control"  style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);"/>
+							<input type="text" id="diesel_rotary_running_hrs" name="diesel_rotary_running_hrs" class="form-control"  style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);"/>
 						</div>
 						
 				  </div>
diff --git a/application/views/editDailyData.php b/application/views/editDailyData.php
index 106b70e2..f26ec23b 100755
--- a/application/views/editDailyData.php
+++ b/application/views/editDailyData.php
@@ -64,7 +64,7 @@ foreach($emplist as $r)
 				
 				<div class="col-md-3">
 			      <label>Total TRP Running Hrs</label>
-			     <input type="text" id="trp_running_hrs" name="trp_running_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->total_trp_running_hrs;?>" />
+			     <input type="text" id="trp_running_hrs" name="trp_running_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->total_trp_running_hrs;?>" />
 			   </div>
 			   
 			   
@@ -74,7 +74,7 @@ foreach($emplist as $r)
 			   <div class="col-md-12">
 			   <div class="col-md-3">
 			      <label>Less Up To Feeding Start</label>
-			     <input type="text" id="feeding_start" name="feeding_start" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->less_feeding_start;?>"/>
+			     <input type="text" id="feeding_start" name="feeding_start" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->less_feeding_start;?>"/>
 			   </div>
 				<div class="col-md-3">
 				<label>Less Maintenance</label>
@@ -88,7 +88,7 @@ foreach($emplist as $r)
 				
 				<div class="col-md-3">
 			      <label>Total burner running time</label>
-			     <input type="text" id="total_burner_running_time" name="total_burner_running_time" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->total_burner_running_time;?>"/>
+			     <input type="text" id="total_burner_running_time" name="total_burner_running_time" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->total_burner_running_time;?>"/>
 			   </div>
 			   
 			  
@@ -98,7 +98,7 @@ foreach($emplist as $r)
 			   <div class="col-md-12">
 			    <div class="col-md-3">
 			      <label>Total Feeding Hours</label>
-			     <input type="text" id="total_feeding_hrs" name="total_feeding_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->total_feeding_hrs;?>"/>
+			     <input type="text" id="total_feeding_hrs" name="total_feeding_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->total_feeding_hrs;?>"/>
 			   </div>
 			   
 				<!-- <div class="col-md-3">
@@ -124,7 +124,7 @@ foreach($emplist as $r)
 					  <legend>Ed Details</legend>
 						<div class="col-md-3">
 						<label>Running Hrs</label>
-							<input type="text" id="ed_running_hrs" name="ed_running_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->ed_running_hrs;?>"/>
+							<input type="text" id="ed_running_hrs" name="ed_running_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->ed_running_hrs;?>"/>
 						</div>
 						
 						<div class="col-md-3">
@@ -235,7 +235,7 @@ foreach($emplist as $r)
 						
 						<div class="col-md-3">
 						<label>Running Hrs</label>
-							<input type="text" id="diesel_running_hrs" name="diesel_running_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->diesel_runninig_hrs;?>"/>
+							<input type="text" id="diesel_running_hrs" name="diesel_running_hrs" class="form-control" style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->diesel_runninig_hrs;?>"/>
 						</div>
 						
 						
@@ -255,7 +255,7 @@ foreach($emplist as $r)
 						
 						<div class="col-md-3">
 						<label>Running Hrs</label>
-							<input type="text" id="diesel_rotary_running_hrs" name="diesel_rotary_running_hrs" class="form-control"  style="text-align:right;" onkeypress="return keyValidate(event);hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->diesel_dryer_runninig_hrs;?>"/>
+							<input type="text" id="diesel_rotary_running_hrs" name="diesel_rotary_running_hrs" class="form-control"  style="text-align:right;" onkeypress="return keyValidate(event);" onchange="hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->diesel_dryer_runninig_hrs;?>"/>
 						</div>
 						
 				  </div>