From 0c9e889c344c07af28e9abbf86a8e5cdd3337f7e Mon Sep 17 00:00:00 2001 From: yoganandhan Date: Mon, 16 Feb 2026 17:39:08 +0530 Subject: [PATCH] changes in pages and service --- .../controller/FlagPoleApiController.java | 6 +- .../flagpoles/service/RdoService.java | 2 +- .../modules/flagpole/adminreports.html | 10 +- .../flagpole/approvedandrejectedlist.html | 10 +- .../modules/flagpole/requestlist.html | 133 +----------------- 5 files changed, 16 insertions(+), 145 deletions(-) diff --git a/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java b/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java index 04d0f43..9c17427 100644 --- a/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java +++ b/src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java @@ -42,13 +42,13 @@ public class FlagPoleApiController { try { - /* 🔥 Normalize input (username OR id → gccuserid) */ + /* Normalize input (username OR id → gccuserid) */ gccUserId = rdoService.resolveGccUserId(gccUserId); List> result = rdoService.getAllRequestDetailsByUserLogin(gccUserId, startDate, endDate, applicationType); - /* 🔥 Attach HISTORY per refid */ + /* Attach HISTORY per refid */ for (Map record : result) { String refid = (String) record.get("refid"); @@ -86,7 +86,7 @@ public class FlagPoleApiController { try { - /* 🔥 Normalize username OR id → gccuserid */ + /* Normalize username OR id → gccuserid */ gccUserId = rdoService.resolveGccUserId(gccUserId); int count = rdoService.updateOfficerDecision( diff --git a/src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java b/src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java index 10c2a63..2ee2d52 100644 --- a/src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java +++ b/src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java @@ -445,7 +445,7 @@ public class RdoService { /* Resolve access */ List> access = getUserAccess(appUserId); - /* 🔥 Documents View Permission */ + /* Documents View Permission */ Integer documentsView = (Integer) officerDetails.get("documents_view"); boolean canViewLandDocs = (documentsView != null && documentsView == 1); diff --git a/src/main/resources/templates/modules/flagpole/adminreports.html b/src/main/resources/templates/modules/flagpole/adminreports.html index c72a9fa..e981448 100644 --- a/src/main/resources/templates/modules/flagpole/adminreports.html +++ b/src/main/resources/templates/modules/flagpole/adminreports.html @@ -364,7 +364,7 @@ const data = json.data || []; - // 🔹 Dashboard counts + // Dashboard counts let pending = 0, approved = 0, rejected = 0; data.forEach(r => { @@ -389,7 +389,7 @@ $("#approved").text(approved); $("#rejected").text(rejected); - return data; // ✅ already unique per refid + return data; // already unique per refid } }, @@ -518,7 +518,7 @@ // $('#QaqcDatatable').on("click", ".viewBtn", function () { - // // 🔹 Get row data directly from DataTable + // // Get row data directly from DataTable // const rowData = table.row($(this).closest('tr')).data(); // if (!rowData) { @@ -534,7 +534,7 @@ let tr = $(this).closest('tr'); - // ✅ If responsive child row, get previous row + // If responsive child row, get previous row if (tr.hasClass('child')) { tr = tr.prev(); } @@ -582,7 +582,7 @@ $("#detailsModal").data("refid", record.refid); - // 🔹 Streets + // Streets let streetHtml = ""; record.streets.forEach((s, index) => { diff --git a/src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html b/src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html index 969931b..8187e23 100644 --- a/src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html +++ b/src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html @@ -370,7 +370,7 @@ const data = json.data || []; - // 🔹 Dashboard counts + // Dashboard counts let pending = 0, approved = 0, rejected = 0; data.forEach(r => { @@ -395,7 +395,7 @@ $("#approved").text(approved); $("#rejected").text(rejected); - return data; // ✅ already unique per refid + return data; // already unique per refid } }, @@ -524,7 +524,7 @@ // $('#QaqcDatatable').on("click", ".viewBtn", function () { - // // 🔹 Get row data directly from DataTable + // // Get row data directly from DataTable // const rowData = table.row($(this).closest('tr')).data(); // if (!rowData) { @@ -540,7 +540,7 @@ let tr = $(this).closest('tr'); - // ✅ If responsive child row, get previous row + // If responsive child row, get previous row if (tr.hasClass('child')) { tr = tr.prev(); } @@ -588,7 +588,7 @@ $("#detailsModal").data("refid", record.refid); - // 🔹 Streets + // Streets let streetHtml = ""; record.streets.forEach((s, index) => { diff --git a/src/main/resources/templates/modules/flagpole/requestlist.html b/src/main/resources/templates/modules/flagpole/requestlist.html index 4dccb3b..9dda115 100644 --- a/src/main/resources/templates/modules/flagpole/requestlist.html +++ b/src/main/resources/templates/modules/flagpole/requestlist.html @@ -887,7 +887,7 @@ let decisionHtml = ""; - // 🔹 Show decision buttons ONLY if pending + // Show decision buttons ONLY if pending if (!record.final_status) { decisionHtml = ` ${documentsHtml} @@ -1014,73 +1014,6 @@ $("#modalContent").html(html); } - - - - // function submitRdoDecision(status) { - - // let remarks = ($("#rdoRemarks").val() || "").trim(); - // let refid = $("#detailsModal").data("refid"); - // let gccUserId = $("#loginuserid").val(); // 🔥 ONLY THIS - - // //let approvedBy = $("#userName").val(); // 🔥 FROM HIDDEN INPUT - - // if (!remarks) { - // Swal.fire({ - // icon: 'warning', - // title: 'Remarks Required', - // text: 'Please enter remarks before submitting' - // }); - // return; - // } - - // Swal.fire({ - // title: `Are you sure?`, - // text: `You want to ${status.toLowerCase()} this request`, - // icon: status === 'APPROVED' ? 'success' : 'error', - // showCancelButton: true, - // confirmButtonColor: status === 'APPROVED' ? '#28a745' : '#dc3545', - // cancelButtonColor: '#6c757d', - // confirmButtonText: `Yes, ${status}` - // }).then((result) => { - - // if (!result.isConfirmed) return; - - // $.ajax({ - // url: "/gcc/api/flagpoleregistration/rdo/updateDecision", - // type: "POST", - // data: { - // refid: refid, - // status: status, - // remarks: remarks, - // gccUserId: gccUserId - // //approvedBy: approvedBy // 🔥 PASS TO BACKEND - // }, - // success: function (res) { - - // Swal.fire({ - // icon: 'success', - // title: status === 'APPROVED' ? 'Approved!' : 'Rejected!', - // text: res.message || `Request has been ${status.toLowerCase()}`, - // timer: 2000, - // showConfirmButton: false - // }); - - // $("#detailsModal").modal("hide"); - // $("#QaqcDatatable").DataTable().ajax.reload(null, false); - // }, - // error: function () { - // Swal.fire({ - // icon: 'error', - // title: 'Error', - // text: 'Failed to update decision' - // }); - // } - // }); - // }); - // } - - function submitOfficerDecision(status) { let remarks = ($("#rdoRemarks").val() || "").trim(); @@ -1089,7 +1022,7 @@ let gccUserId = $("#loginuserid").val(); // login user id let username = $("#userName").val(); // display username - // 🔥 Collect verification answers + // Collect verification answers let answers = []; $(".verification-item").each(function () { @@ -1172,68 +1105,6 @@ } - // function submitOfficerDecision(status) { - - // let remarks = ($("#rdoRemarks").val() || "").trim(); - // let refid = $("#detailsModal").data("refid"); - - // let gccUserId = $("#loginuserid").val(); // login user id - // let username = $("#userName").val(); // display username - - // if (!remarks) { - // Swal.fire({ - // icon: 'warning', - // title: 'Remarks Required', - // text: 'Please enter remarks before submitting' - // }); - // return; - // } - - // Swal.fire({ - // title: `Are you sure?`, - // text: `You want to ${status.toLowerCase()} this request`, - // icon: status === 'APPROVED' ? 'success' : 'error', - // showCancelButton: true, - // confirmButtonColor: status === 'APPROVED' ? '#28a745' : '#dc3545', - // cancelButtonColor: '#6c757d', - // confirmButtonText: `Yes, ${status}` - // }).then((result) => { - - // if (!result.isConfirmed) return; - - // $.ajax({ - // url: "/flagpoles/api/flagpoleregistration/officer/updateDecision", - // type: "POST", - // data: { - // refid: refid, - // status: status, - // remarks: remarks, - // gccUserId: gccUserId, - // username: username // ✅ NEW - // }, - // success: function (res) { - - // Swal.fire({ - // icon: 'success', - // title: status === 'APPROVED' ? 'Approved!' : 'Rejected!', - // text: res.message || `Request has been ${status.toLowerCase()}`, - // timer: 2000, - // showConfirmButton: false - // }); - - // $("#detailsModal").modal("hide"); - // $("#QaqcDatatable").DataTable().ajax.reload(null, false); - // }, - // error: function () { - // Swal.fire({ - // icon: 'error', - // title: 'Error', - // text: 'Failed to update decision' - // }); - // } - // }); - // }); - // }