From ffaee0eb46af628a6705454637ddedd3f3d106e4 Mon Sep 17 00:00:00 2001 From: yoganandhan Date: Sat, 8 Mar 2025 12:40:04 +0530 Subject: [PATCH] updated files --- .../controller/ReportApiController.java | 5 +- .../PendencyAutoConversionScheduler.java | 11 +-- .../newentry/provisionalretirement.html | 8 +- .../received/provisionalretirement.html | 8 +- frontend/pensioner/department/reports.html | 6 +- .../pensioner/forward/familypension.html | 2 +- .../pensioner/pensioner/forward/pendency.html | 2 +- .../pensioner/forward/retirement.html | 2 +- .../pensioner/received/familypension.html | 2 +- .../pensioner/pensioner/received/gis.html | 2 +- .../pensioner/received/pendency.html | 2 +- .../received/provisionalretirement.html | 10 +-- .../pensioner/received/retirement.html | 2 +- frontend/pensioner/pensioner/reports.html | 87 +++++++++++++++++-- 14 files changed, 111 insertions(+), 38 deletions(-) diff --git a/backend/pensioner/controller/ReportApiController.java b/backend/pensioner/controller/ReportApiController.java index cce7896..3fbba6d 100644 --- a/backend/pensioner/controller/ReportApiController.java +++ b/backend/pensioner/controller/ReportApiController.java @@ -10,12 +10,15 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.RestController; import in.gov.chennaicorporation.gccoffice.pensioner.service.ReportApiService; -@Controller +@RequestMapping("gcc/api/report") +@RestController public class ReportApiController { @Autowired private ReportApiService reportApiService; diff --git a/backend/pensioner/scheduler/PendencyAutoConversionScheduler.java b/backend/pensioner/scheduler/PendencyAutoConversionScheduler.java index 5218b36..6ef9aa8 100644 --- a/backend/pensioner/scheduler/PendencyAutoConversionScheduler.java +++ b/backend/pensioner/scheduler/PendencyAutoConversionScheduler.java @@ -26,12 +26,13 @@ public class PendencyAutoConversionScheduler { public ReceivedDeptProvisionalService ReceivedDeptProvisionalservice; /** - * Scheduled method that runs every 60 seconds to process auto-conversion tasks. + * Scheduled method that runs every day 3.00am and 4.00 am to process auto-conversion tasks. */ - @Scheduled(cron = "*/20 * * * * ?") // Runs every 60 seconds + + @Scheduled(cron = "0 0 3 * * ?", zone = "Asia/Kolkata")// Runs every 3.00 am public void executeAutoConversion() { try { - System.out.println(" Running scheduled auto-conversion task..."); + System.out.println(" Running scheduled auto-conversion task... at 3.00 am"); // Step 1: Fetch temp IDs that need processing List> tempIds = pendencyAutoConversionService.getConvertingTempIds(); @@ -70,9 +71,9 @@ public class PendencyAutoConversionScheduler { } - @Scheduled(cron = "*/40 * * * * ?") // Runs every 40 seconds + @Scheduled(cron = "0 0 4 * * ?", zone = "Asia/Kolkata") // Runs every day 4.00am public void scheduledPendencyUpdate() { - System.out.println("Scheduled Task Started: Updating Pensioner Pending Duration 30"); + System.out.println("Scheduled Task Started 4.00 am: Updating Pensioner Pending Duration"); Map result = GetRecordsUpdatePendencyDuration(); diff --git a/frontend/pensioner/department/newentry/provisionalretirement.html b/frontend/pensioner/department/newentry/provisionalretirement.html index f941cb7..2107c94 100644 --- a/frontend/pensioner/department/newentry/provisionalretirement.html +++ b/frontend/pensioner/department/newentry/provisionalretirement.html @@ -145,7 +145,7 @@ padding-top: 2%;
Department Entries
- Provisional Retirement + Provisional Pension
@@ -155,7 +155,7 @@ padding-top: 2%;
  • Department Entries
  • NewEntry
    • -
  • Provisional Retirement
    • +
  • Provisional Pension
    • @@ -168,7 +168,7 @@ padding-top: 2%;
     Department
    -
    New Entry - Provisional Retirement
    +
    New Entry - Provisional Pension
    @@ -195,7 +195,7 @@ padding-top: 2%;
    -
    New Entry - Provisional Retirement -
    +
    New Entry - Provisional Pension -
    diff --git a/frontend/pensioner/department/received/provisionalretirement.html b/frontend/pensioner/department/received/provisionalretirement.html index 7a29902..42234ea 100644 --- a/frontend/pensioner/department/received/provisionalretirement.html +++ b/frontend/pensioner/department/received/provisionalretirement.html @@ -183,7 +183,7 @@ margin-top: 10px;
    -
    Provisional Retriement
    +
    Provisional Pension
    Department Entries
    @@ -194,7 +194,7 @@ margin-top: 10px;
  • Department Entries
  • Received From Pension
    • -
  • Provisional Retriement
    • +
  • Provisional Pension
    • @@ -207,7 +207,7 @@ margin-top: 10px;
     Department
    -
    Received From Pension - Provisional Retirement
    +
    Received From Pension - Provisional Pension
    @@ -264,7 +264,7 @@ margin-top: 10px;
    @@ -207,7 +207,7 @@ margin-top: 10px;
    -
    Received From Department - Provisional Retirement
    +
    Received From Department - Provisional Pension
    @@ -264,7 +264,7 @@ margin-top: 10px;
    +
      +
      + +
      +
    +
    + @@ -490,7 +503,7 @@ td, th { $(document).ready(function () { function loadFileCategories() { $.ajax({ - url: "/getFileCategories", // Ensure this is the correct endpoint + url: "/gcc/api/report/getFileCategories", // Ensure this is the correct endpoint type: "GET", dataType: "json", success: function (response) { @@ -535,9 +548,9 @@ td, th { $(document).ready(function () { - function loadDepartments() { +/* function loadDepartments() { $.ajax({ - url: "/getdepartment", + url: "/gcc/api/report/getdepartment", type: "GET", dataType: "json", success: function (response) { @@ -583,8 +596,64 @@ td, th { }); } }); + } */ + + + function loadDepartments() { + $.ajax({ + url: "/gcc/api/report/getdepartment", + type: "GET", + dataType: "json", + success: function (response) { + console.log("Departments:", response); + $("#departmentCheckboxContainer").empty(); // Clear previous checkboxes + + // Append "Select All" checkbox + $("#departmentCheckboxContainer").append(` +
  • + +
    • + `); + + // Append individual department checkboxes + response.forEach(dept => { + $("#departmentCheckboxContainer").append(` +
  • + +
    • + `); + }); + + // "Select All" logic + $("#selectAllDept").change(function () { + $(".deptCheckbox").prop("checked", this.checked); // Check/uncheck all + }); + + // If any individual checkbox is unchecked, uncheck "Select All" + $(document).on("change", ".deptCheckbox", function () { + if ($(".deptCheckbox:checked").length === $(".deptCheckbox").length) { + $("#selectAllDept").prop("checked", true); + } else { + $("#selectAllDept").prop("checked", false); + } + }); + }, + error: function (xhr) { + console.error("AJAX Error:", xhr.status, xhr.responseText); + Swal.fire({ + icon: "error", + title: "Error Fetching Data", + text: "Failed to load departments. Please try again.", + }); + } + }); } + loadDepartments(); }); @@ -1506,13 +1575,13 @@ td, th { let url, data; if (typeOfReport === "Detailed") { - url = "/getReportDetailspension"; + url = "/gcc/api/report/getReportDetailspension"; data = { startDate: startDate, endDate: endDate, deptIds: selectedDeptIds, fileCatId: typeOfCategory, fileStatus: statusArray }; $("#audittable").hide(); } else { - url = "/getReportDatapension"; + url = "/gcc/api/report/getReportDatapension"; data = { startDate: startDate, endDate: endDate, fileCategoryId: typeOfCategory1 }; $("#audittable").show(); $("#cpstable").hide();