latest commit 20-05-2025

This commit is contained in:
vadivelJ96 2025-05-20 18:25:37 +05:30
parent 29e82537a0
commit 9d0034b8bf

View File

@ -525,7 +525,7 @@ $currentday = date('d');
} ?>
<td class="celda_normal summary" id="<?php echo $row . 'DW'; ?>">
<td class="celda_normal summary" id="<?php echo $row . 'DAYWORKED'; ?>">
<?php if (!empty($a->Days_Worked)) {
echo $a->Days_Worked;
} else {
@ -860,7 +860,7 @@ $(document).ready(function () {
var totalhrsid = p + 'TH';
var totalothrsid = p + 'OTH';
var paidleaveid = p + 'PL';
var daysworkedid = p + 'DW';
var daysworkedid = p + 'DAYWORKED';
var absentid = p + 'AB';
//document.getElementById(i).textContent = v;
@ -883,8 +883,6 @@ $(document).ready(function () {
var str3 = str.substr(-3);
if (str1 == 'W') {
// sundayValidation = false;
// let dateInt = +str3.replace(/\D/g, '');
@ -906,6 +904,8 @@ $(document).ready(function () {
var text = value.textContent.trim();
var current = (text === '' || isNaN(parseFloat(text))) ? 0 : parseFloat(value.textContent);
totalworkingHrs += current;
if (current == 0) {
@ -951,6 +951,7 @@ $(document).ready(function () {
// TotalOT = totalOTHrs + sundayWorkingHr;
TotalOT = totalOTHrs;
TotalWH = totalworkingHrs;
document.getElementById(totalhrsid).textContent = parseFloat(TotalWH).toFixed(2); // == ''?0:parseFloat(totalworkingHrs));
document.getElementById(totalothrsid).textContent = parseFloat(TotalOT).toFixed(2); // == ''?0:parseFloat(totalOTHrs));
document.getElementById(paidleaveid).textContent = parseFloat(publicholidays).toFixed(2);
@ -972,7 +973,7 @@ $(document).ready(function () {
$.each(td, function(iter, val) {
//console.log(iter+'-'+val.id+'-'+val.textContent);
if ((val.id).substr(-1) == 'W' && (val.id).substr(-2) != 'DW') {
if ((val.id).substr(-1) == 'W' && (val.id).substr(-2) != 'DAYWORKED') {
if (parseFloat(val.textContent) > 8) {
//alert('more than 8');
var ide = '#' + (val.id);