From 6cd8216d59431e1e005610070fb0d9ffdab6e263 Mon Sep 17 00:00:00 2001 From: yoganandhan Date: Mon, 3 Mar 2025 18:04:53 +0530 Subject: [PATCH] updated files --- .../PensionReceivedApiController.java | 2 +- .../pensioner/service/NewEntryService.java | 3 +- .../completed/contributorypensionscheme.html | 87 +++++++-------- .../department/completed/familypension.html | 9 +- .../pensioner/department/completed/gis.html | 6 +- .../department/completed/pendency.html | 10 +- .../completed/provisionalretirement.html | 26 ++--- .../department/completed/retirement.html | 10 +- .../newentry/contributorypensionscheme.html | 104 +++++++++++++++--- .../newentry/provisionalretirement.html | 2 +- .../department/partial/familypension.html | 2 + .../department/partial/pendency.html | 2 + .../department/partial/retirement.html | 3 +- .../department/received/familypension.html | 3 +- .../department/received/pendency.html | 20 ++-- .../received/provisionalretirement.html | 8 +- .../department/received/retirement.html | 3 +- .../completed/contributorypensionscheme.html | 79 +++++++------ .../pensioner/completed/familypension.html | 60 +++++----- .../pensioner/pensioner/completed/gis.html | 2 +- .../pensioner/completed/pendency.html | 60 +++++----- .../completed/provisionalretirement.html | 26 ++--- .../pensioner/completed/retirement.html | 58 +++++----- .../pensioner/partial/retirement.html | 2 +- .../pensioner/received/familypension.html | 3 +- .../pensioner/pensioner/received/gis.html | 2 + .../pensioner/received/pendency.html | 11 +- .../pensioner/received/retirement.html | 3 +- 28 files changed, 354 insertions(+), 252 deletions(-) diff --git a/backend/pensioner/controller/PensionReceivedApiController.java b/backend/pensioner/controller/PensionReceivedApiController.java index c32586e..5d7109f 100644 --- a/backend/pensioner/controller/PensionReceivedApiController.java +++ b/backend/pensioner/controller/PensionReceivedApiController.java @@ -77,7 +77,7 @@ public class PensionReceivedApiController { if(updated) { - return ResponseEntity.ok("File Saved successfully!"); + return ResponseEntity.ok("File completed successfully!"); } else { return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to save details in history."); diff --git a/backend/pensioner/service/NewEntryService.java b/backend/pensioner/service/NewEntryService.java index 62a3c38..b7e637b 100644 --- a/backend/pensioner/service/NewEntryService.java +++ b/backend/pensioner/service/NewEntryService.java @@ -701,8 +701,7 @@ public class NewEntryService { String uacDate = "yes".equals(uac) && requestData.get("uacDate") != null ? requestData.get("uacDate").toString() : null; String pendingDuration = (String) requestData.get("pendingDuration"); - String reasonPending = "yes".equals(pendingDuration) && requestData.get("reasonPending") != null - ? requestData.get("reasonPending").toString() : null; + String reasonPending = "Yes".equals(pendingDuration) && requestData.get("reasonPending") != null ? requestData.get("reasonPending").toString() : null; String cps =(String) requestData.get("cps"); String cpsAmount = "yes".equals(cps) && requestData.get("cpsAmount") != null ? requestData.get("cpsAmount").toString() : null; diff --git a/frontend/pensioner/department/completed/contributorypensionscheme.html b/frontend/pensioner/department/completed/contributorypensionscheme.html index d193474..8f20086 100644 --- a/frontend/pensioner/department/completed/contributorypensionscheme.html +++ b/frontend/pensioner/department/completed/contributorypensionscheme.html @@ -278,37 +278,37 @@ margin-top: 10px;
- +
- +
- +
- +
- +
- +
- +
- +
@@ -326,25 +326,24 @@ margin-top: 10px; -
- -
-
- - -
-
- - -
-
- -
+ +
+ +
+
+ + +
+
+ + +
+
+ +
@@ -366,7 +365,7 @@ margin-top: 10px;
- +
@@ -384,7 +383,7 @@ margin-top: 10px;
- +
@@ -401,7 +400,7 @@ margin-top: 10px;
- +
@@ -424,14 +423,6 @@ margin-top: 10px; - - - - - - - -
@@ -542,7 +533,20 @@ margin-top: 10px; $('#uacInputDiv').hide(); // Hide date input field } - // Populate Pending Duration and Reason for Pending pendingDurationYes pendingDurationNo pendingDurationInputContainer pendingDurationInput + + + + // Populate Pending Duration and Reason fields + if (cpsDetails.pending_duration === "Yes") { + $('#yespen').prop('checked', true); // Check the Yes radio button + $('#clickyesdiv').show(); // Show the reason input + $('#Clickyes').val(cpsDetails.reason_for_pending || '').prop('readonly' ,true); // Set reason and make readonly + } else if (cpsDetails.pending_duration === "No") { + $('#nopen').prop('checked', true); // Check the No radio button + $('#clickyesdiv').hide(); // Hide the reason input + } + +/* // Populate Pending Duration and Reason for Pending pendingDurationYes pendingDurationNo pendingDurationInputContainer pendingDurationInput if (cpsDetails.pending_duration === "yes") { $('#pendingDurationYes').prop('checked', true); $('#pendingDurationNo').prop('disabled', true); // Disable the other option @@ -553,7 +557,7 @@ margin-top: 10px; $('#pendingDurationNo').prop('checked', true); $('#pendingDurationInputContainer').hide(); // Show reason input field - } + } */ // Populate CPS Section based on response or data if (cpsDetails.cps === "yes") { @@ -681,9 +685,6 @@ margin-top: 10px; } - - - diff --git a/frontend/pensioner/department/completed/familypension.html b/frontend/pensioner/department/completed/familypension.html index d777073..5877df2 100644 --- a/frontend/pensioner/department/completed/familypension.html +++ b/frontend/pensioner/department/completed/familypension.html @@ -445,7 +445,7 @@ margin-top: 10px;
- +
@@ -469,14 +469,14 @@ margin-top: 10px; Pension Benefits
-
+
-
+
- +
@@ -639,6 +639,7 @@ margin-top: 10px; $('#servicedeath').val(employeeDetails.service_death); $('#relationship').val(employeeDetails.relationship_deceased); $('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount); + $('#recoveryemployeevalue').val(employeeDetails.recovery_emp); //$('#classes').val(employeeDetails.retirement_class); $('#datefile_modal').val(employeeDetails.file_moved_date); $('#remarks_modal').val(employeeDetails.remarks); diff --git a/frontend/pensioner/department/completed/gis.html b/frontend/pensioner/department/completed/gis.html index f49837c..3035849 100644 --- a/frontend/pensioner/department/completed/gis.html +++ b/frontend/pensioner/department/completed/gis.html @@ -249,7 +249,7 @@ margin-top: 10px;
- +
@@ -261,11 +261,11 @@ margin-top: 10px;
- +
- +
diff --git a/frontend/pensioner/department/completed/pendency.html b/frontend/pensioner/department/completed/pendency.html index 83d2c5c..d72a6ae 100644 --- a/frontend/pensioner/department/completed/pendency.html +++ b/frontend/pensioner/department/completed/pendency.html @@ -440,7 +440,7 @@ margin-top: 10px;
- +
@@ -474,14 +474,14 @@ margin-top: 10px;
--> -
+
-
+
- +
@@ -682,6 +682,8 @@ margin-top: 10px; $('#spfgsAmountDiv').hide(); } + //recover emp + $('#recoveryemployeevalue').val(employeeDetails.recovery_emp); // DCRG File $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); diff --git a/frontend/pensioner/department/completed/provisionalretirement.html b/frontend/pensioner/department/completed/provisionalretirement.html index fba0eb8..557bb97 100644 --- a/frontend/pensioner/department/completed/provisionalretirement.html +++ b/frontend/pensioner/department/completed/provisionalretirement.html @@ -275,49 +275,49 @@ margin-top: 10px;
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -424,7 +424,7 @@ margin-top: 10px; - + diff --git a/frontend/pensioner/department/received/retirement.html b/frontend/pensioner/department/received/retirement.html index c4bb4dd..3944531 100644 --- a/frontend/pensioner/department/received/retirement.html +++ b/frontend/pensioner/department/received/retirement.html @@ -587,7 +587,8 @@ margin-top: 10px; } else { $('#spfgsAmountDiv').hide(); } - + //recover emp + $('#recoveryemployeevalue').val(employeeDetails.recovery_emp); // DCRG File $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); diff --git a/frontend/pensioner/pensioner/completed/contributorypensionscheme.html b/frontend/pensioner/pensioner/completed/contributorypensionscheme.html index 45307f3..391b9e4 100644 --- a/frontend/pensioner/pensioner/completed/contributorypensionscheme.html +++ b/frontend/pensioner/pensioner/completed/contributorypensionscheme.html @@ -275,37 +275,37 @@ margin-top: 10px;
- +
- +
- +
- +
- +
- +
- +
- +
@@ -323,7 +323,7 @@ margin-top: 10px; -
- -
-
- - -
-
- - -
-
- -
+ +
+ +
+
+ + +
+
+ + +
+
+ +
- +
@@ -380,7 +379,7 @@ margin-top: 10px;
- +
@@ -398,7 +397,7 @@ margin-top: 10px;
- +
@@ -415,7 +414,7 @@ margin-top: 10px;
- +
@@ -544,7 +543,19 @@ margin-top: 10px; $('#uacInputDiv').hide(); // Hide date input field } - // Populate Pending Duration and Reason for Pending pendingDurationYes pendingDurationNo pendingDurationInputContainer pendingDurationInput + + + // Populate Pending Duration and Reason fields + if (cpsDetails.pending_duration === "Yes") { + $('#yespen').prop('checked', true); // Check the Yes radio button + $('#clickyesdiv').show(); // Show the reason input + $('#Clickyes').val(cpsDetails.reason_for_pending || '').prop('readonly' ,true); // Set reason and make readonly + } else if (cpsDetails.pending_duration === "No") { + $('#nopen').prop('checked', true); // Check the No radio button + $('#clickyesdiv').hide(); // Hide the reason input + } + +/* // Populate Pending Duration and Reason for Pending pendingDurationYes pendingDurationNo pendingDurationInputContainer pendingDurationInput if (cpsDetails.pending_duration === "yes") { $('#pendingDurationYes').prop('checked', true); $('#pendingDurationNo').prop('disabled', true); // Disable the other option @@ -555,7 +566,7 @@ margin-top: 10px; $('#pendingDurationNo').prop('checked', true); $('#pendingDurationInputContainer').hide(); // Show reason input field - } + } */ // Populate CPS Section based on response or data if (cpsDetails.cps === "yes") { diff --git a/frontend/pensioner/pensioner/completed/familypension.html b/frontend/pensioner/pensioner/completed/familypension.html index d1a709a..1e29915 100644 --- a/frontend/pensioner/pensioner/completed/familypension.html +++ b/frontend/pensioner/pensioner/completed/familypension.html @@ -284,32 +284,32 @@ margin-top: 10px;
- +
- +
- +
- +
@@ -329,30 +329,30 @@ margin-top: 10px;
- +
- +
- +
- +
- +
@@ -370,7 +370,7 @@ margin-top: 10px;
- +
@@ -387,7 +387,7 @@ margin-top: 10px;
@@ -395,7 +395,7 @@ margin-top: 10px;
- +
@@ -410,14 +410,14 @@ margin-top: 10px;
- +
@@ -432,7 +432,7 @@ margin-top: 10px;
@@ -441,14 +441,14 @@ margin-top: 10px;
- +
- +
@@ -465,19 +465,19 @@ margin-top: 10px; Pension Benefits
-
- +
+
-
- - +
+ +
- +
@@ -492,13 +492,13 @@ margin-top: 10px;
- +
@@ -513,13 +513,13 @@ margin-top: 10px;
- +
@@ -534,7 +534,7 @@ margin-top: 10px;
@@ -689,6 +689,8 @@ margin-top: 10px; } else { $('#spfgsAmountDiv').hide(); } + //recover emp + $('#recoveryemployeevalue').val(employeeDetails.recovery_emp); // DCRG File $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); diff --git a/frontend/pensioner/pensioner/completed/gis.html b/frontend/pensioner/pensioner/completed/gis.html index c6b9b79..eafb490 100644 --- a/frontend/pensioner/pensioner/completed/gis.html +++ b/frontend/pensioner/pensioner/completed/gis.html @@ -248,7 +248,7 @@ margin-top: 10px;
- +
diff --git a/frontend/pensioner/pensioner/completed/pendency.html b/frontend/pensioner/pensioner/completed/pendency.html index 6c89eef..80a83b3 100644 --- a/frontend/pensioner/pensioner/completed/pendency.html +++ b/frontend/pensioner/pensioner/completed/pendency.html @@ -284,48 +284,48 @@ margin-top: 10px;
- +
- +
- +
- +
- +
- +
- +
@@ -343,13 +343,13 @@ margin-top: 10px;
- +
- +
@@ -367,7 +367,7 @@ margin-top: 10px;
- +
@@ -384,7 +384,7 @@ margin-top: 10px;
@@ -392,7 +392,7 @@ margin-top: 10px;
- +
@@ -407,14 +407,14 @@ margin-top: 10px;
- +
@@ -429,7 +429,7 @@ margin-top: 10px;
@@ -438,14 +438,14 @@ margin-top: 10px;
- +
- +
@@ -462,19 +462,19 @@ margin-top: 10px; Pension Benefits
-
- +
+
-
- - +
+ +
- +
@@ -489,13 +489,13 @@ margin-top: 10px;
- +
@@ -510,13 +510,13 @@ margin-top: 10px;
- +
@@ -531,7 +531,7 @@ margin-top: 10px;
@@ -669,6 +669,8 @@ margin-top: 10px; $('#spfgsAmountDiv').hide(); } + //recover emp + $('#recoveryemployeevalue').val(employeeDetails.recovery_emp); // DCRG File $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); diff --git a/frontend/pensioner/pensioner/completed/provisionalretirement.html b/frontend/pensioner/pensioner/completed/provisionalretirement.html index f423be7..2a38157 100644 --- a/frontend/pensioner/pensioner/completed/provisionalretirement.html +++ b/frontend/pensioner/pensioner/completed/provisionalretirement.html @@ -274,42 +274,42 @@ margin-top: 10px;
- +
- +
- +
- +
- +
- +
- +
@@ -318,7 +318,7 @@ margin-top: 10px;
- +