diff --git a/application/views/attendance.php b/application/views/attendance.php
index 4b53fab0..4055e8d7 100755
--- a/application/views/attendance.php
+++ b/application/views/attendance.php
@@ -281,13 +281,13 @@ $currentday = date('d');
$flag = 1;
}
}
-
+ $title = '';
foreach($publicholidaysarray as $h) //For Find out public holidays from $monthdays array
{
$temp = $h->H_Date;
$temp = substr($temp,8);
- $title = '';
+
if($temp == $col)
{
$flag2 = 1;
@@ -300,9 +300,10 @@ $currentday = date('d');
?>
-
title = "Sunday" title = class="celda_encabezado_general" >".$col."W";}else{echo $col."W";}?> |
- title = "Sunday" title = class="celda_encabezado_general" >".$col."OT";}else{echo $col."OT";}?> |
+ title = " " title = "sunday" class="celda_encabezado_general" > ".$col."W";} else { echo $col."W"; } ?> |
+ title = " " title = "sunday" class="celda_encabezado_general" > ".$col."OT";} else { echo $col."OT"; }?> |
H_Date;
$temp = substr($temp,8);
$title = '';
- $flag2 = 0;
+ //echo $temp.'-'.$col.'/';
if($temp == $col)
{
$flag2 = 1;
@@ -362,8 +363,8 @@ $currentday = date('d');
$OT = 'OT'.$col;
?>
- title = "Sunday" title = class="celda_normal" onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);" id ="" contenteditable = "true" tabindex="">$WH)){echo $a->$WH;}?> |
- title = "Sunday" title = class="celda_normal" onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);" id ="" contenteditable = "true" tabindex="">$OT)){echo $a->$OT;}?> |
+ title = " " title = "sunday" class="celda_normal" onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);" id = "" contenteditable = "true" tabindex=""> $WH)){echo $a->$WH;} else { echo '0';}?> |
+ title = " " title = "sunday" class="celda_normal" onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);" id = "" contenteditable = "true" tabindex=""> $OT)){echo $a->$OT;} else { echo '0';}?> |
@@ -520,6 +546,7 @@ function myFunction(p,i,v,k)
var nextid = $(j).closest('td').next('td');
nxtid = nextid[0].attributes[2].value;
//console.log(nextid[0].attributes[2].value);
+ console.log(nextid);
nxtvalue = v-8;
curvalue = 8;
@@ -536,6 +563,29 @@ function myFunction(p,i,v,k)
$(i).focus();
document.getElementById(i).innerHTML = '';
}
+ else if(id == 'S' && v > 16)
+ {
+ var j='#'+i;
+ console.log(i);
+ console.log('********************************************');
+ var nextid = $(j).closest('td').next('td');
+ console.log(nextid);
+ console.log('********************************************');
+ nxtid = nextid[0].attributes[3].value;
+ console.log('********************************************');
+ console.log(nxtid);
+ //console.log(nextid[0].attributes[2].value);
+
+ nxtvalue = v-16;
+ curvalue = 16;
+
+ curid = i;
+
+ document.getElementById(i).innerHTML = parseFloat(curvalue)
+ document.getElementById(nxtid).innerHTML = parseFloat(nxtvalue)
+
+ }
+
var totalworkingHrs=0;
diff --git a/application/views/monthlypayinputs.php b/application/views/monthlypayinputs.php
index a5dc8d22..7d460971 100755
--- a/application/views/monthlypayinputs.php
+++ b/application/views/monthlypayinputs.php
@@ -318,6 +318,7 @@ $('html').bind('keypress', function(e)
var finaldate = month.concat(hyphan);
var finaldate = finaldate.concat(res[1]);
//alert(finaldate);
+ $('.content').loader('show');
$.ajax({
data:{param1:finaldate},
@@ -371,10 +372,10 @@ $('html').bind('keypress', function(e)
'' + (i) + ' | ' +
'' + val.EmpID + ' | ' +
'' + val.FirstName+" "+ val.LastName + ' | ' +
- '' + Days_Worked + ' | ' +
- '' + LOP_Days + ' | ' +
- '' + Paid_leave + ' | ' +
- '' + OT_Hrs_Worked + ' | ' +
+ '' + Days_Worked + ' | ' +
+ '' + LOP_Days + ' | ' +
+ '' + Paid_leave + ' | ' +
+ '' + OT_Hrs_Worked + ' | ' +
'' + Loan_Recovered + ' | ' +
'' + Incentives + ' | ' +
'' + Other_Deductions+ ' | ' +
@@ -386,6 +387,7 @@ $('html').bind('keypress', function(e)
// //alert(trHTML);
//alert(temparray);
$('#monthlyListings > tbody').append(trHTML);
+ $('.content').loader('hide');
}
}
});