latest commit 20-05-2025
This commit is contained in:
parent
29e82537a0
commit
9d0034b8bf
@ -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)) {
|
<?php if (!empty($a->Days_Worked)) {
|
||||||
echo $a->Days_Worked;
|
echo $a->Days_Worked;
|
||||||
} else {
|
} else {
|
||||||
@ -860,7 +860,7 @@ $(document).ready(function () {
|
|||||||
var totalhrsid = p + 'TH';
|
var totalhrsid = p + 'TH';
|
||||||
var totalothrsid = p + 'OTH';
|
var totalothrsid = p + 'OTH';
|
||||||
var paidleaveid = p + 'PL';
|
var paidleaveid = p + 'PL';
|
||||||
var daysworkedid = p + 'DW';
|
var daysworkedid = p + 'DAYWORKED';
|
||||||
var absentid = p + 'AB';
|
var absentid = p + 'AB';
|
||||||
|
|
||||||
//document.getElementById(i).textContent = v;
|
//document.getElementById(i).textContent = v;
|
||||||
@ -883,8 +883,6 @@ $(document).ready(function () {
|
|||||||
var str3 = str.substr(-3);
|
var str3 = str.substr(-3);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (str1 == 'W') {
|
if (str1 == 'W') {
|
||||||
// sundayValidation = false;
|
// sundayValidation = false;
|
||||||
// let dateInt = +str3.replace(/\D/g, '');
|
// let dateInt = +str3.replace(/\D/g, '');
|
||||||
@ -906,6 +904,8 @@ $(document).ready(function () {
|
|||||||
|
|
||||||
var text = value.textContent.trim();
|
var text = value.textContent.trim();
|
||||||
var current = (text === '' || isNaN(parseFloat(text))) ? 0 : parseFloat(value.textContent);
|
var current = (text === '' || isNaN(parseFloat(text))) ? 0 : parseFloat(value.textContent);
|
||||||
|
|
||||||
|
|
||||||
totalworkingHrs += current;
|
totalworkingHrs += current;
|
||||||
|
|
||||||
if (current == 0) {
|
if (current == 0) {
|
||||||
@ -951,6 +951,7 @@ $(document).ready(function () {
|
|||||||
// TotalOT = totalOTHrs + sundayWorkingHr;
|
// TotalOT = totalOTHrs + sundayWorkingHr;
|
||||||
TotalOT = totalOTHrs;
|
TotalOT = totalOTHrs;
|
||||||
TotalWH = totalworkingHrs;
|
TotalWH = totalworkingHrs;
|
||||||
|
|
||||||
document.getElementById(totalhrsid).textContent = parseFloat(TotalWH).toFixed(2); // == ''?0:parseFloat(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(totalothrsid).textContent = parseFloat(TotalOT).toFixed(2); // == ''?0:parseFloat(totalOTHrs));
|
||||||
document.getElementById(paidleaveid).textContent = parseFloat(publicholidays).toFixed(2);
|
document.getElementById(paidleaveid).textContent = parseFloat(publicholidays).toFixed(2);
|
||||||
@ -972,7 +973,7 @@ $(document).ready(function () {
|
|||||||
|
|
||||||
$.each(td, function(iter, val) {
|
$.each(td, function(iter, val) {
|
||||||
//console.log(iter+'-'+val.id+'-'+val.textContent);
|
//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) {
|
if (parseFloat(val.textContent) > 8) {
|
||||||
//alert('more than 8');
|
//alert('more than 8');
|
||||||
var ide = '#' + (val.id);
|
var ide = '#' + (val.id);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user