From 0d17d8b3c409ed47b8f93009737665111e09d137 Mon Sep 17 00:00:00 2001 From: yoganandhank Date: Fri, 24 Jul 2026 16:10:27 +0530 Subject: [PATCH] minor changes in payment tracker dashboard page --- .../gccservicepaymenttracker/dashboard.html | 28 +++++++++---------- .../templates/home/view-login-details.html | 12 ++++---- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/main/resources/templates/gccservicepaymenttracker/dashboard.html b/src/main/resources/templates/gccservicepaymenttracker/dashboard.html index 385889c..7b7b592 100644 --- a/src/main/resources/templates/gccservicepaymenttracker/dashboard.html +++ b/src/main/resources/templates/gccservicepaymenttracker/dashboard.html @@ -1098,8 +1098,8 @@ Total No of Bills - Completed Files - Pending Files + Completed Bills + Pending Bills 1 to 15 Days 16 to 30 Days 31 to 60 Days @@ -1114,11 +1114,11 @@ style="background-color: #f8fafc;" onclick="openModalForCount('total', null, 'Total No of Bills')">0 0 + onclick="openModalForCount('completed_custom', null, 'Completed Bills')">0 0 + onclick="openModalForCount('pending_custom', null, 'Pending Bills')">0 0 Vendor Name Total No of Bills - Completed Files + Completed Bills Awaiting Details Pending with Dept Pending @@ -2024,8 +2024,8 @@ if (summaryTheadTr) { let summaryHeadHtml = ` Total No of Bills - Completed Files - Pending Files + Completed Bills + Pending Bills `; summaryHeadHtml += ` 1 to 15 Days @@ -2053,14 +2053,14 @@ vendorHeadHtml += `${escapeHtml(s.status_name)}`; }); - // Pending files column header with click toggle icon + // Pending Bills column header with click toggle icon const toggleIcon = showPendingSubBreakdown ? 'fa-angles-left' : 'fa-angles-right'; const titleText = showPendingSubBreakdown ? 'Click to hide status breakdown' : 'Click to show Pending with IT Cell & Pending with Others breakdown'; const subDNone = showPendingSubBreakdown ? '' : 'd-none'; vendorHeadHtml += ` - Pending files + Pending Bills `; @@ -3219,8 +3219,8 @@ let summaryBodyHtml = ` ${total} - ${completedTotal} - ${pendingTotal} + ${completedTotal} + ${pendingTotal} `; summaryBodyHtml += ` ${age_1_15} @@ -3442,7 +3442,7 @@ // 2. Custom "Pending" column const sumPending = sumTotal - sumCompleted; - totalTrHtml += `${sumPending}`; + totalTrHtml += `${sumPending}`; // 3. Sub-breakdown: Pending with IT Cell & Pending with Others totalTrHtml += ` @@ -3797,7 +3797,7 @@ } if (clickType === 'age') { - // Exclude completed files for pending age column clicks + // Exclude Completed Bills for pending age column clicks const rowStatusStr = String(row.status || '').trim(); const isCompleted = activeStatus.filter(s => getStatusKey(s.status_name) === 'completed').some(s => rowStatusStr === String(s.id) || @@ -3893,7 +3893,7 @@ const rowVendor = String(row.resolved_vendor || row.vendor_name || 'Unknown').trim(); if (rowVendor !== vendorName) return false; - // Exclude completed files for pending vendor age clicks + // Exclude Completed Bills for pending vendor age clicks const rowStatusStr = String(row.status || '').trim(); const isCompleted = activeStatus.filter(s => getStatusKey(s.status_name) === 'completed').some(s => rowStatusStr === String(s.id) || diff --git a/src/main/resources/templates/home/view-login-details.html b/src/main/resources/templates/home/view-login-details.html index d791a9a..736c4b2 100644 --- a/src/main/resources/templates/home/view-login-details.html +++ b/src/main/resources/templates/home/view-login-details.html @@ -3,7 +3,7 @@