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;}
|
|
|
- less_feeding_start; $total_feeding_start += $hdata->less_feeding_start;?> |
+
+ 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;
+
+ ?> |
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;
?> |
@@ -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)
-
+
-
+
@@ -81,12 +81,12 @@ foreach($emplist as $r)
-
+
-
+
@@ -115,7 +115,7 @@ foreach($emplist as $r)
-
+
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)
-
+
@@ -74,7 +74,7 @@ foreach($emplist as $r)