yoganandhank
/
gcc_flagpoles_officer_login
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

changes in pages and service

master
yoganandhan 8 months ago
parent
00abf26023
commit
0c9e889c34
5 changed files with 16 additions and 145 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java
  2. 2
      src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java
  3. 10
      src/main/resources/templates/modules/flagpole/adminreports.html
  4. 10
      src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html
  5. 133
      src/main/resources/templates/modules/flagpole/requestlist.html

6
src/main/java/com/gcc/flagpoles_services/flagpoles/controller/FlagPoleApiController.java
View File

@ -42,13 +42,13 @@ public class FlagPoleApiController {
try { try {
/* 🔥 Normalize input (username OR id → gccuserid) */
/* Normalize input (username OR id → gccuserid) */
gccUserId = rdoService.resolveGccUserId(gccUserId); gccUserId = rdoService.resolveGccUserId(gccUserId);
List<Map<String, Object>> result = rdoService.getAllRequestDetailsByUserLogin(gccUserId, List<Map<String, Object>> result = rdoService.getAllRequestDetailsByUserLogin(gccUserId,
startDate, endDate, applicationType); startDate, endDate, applicationType);
/* 🔥 Attach HISTORY per refid */
/* Attach HISTORY per refid */
for (Map<String, Object> record : result) { for (Map<String, Object> record : result) {
String refid = (String) record.get("refid"); String refid = (String) record.get("refid");
@ -86,7 +86,7 @@ public class FlagPoleApiController {
try { try {
/* 🔥 Normalize username OR id → gccuserid */
/* Normalize username OR id → gccuserid */
gccUserId = rdoService.resolveGccUserId(gccUserId); gccUserId = rdoService.resolveGccUserId(gccUserId);
int count = rdoService.updateOfficerDecision( int count = rdoService.updateOfficerDecision(

2
src/main/java/com/gcc/flagpoles_services/flagpoles/service/RdoService.java
View File

@ -445,7 +445,7 @@ public class RdoService {
/* Resolve access */ /* Resolve access */
List<Map<String, Object>> access = getUserAccess(appUserId); List<Map<String, Object>> access = getUserAccess(appUserId);
/* 🔥 Documents View Permission */
/* Documents View Permission */
Integer documentsView = (Integer) officerDetails.get("documents_view"); Integer documentsView = (Integer) officerDetails.get("documents_view");
boolean canViewLandDocs = (documentsView != null && documentsView == 1); boolean canViewLandDocs = (documentsView != null && documentsView == 1);

10
src/main/resources/templates/modules/flagpole/adminreports.html
View File

@ -364,7 +364,7 @@
const data = json.data || []; const data = json.data || [];
// 🔹 Dashboard counts
// Dashboard counts
let pending = 0, approved = 0, rejected = 0; let pending = 0, approved = 0, rejected = 0;
data.forEach(r => { data.forEach(r => {
@ -389,7 +389,7 @@
$("#approved").text(approved); $("#approved").text(approved);
$("#rejected").text(rejected); $("#rejected").text(rejected);
return data; // ✅ already unique per refid
return data; // already unique per refid
} }
}, },
@ -518,7 +518,7 @@
// $('#QaqcDatatable').on("click", ".viewBtn", function () { // $('#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(); // const rowData = table.row($(this).closest('tr')).data();
// if (!rowData) { // if (!rowData) {
@ -534,7 +534,7 @@
let tr = $(this).closest('tr'); let tr = $(this).closest('tr');
// ✅ If responsive child row, get previous row
// If responsive child row, get previous row
if (tr.hasClass('child')) { if (tr.hasClass('child')) {
tr = tr.prev(); tr = tr.prev();
} }
@ -582,7 +582,7 @@
$("#detailsModal").data("refid", record.refid); $("#detailsModal").data("refid", record.refid);
// 🔹 Streets
// Streets
let streetHtml = ""; let streetHtml = "";
record.streets.forEach((s, index) => { record.streets.forEach((s, index) => {

10
src/main/resources/templates/modules/flagpole/approvedandrejectedlist.html
View File

@ -370,7 +370,7 @@
const data = json.data || []; const data = json.data || [];
// 🔹 Dashboard counts
// Dashboard counts
let pending = 0, approved = 0, rejected = 0; let pending = 0, approved = 0, rejected = 0;
data.forEach(r => { data.forEach(r => {
@ -395,7 +395,7 @@
$("#approved").text(approved); $("#approved").text(approved);
$("#rejected").text(rejected); $("#rejected").text(rejected);
return data; // ✅ already unique per refid
return data; // already unique per refid
} }
}, },
@ -524,7 +524,7 @@
// $('#QaqcDatatable').on("click", ".viewBtn", function () { // $('#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(); // const rowData = table.row($(this).closest('tr')).data();
// if (!rowData) { // if (!rowData) {
@ -540,7 +540,7 @@
let tr = $(this).closest('tr'); let tr = $(this).closest('tr');
// ✅ If responsive child row, get previous row
// If responsive child row, get previous row
if (tr.hasClass('child')) { if (tr.hasClass('child')) {
tr = tr.prev(); tr = tr.prev();
} }
@ -588,7 +588,7 @@
$("#detailsModal").data("refid", record.refid); $("#detailsModal").data("refid", record.refid);
// 🔹 Streets
// Streets
let streetHtml = ""; let streetHtml = "";
record.streets.forEach((s, index) => { record.streets.forEach((s, index) => {

133
src/main/resources/templates/modules/flagpole/requestlist.html
View File

@ -887,7 +887,7 @@
let decisionHtml = ""; let decisionHtml = "";
// 🔹 Show decision buttons ONLY if pending
// Show decision buttons ONLY if pending
if (!record.final_status) { if (!record.final_status) {
decisionHtml = ` decisionHtml = `
${documentsHtml} ${documentsHtml}
@ -1014,73 +1014,6 @@
$("#modalContent").html(html); $("#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) { function submitOfficerDecision(status) {
let remarks = ($("#rdoRemarks").val() || "").trim(); let remarks = ($("#rdoRemarks").val() || "").trim();
@ -1089,7 +1022,7 @@
let gccUserId = $("#loginuserid").val(); // login user id let gccUserId = $("#loginuserid").val(); // login user id
let username = $("#userName").val(); // display username let username = $("#userName").val(); // display username
// 🔥 Collect verification answers
// Collect verification answers
let answers = []; let answers = [];
$(".verification-item").each(function () { $(".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'
// });
// }
// });
// });
// }
</script> </script>

Write Preview
Loading…
Cancel
Save