From e2d3b52f8b90294a4fcf5bfb3d1497ee687c5d33 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Wed, 21 Feb 2018 21:00:54 +0530
Subject: [PATCH] issue fixed in batchcard

---
 application/views/dailyBatchCardListing.php | 110 ++++++++++++++------
 application/views/dailybatchcard.php        |  14 +--
 application/views/editDailyData.php         |  14 +--
 3 files changed, 94 insertions(+), 44 deletions(-)

diff --git a/application/views/dailyBatchCardListing.php b/application/views/dailyBatchCardListing.php
index 417e65ca..bc4f2693 100755
--- a/application/views/dailyBatchCardListing.php
+++ b/application/views/dailyBatchCardListing.php
@@ -416,7 +416,33 @@ td{ padding:3px;}
 							<td ><?php  echo $auto[0];?></td>
 							<td ><?php  echo $auto[1];?></td>
 							<td ><?php   $tthrs =  $h.':'.$m;echo $tthrs;?></td>
-							<td ><?php  echo $hdata->less_feeding_start; $total_feeding_start += $hdata->less_feeding_start;?></td>
+							<td >
+								 <?php  echo $hdata->less_feeding_start; 
+									//$total_feeding_start += $hdata->less_feeding_start;
+									$lfs_time = explode('.',$hdata->less_feeding_start);
+									$lfs_hrs += $lfs_time[0];
+									$lfs_min += $lfs_time[1];
+									
+									if ($lfs_min >= 60)
+									{
+										$lfs_hours = floor($lfs_min/60);
+										$lfs_minutes = $lfs_min % 60;
+									}
+									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_hrs = $lfs_hrs+$lfs_hours;	
+										if($lfs_min == 60){$final_lfs_mins = 00;}
+										else{$final_lfs_mins = $lfs_min;}
+									}
+									
+									
+									$total_feeding_start = $final_lfs_hrs .'.'. $final_lfs_mins;
+
+								 ?></td>
 							<td ><a class="test" href="<?php echo base_url()?>batchcard/editDailyData/<?php echo $id;?>#Mnt_div" >
 							     <?php  echo $hdata->less_maintenance; 
 										//$total_less_maintenance+= $hdata->less_maintenance;
@@ -431,14 +457,18 @@ td{ padding:3px;}
   								$lm_minutes = $lm_min % 60;
 							}
 							if($lm_minutes != ''){
-							$final_lm_hrs = $lm_hrs+$lm_hours;
-							$final_lm_mins = round($lm_minutes);
+								$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_hrs = $lm_hrs+$lm_hours;	
-							$final_lm_mins =  $lm_min;
+								$final_lm_hrs = $lm_hrs+$lm_hours;	
+								if($lm_min == 60){$final_lm_mins = 00;}
+								else{$final_lm_mins = $lm_min;}
 							}
 							
+							
 							$total_less_maintenance = $final_lm_hrs .'.'. $final_lm_mins;
 
 								 ?></a></td>
@@ -457,12 +487,15 @@ td{ padding:3px;}
   								$lb_minutes = $lb_min % 60;
 							}
 							if($lb_minutes != ''){
-							$final_lb_hrs = $lb_hrs+$lb_hours;
-							$final_lb_mins = round($lb_minutes);
+								$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_hrs = $lb_hrs+$lb_hours;
-							$final_lb_mins = $lb_min;
+								if($lb_min == 60){$final_lb_mins = '00';}
+								else{$final_lb_mins = $lb_min;}
 							}
 							
 							$total_less_break_down_hrs = $final_lb_hrs .'.'. $final_lb_mins;
@@ -482,13 +515,15 @@ td{ padding:3px;}
   								$tbr_minutes = $tbr_min % 60;
 							}
 							if($tbr_minutes != ''){
-							$final_tbr_hrs = $tbr_hrs+$tbr_hours;
-							$final_tbr_mins = round($tbr_minutes);
-						}
-						else{
-							$final_tbr_hrs = $tbr_hrs+$tbr_hours;
-							$final_tbr_mins = $tbr_min;
-						}
+							      $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_hrs = $tbr_hrs+$tbr_hours;
+								 if($tbr_min == 60){$final_tbr_mins = 00;}
+								 else{$final_tbr_mins = $tbr_min;} 
+						    }
 							
 							$total_burner_running_time = $final_tbr_hrs .'.'. $final_tbr_mins;
 							//$total_burner_running_time+=$hdata->total_burner_running_time;
@@ -507,12 +542,15 @@ td{ padding:3px;}
   								$tfh_minutes = $tfh_min % 60;
 							}
 							if($tfh_minutes != ''){
-							$final_tfh_hrs = $tfh_hrs+$tfh_hours;
-							$final_tfh_mins = round($tfh_minutes);
-						}
-						else{
-							$final_tfh_hrs = $tfh_hrs+$tfh_hours;
-							$final_tfh_mins = $tfh_min;
+									$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_hrs = $tfh_hrs+$tfh_hours;
+									if($tfh_min == 60){$final_tfh_mins = 00;}
+									else{$final_tfh_mins = $tfh_min;}
 						}
 							
 							$total_feeding_hrs = $final_tfh_hrs .'.'. $final_tfh_mins;
@@ -533,11 +571,15 @@ td{ padding:3px;}
 							}
 							if($edrh_minutes != ''){
 								$final_edrh_hrs = $edrh_hrs+$edrh_hours;
-								$final_edrh_mins = round($edrh_minutes);
+								//$final_edrh_mins = round($edrh_minutes);
+								if($edrh_minutes == 60){$final_edrh_mins = 00;}
+								else{$final_edrh_mins = round($edrh_minutes);}
 							}
 							else{
 								$final_edrh_hrs = $edrh_hrs+$edrh_hours;
-								$final_edrh_mins = $edrh_min;
+								//$final_edrh_mins = $edrh_min;
+								if($edrh_min == 60){$final_edrh_mins = 00;}
+								else{$final_edrh_mins = round($edrh_min);}
 							}
 							
 							$total_ed_rhrs = $final_edrh_hrs .'.'. $final_edrh_mins;
@@ -574,12 +616,16 @@ td{ padding:3px;}
   								$drh_minutes = $drh_min % 60;
 							}
 							if($drh_minutes != ''){
-							$final_drh_hrs = $drh_hrs+$drh_hours;
-							$final_drh_mins = round($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_hrs = $drh_hrs+$drh_hours;
-							$final_drh_mins = $drh_min;
+									$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;}
 							}
 							
 						$total_diesel_bull_rh = $final_drh_hrs .'.'. $final_drh_mins;
@@ -601,12 +647,16 @@ td{ padding:3px;}
   								$ddrh_minutes = $ddrh_min % 60;
 							}
 							if($ddrh_minutes != ''){
-							$final_ddrh_hrs = $ddrh_hrs+$ddrh_hours;
-							$final_ddrh_mins = round($ddrh_minutes);
+								$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_hrs = $ddrh_hrs+$ddrh_hours;
-								$final_ddrh_mins = $ddrh_min;
+								//$final_ddrh_mins = $ddrh_min;
+								if($ddrh_min == 60){$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 ea7ec7db..1bb69021 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);" onchange="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);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);" />
+			     <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);"/>
 			   </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);" onchange="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);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);" onchange="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);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);" onchange="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);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);" onchange="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);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);" onchange="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);hour_validation(this.value,this.id);"/>
 						</div>
 						
 				  </div>
diff --git a/application/views/editDailyData.php b/application/views/editDailyData.php
index 33ceec53..106b70e2 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);" value="<?php echo $dailydata[0]->total_trp_running_hrs;?>" onchange="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);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);" 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);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);" value="<?php echo $dailydata[0]->total_burner_running_time;?>" onchange="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);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);" value="<?php echo $dailydata[0]->total_feeding_hrs;?>" onchange="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);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);" value="<?php echo $dailydata[0]->ed_running_hrs;?>" onchange="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);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);" value="<?php echo $dailydata[0]->diesel_runninig_hrs;?>" onchange="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);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);" value="<?php echo $dailydata[0]->diesel_dryer_runninig_hrs;?>" onchange="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);hour_validation(this.value,this.id);" value="<?php echo $dailydata[0]->diesel_dryer_runninig_hrs;?>"/>
 						</div>
 						
 				  </div>