Atteandance and Monthly pay screen Issue Resolved
This commit is contained in:
velz2020
parent
4b308a49cc
commit
9e3e9e0119
@ -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');
|
||||
?>
|
||||
|
||||
|
||||
<th <?php if($flag == 1){ ?> title = "Sunday" <?php }else if($flag2 == 1){ ?> title = <?php echo $title; }?> class="celda_encabezado_general"<?php if($flag == 1 or $flag2 == 1){echo "style='background: #f39c12 ;'";}else if($todayflag == 1){ echo "style='background: #dd99ff ;'"; } ?> ><?php if($flag == 1 or $flag2 == 1){echo "<font style='color:#ff0000;'>".$col."W<font>";}else{echo $col."W";}?></th>
|
||||
<th <?php if($flag == 1){ ?> title = "Sunday" <?php } else if($flag2 == 1){ ?> title = <?php echo $title; }?> class="celda_encabezado_general" <?php if($flag == 1 or $flag2 == 1){echo "style='background: #f39c12 ;'";}else if($todayflag == 1){ echo "style='background: #dd99ff ;'"; }?>><?php if($flag == 1 or $flag2 == 1){echo "<font style='color:#ff0000;'>".$col."OT<font>";}else{echo $col."OT";}?></th>
|
||||
<th <?php if($flag2 == 1){ ?> title = " <?php echo $title; ?> " <?php } else if($flag == 1 ){ ?> title = "sunday" <?php }?> class="celda_encabezado_general" <?php if($flag == 1 or $flag2 == 1) { echo "style='background: #f39c12 ;'"; } else if($todayflag == 1){ echo "style='background: #dd99ff ;'"; } ?> > <?php if($flag == 1 or $flag2 == 1){ echo "<font style='color:#ff0000;'>".$col."W<font>";} else { echo $col."W"; } ?></th>
|
||||
<th <?php if($flag2 == 1){ ?> title = " <?php echo $title; ?> " <?php } else if($flag == 1 ){ ?> title = "sunday" <?php }?> class="celda_encabezado_general" <?php if($flag == 1 or $flag2 == 1) { echo "style='background: #f39c12 ;'"; } else if($todayflag == 1){ echo "style='background: #dd99ff ;'"; }?> > <?php if($flag == 1 or $flag2 == 1){ echo "<font style='color:#ff0000;'>".$col."OT<font>";} else { echo $col."OT"; }?></th>
|
||||
<?php
|
||||
//echo $flag2;
|
||||
$flag =0;
|
||||
$flag2 =0;
|
||||
$todayflag = 0;
|
||||
@ -328,7 +329,7 @@ $currentday = date('d');
|
||||
|
||||
<?php for ($col =1; $col <= $monthdays;$col++){
|
||||
$flag =0;
|
||||
|
||||
$flag2 = 0;
|
||||
|
||||
if($col == $currentday)
|
||||
{
|
||||
@ -349,7 +350,7 @@ $currentday = date('d');
|
||||
$temp = $h->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;
|
||||
|
||||
?>
|
||||
<td <?php if($flag == 1){ ?> title = "Sunday" <?php }else if($flag2 == 1 ){ ?> title = <?php echo $title; } ?> class="celda_normal" onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);" id ="<?php if($flag == 1 or $flag2 == 1) {echo $row.$col.'WS';}else{echo $row.$col.'W';}?>" <?php if($flag == 1 or $flag2 == 1){echo "style='background: #f9cd86 ;'";} else if($todayflag == 1){ echo "style='background: #f7e6ff ;'"; }?> contenteditable = "true" tabindex="<?php echo $col;?>"><?php if(!empty($a->$WH)){echo $a->$WH;}?></td>
|
||||
<td <?php if($flag == 1){ ?> title = "Sunday" <?php }else if($flag2 == 1 ){ ?> title = <?php echo $title; } ?> class="celda_normal" onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);" id ="<?php if($flag == 1 or $flag2 == 1) {echo $row.$col.'OTS';}else{echo $row.$col.'OT';}?>" <?php if($flag == 1 or $flag2 == 1){echo "style='background: #f9cd86 ;'";}else if($todayflag == 1){ echo "style='background: #f7e6ff ;'"; }?> contenteditable = "true" tabindex="<?php echo $col;?>"><?php if(!empty($a->$OT)){echo $a->$OT;}?></td>
|
||||
<td <?php if($flag2 == 1){ ?> title = " <?php echo $title; ?> " <?php } else if($flag == 1 ){ ?> title = "sunday" <?php }?> class="celda_normal" onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);" id = "<?php if($flag == 1 or $flag2 == 1) {echo $row.'row'.$col.'WS';} else { echo $row.'row'.$col.'W';}?>" <?php if($flag == 1 or $flag2 == 1){ echo "style='background: #f9cd86 ;'";} else if($todayflag == 1){ echo "style='background: #f7e6ff ;'"; }?> contenteditable = "true" tabindex="<?php echo $col;?>"> <?php if(!empty($a->$WH)){echo $a->$WH;} else { echo '0';}?></td>
|
||||
<td <?php if($flag2 == 1){ ?> title = " <?php echo $title; ?> " <?php } else if($flag == 1 ){ ?> title = "sunday" <?php }?> class="celda_normal" onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);" id = "<?php if($flag == 1 or $flag2 == 1) {echo $row.'row'.$col.'OTS';} else { echo $row.'row'.$col.'OT';}?>" <?php if($flag == 1 or $flag2 == 1){ echo "style='background: #f9cd86 ;'";} else if($todayflag == 1){ echo "style='background: #f7e6ff ;'"; }?> contenteditable = "true" tabindex="<?php echo $col;?>"> <?php if(!empty($a->$OT)){echo $a->$OT;} else { echo '0';}?></td>
|
||||
|
||||
<?php $flag =0;
|
||||
$flag2 =0;
|
||||
@ -426,7 +427,7 @@ $currentday = date('d');
|
||||
var currentdate = '01-'+currentmonth+'-'+currentyear;
|
||||
|
||||
var totaldata = 0;
|
||||
$('#content').loader('hide');
|
||||
$('.content').loader('show');
|
||||
$.ajax({
|
||||
data:{param1:alldata,param2:currentdate,param3:Totalnoofdays},
|
||||
//dataType:"json",
|
||||
@ -436,7 +437,7 @@ $currentday = date('d');
|
||||
success:function(data) {
|
||||
if(data)
|
||||
{
|
||||
$('#content').loader('hide');
|
||||
$('.content').loader('hide');
|
||||
alert(data);
|
||||
//totaldata = totaldata + parseFloat(data);
|
||||
//console.log(data);
|
||||
@ -483,7 +484,32 @@ $currentday = date('d');
|
||||
|
||||
|
||||
|
||||
});});
|
||||
});
|
||||
|
||||
$('td').focus(function(e){
|
||||
|
||||
var id = e.target.id;
|
||||
var val = document.getElementById(id).textContent
|
||||
console.log(val);
|
||||
if(val == 0)
|
||||
{
|
||||
window.setTimeout(function(){ document.getElementById(id).textContent = ''; }, 0);
|
||||
}
|
||||
});
|
||||
|
||||
$('td').focusout(function(e){
|
||||
|
||||
var id = e.target.id;
|
||||
var val = document.getElementById(id).textContent
|
||||
if(val == '')
|
||||
{
|
||||
window.setTimeout(function(){ document.getElementById(id).textContent = '0'; }, 0);
|
||||
}
|
||||
console.log(val);
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
@ -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;
|
||||
|
||||
@ -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)
|
||||
'<td style="text-align:right;">' + (i) + '</td>' +
|
||||
'<td style="text-align:right;">' + val.EmpID + '</td>' +
|
||||
'<td>' + val.FirstName+" "+ val.LastName + '</td>' +
|
||||
'<td contenteditable="true" style="text-align:right;">' + Days_Worked + '</td>' +
|
||||
'<td contenteditable="true" style="text-align:right;">' + LOP_Days + '</td>' +
|
||||
'<td contenteditable="true" style="text-align:right;">' + Paid_leave + '</td>' +
|
||||
'<td contenteditable="true" style="text-align:right;">' + OT_Hrs_Worked + '</td>' +
|
||||
'<td contenteditable="false" style="text-align:right;">' + Days_Worked + '</td>' +
|
||||
'<td contenteditable="false" style="text-align:right;">' + LOP_Days + '</td>' +
|
||||
'<td contenteditable="false" style="text-align:right;">' + Paid_leave + '</td>' +
|
||||
'<td contenteditable="false" style="text-align:right;">' + OT_Hrs_Worked + '</td>' +
|
||||
'<td contenteditable="true" style="text-align:right;">' + Loan_Recovered + '</td>' +
|
||||
'<td contenteditable="true" style="text-align:right;">' + Incentives + '</td>' +
|
||||
'<td contenteditable="true" style="text-align:right;">' + Other_Deductions+ '</td>' +
|
||||
@ -386,6 +387,7 @@ $('html').bind('keypress', function(e)
|
||||
// //alert(trHTML);
|
||||
//alert(temparray);
|
||||
$('#monthlyListings > tbody').append(trHTML);
|
||||
$('.content').loader('hide');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user