diff --git a/application/views/attendance.php b/application/views/attendance.php index 4055e8d7..0d7aad17 100755 --- a/application/views/attendance.php +++ b/application/views/attendance.php @@ -300,7 +300,24 @@ $currentday = date('d'); ?> - title = " " title = "sunday" class="celda_encabezado_general" > ".$col."W";} else { echo $col."W"; } ?> + + 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"; }?> - 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';}?> + 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';}?> 16) { var j='#'+i; - console.log(i); - console.log('********************************************'); + //console.log(i); + //console.log('********************************************'); var nextid = $(j).closest('td').next('td'); - console.log(nextid); - console.log('********************************************'); + //console.log(nextid); + //console.log('********************************************'); nxtid = nextid[0].attributes[3].value; - console.log('********************************************'); - console.log(nxtid); + //console.log('********************************************'); + //console.log(nxtid); //console.log(nextid[0].attributes[2].value); nxtvalue = v-16; @@ -665,7 +682,7 @@ function myFunction(p,i,v,k) document.getElementById(totalhrsid).innerHTML = parseFloat(totalworkingHrs).toFixed(2);// == ''?0:parseFloat(totalworkingHrs)); document.getElementById(totalothrsid).innerHTML = parseFloat(totalOTHrs).toFixed(2);// == ''?0:parseFloat(totalOTHrs)); document.getElementById(paidleaveid).innerHTML = parseFloat(paidleave).toFixed(2); - document.getElementById(daysworkedid).innerHTML = parseFloat((totalworkingHrs/8)+sundays+publicholidays).toFixed(2); + document.getElementById(daysworkedid).innerHTML = parseFloat((totalworkingHrs/8)+publicholidays).toFixed(2); document.getElementById(absentid).innerHTML = parseFloat(absent).toFixed(2); } @@ -677,7 +694,7 @@ function FindInvalide() //console.log(index+'-'+value); var td = $(value).find('td'); $.each(td,function(iter,val){ - console.log(iter+'-'+val.id+'-'+val.textContent); + //console.log(iter+'-'+val.id+'-'+val.textContent); }); }); @@ -688,4 +705,4 @@ function FindInvalide() - \ No newline at end of file + diff --git a/application/views/dashboard.php b/application/views/dashboard.php index 40397240..1cd6f9dd 100755 --- a/application/views/dashboard.php +++ b/application/views/dashboard.php @@ -154,7 +154,7 @@ if(!empty($EmpCount))