diff --git a/backend/pensioner/service/DepartmentReceivedService.java b/backend/pensioner/service/DepartmentReceivedService.java index facfca4..26f1867 100644 --- a/backend/pensioner/service/DepartmentReceivedService.java +++ b/backend/pensioner/service/DepartmentReceivedService.java @@ -96,7 +96,7 @@ public class DepartmentReceivedService { file_entry_type="FILE_COMPLETED"; } - else if("no".equalsIgnoreCase(benefit_pension) || "no".equalsIgnoreCase(benefit_dcrg)){ + else if("no".equalsIgnoreCase(benefit_dcrg) || "no".equalsIgnoreCase(benefit_pension)){ filestatus = getFileStatus.getFileStatus10Id(); file_entry_type="PENSION_PARTIAL"; diff --git a/backend/pensioner/service/NewEntryService.java b/backend/pensioner/service/NewEntryService.java index 07f4103..62a3c38 100644 --- a/backend/pensioner/service/NewEntryService.java +++ b/backend/pensioner/service/NewEntryService.java @@ -667,7 +667,7 @@ public class NewEntryService { int rowsInserted = jdbcTemplate.update(query, empNo, empName, deptName, designation, typeOfRetirement,retirementClass ,retirementDate , ReasonofPension,dateToAudit,pendingDuration,reasonofPending,dp,remarks,filecategory,filestatus,fileentrytype,deptId,fc_name,otherReason,temp_id); String query1 = "INSERT INTO pensioner_details_history (emp_no, emp_name, dept_name, designation,type_of_retirement,retirement_class, retirement_date,reason_for_provisional_pension ,file_moved_date, remarks,pending_duration,reason_for_pending,dp ,file_category,file_status,file_entry_type,file_moved_by,dept_id,file_category_name,others_provisional_pension,temp_id) VALUES (?,?,?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?)"; - int rowsInsertedHistory = jdbcTemplate.update(query1, empNo, empName, deptName, designation,typeOfRetirement,retirementClass,retirementDate ,ReasonofPension,dateToAudit,pendingDuration,reasonofPending,dp,remarks,filecategory,filestatus,fileentrytype,filemovedby,deptId,fc_name,otherReason,temp_id); + int rowsInsertedHistory = jdbcTemplate.update(query1, empNo, empName, deptName, designation,typeOfRetirement,retirementClass,retirementDate ,ReasonofPension,dateToAudit,remarks,pendingDuration,reasonofPending,dp,filecategory,filestatus,fileentrytype,filemovedby,deptId,fc_name,otherReason,temp_id); String query2 = "INSERT INTO file_movement_history (emp_no,file_moved_date,file_status,file_moved_by,remarks,temp_id) VALUES (?, ?, ?, ?, ?,?)"; int rowsInsertedFileMovement = jdbcTemplate.update(query2, empNo,dateToAudit,filestatus,filemovedby,remarks,temp_id); @@ -695,6 +695,7 @@ public class NewEntryService { String fileMovedBy = requestData.get("fileMovedBy") != null ? requestData.get("fileMovedBy").toString() : null; String remarks = requestData.get("remarks") != null ? requestData.get("remarks").toString() : null; String retirementType = requestData.get("retirementType") != null ? requestData.get("retirementType").toString() : null; + String retirementdate = requestData.get("retirementdate") !=null ? requestData.get("retirementdate").toString() : null; String uac = (String) requestData.get("uac"); String uacDate = "yes".equals(uac) && requestData.get("uacDate") != null ? requestData.get("uacDate").toString() : null; @@ -734,23 +735,23 @@ public class NewEntryService { // Insert into cps_pensioner_details String queryDetails = "INSERT INTO cps_pensioner_details " + - "(emp_no, emp_name, dept_name, designation, file_category, retirement_class, type_of_retirement, uac, uac_date, " + + "(emp_no, emp_name, dept_name, designation, file_category, retirement_class, retirement_date,type_of_retirement, uac, uac_date, " + "pending_duration,reason_for_pending ,cps, cps_amount, el_or_lpa, el_or_lpa_amount, spfgs, spfgs_amount, remarks, " + "file_status, file_entry_type, dept_id, file_category_name,temp_id) " + - "VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)"; + "VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?)"; int rowsInsertedDetails = jdbcTemplate.update(queryDetails, - empNo, empName, deptName, designation, filecategory, classes, retirementType, uac, uacDate, + empNo, empName, deptName, designation, filecategory, classes, retirementdate,retirementType, uac, uacDate, pendingDuration,reasonPending ,cps, cpsAmount, elOrLpa, elOrLpaAmount, spfgs, spfgsAmount, remarks, fileStatus, fileEntryType, deptId, fileCategoryName,temp_id); // Insert into cps_pensioner_details_history String queryHistory = "INSERT INTO cps_pensioner_details_history " + - "(emp_no, emp_name, dept_name, designation, file_category, retirement_class, type_of_retirement, uac, uac_date, " + + "(emp_no, emp_name, dept_name, designation, file_category, retirement_class, retirement_date,type_of_retirement, uac, uac_date, " + "pending_duration,reason_for_pending ,cps, cps_amount, el_or_lpa, el_or_lpa_amount, spfgs, spfgs_amount, remarks, " + "file_status, file_entry_type, file_moved_by, dept_id, file_category_name,temp_id) " + - "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?)"; + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?)"; int rowsInsertedHistory = jdbcTemplate.update(queryHistory, - empNo, empName, deptName, designation, filecategory, classes, retirementType, uac, uacDate, + empNo, empName, deptName, designation, filecategory, classes, retirementdate,retirementType, uac, uacDate, pendingDuration, reasonPending,cps, cpsAmount, elOrLpa, elOrLpaAmount, spfgs, spfgsAmount, remarks, fileStatus, fileEntryType, fileMovedBy, deptId, fileCategoryName,temp_id); diff --git a/backend/pensioner/service/ReportApiService.java b/backend/pensioner/service/ReportApiService.java index b159596..741a9db 100644 --- a/backend/pensioner/service/ReportApiService.java +++ b/backend/pensioner/service/ReportApiService.java @@ -138,7 +138,7 @@ public class ReportApiService { : ""; // Skip condition if fileStatus is empty or null if (fileCatId == 6) { - sql = "SELECT pd.emp_no, pd.emp_name, pd.designation, pd.type_of_retirement, pd.reason_for_pending, " + + sql = "SELECT pd.emp_no, pd.emp_name, pd.designation, pd.type_of_retirement, pd.reason_for_pending, pd.retirement_date, " + "fm.file_status AS fst, pd.file_category_name, pd.remarks, DATE(pd.created_date) AS created_date " + "FROM cps_pensioner_details pd " + "INNER JOIN file_status_master fm ON pd.file_status = fm.id " + @@ -460,7 +460,7 @@ public class ReportApiService { : ""; // Skip condition if fileStatus is empty or null if (fileCatId == 6) { - sql = "SELECT pd.emp_no, pd.emp_name, pd.designation, pd.type_of_retirement, pd.reason_for_pending, " + + sql = "SELECT pd.emp_no, pd.emp_name, pd.designation, pd.type_of_retirement, pd.reason_for_pending,pd.retirement_date, " + "fm.file_status AS fst, pd.file_category_name, pd.remarks, DATE(pd.created_date) AS created_date " + "FROM cps_pensioner_details pd " + "INNER JOIN file_status_master fm ON pd.file_status = fm.id " + diff --git a/frontend/pensioner/department/completed/contributorypensionscheme.html b/frontend/pensioner/department/completed/contributorypensionscheme.html index 06fe555..d193474 100644 --- a/frontend/pensioner/department/completed/contributorypensionscheme.html +++ b/frontend/pensioner/department/completed/contributorypensionscheme.html @@ -269,7 +269,7 @@ margin-top: 10px;
+
+ + +
@@ -524,6 +528,7 @@ margin-top: 10px; $('#completedClass').val(cpsDetails.retirement_class); $('#completedType').val(cpsDetails.type_of_retirement); $('#completedRemarks').val(cpsDetails.remarks); + $('#completedretirementdate').val(cpsDetails.retirement_date) // Populate UAC Section if (cpsDetails.uac === "yes") { @@ -531,7 +536,7 @@ margin-top: 10px; $('#uacNo').prop('disabled', true); // Disable No radio button $('#uacInputDiv').show(); // Show date input field $('#uacDate').val(cpsDetails.uac_date || '').prop('readonly', true); // Set UAC date and make readonly - } else if (cpsDetails.uac_sent === "no") { + } else if (cpsDetails.uac === "no") { $('#uacNo').prop('checked', true); // Check No radio button $('#uacYes').prop('disabled', true); // Disable Yes radio button $('#uacInputDiv').hide(); // Hide date input field diff --git a/frontend/pensioner/department/completed/familypension.html b/frontend/pensioner/department/completed/familypension.html index 2a9a6f3..d777073 100644 --- a/frontend/pensioner/department/completed/familypension.html +++ b/frontend/pensioner/department/completed/familypension.html @@ -310,7 +310,7 @@ margin-top: 10px; -
+
@@ -460,6 +460,34 @@ $(document).ready(function (){ return; // Exit if the department does not match } + + // Function to handle radio button state based on retirement date + function handlePendingDurationState() { + const currentDate = new Date().toISOString().split('T')[0]; // Get today's date in YYYY-MM-DD format + const retirementDate = employeeDetails.RETIREMENT_DATE; // Assuming this comes in YYYY-MM-DD format + + const yesRadio = document.getElementById("yespen"); + const noRadio = document.getElementById("nopen"); + + const inputFieldDiv = document.getElementById('clickyesdiv'); + if (retirementDate <= currentDate) { + // If retirement date is less than or equal to current date, disable 'Yes' option + + yesRadio.checked = true; + inputFieldDiv.style.display = 'block'; + noRadio.disabled = true; // Default to 'No' + } else { + // If retirement date is greater than current date, disable 'No' option + noRadio.checked = true; + yesRadio.disabled = true; // Default to 'Yes' + } + } + + // Call the function after fetching `employeeDetails` + handlePendingDurationState(); + + + // Populate employee details in the form $('#employeeno').val(employeeDetails.EMPLOYEE_CODE); $('#employeename').val(employeeDetails.EMPLOYEE_NAME); @@ -525,6 +553,9 @@ $(document).ready(function (){ //$('#submitButton').one('click', saveEntryDetails); $('#submitButton').off('click').on('click', saveEntryDetails); + + + document.addEventListener("DOMContentLoaded", function() { @@ -620,6 +651,10 @@ function convertDateFormat(dateString) { + + + + function toggleInputField(radio) { const inputFieldDiv = document.getElementById('clickyesdiv'); if (radio.value === "Yes") { diff --git a/frontend/pensioner/department/partial/familypension.html b/frontend/pensioner/department/partial/familypension.html index cd40d2b..f84733f 100644 --- a/frontend/pensioner/department/partial/familypension.html +++ b/frontend/pensioner/department/partial/familypension.html @@ -516,7 +516,7 @@ margin-top: 10px;
- +
diff --git a/frontend/pensioner/department/partial/pendency.html b/frontend/pensioner/department/partial/pendency.html index 70e184c..68e297a 100644 --- a/frontend/pensioner/department/partial/pendency.html +++ b/frontend/pensioner/department/partial/pendency.html @@ -512,7 +512,7 @@ margin-top: 10px;
- +
diff --git a/frontend/pensioner/department/partial/retirement.html b/frontend/pensioner/department/partial/retirement.html index 2b9d10a..c63c730 100644 --- a/frontend/pensioner/department/partial/retirement.html +++ b/frontend/pensioner/department/partial/retirement.html @@ -492,7 +492,7 @@ margin-top: 10px;
- +
diff --git a/frontend/pensioner/department/received/provisionalretirement.html b/frontend/pensioner/department/received/provisionalretirement.html index e4651f9..225a001 100644 --- a/frontend/pensioner/department/received/provisionalretirement.html +++ b/frontend/pensioner/department/received/provisionalretirement.html @@ -325,7 +325,7 @@ margin-top: 10px; @@ -352,7 +352,7 @@ margin-top: 10px; @@ -552,7 +552,7 @@ margin-top: 10px; $('#provisionalreason').val(employeeDetails.reason_for_provisional_pension); - // Populate Pending Duration and Reason fields + /* // Populate Pending Duration and Reason fields if (employeeDetails.pending_duration === "Yes") { $('#yespen').prop('checked', true); // Check the Yes radio button $('#clickyesdiv').show(); // Show the reason input @@ -560,7 +560,37 @@ margin-top: 10px; } else if (employeeDetails.pending_duration === "No") { $('#nopen').prop('checked', true); // Check the No radio button $('#clickyesdiv').hide(); // Hide the reason input + } */ + + + // Populate Pending Duration and Reason fields + if (employeeDetails.pending_duration === "Yes") { + $('#yespen').prop('checked', true).prop('disabled', false); // Check and enable Yes radio button + $('#nopen').prop('disabled', true); // Disable No radio button + $('#clickyesdiv').show(); // Show the reason input + $('#Clickyes').val(employeeDetails.reason_for_pending || '').prop('readonly', true); // Set reason and make readonly + } else if (employeeDetails.pending_duration === "No") { + $('#nopen').prop('checked', true).prop('disabled', false); // Check and enable No radio button + $('#yespen').prop('disabled', true); // Disable Yes radio button + $('#clickyesdiv').hide(); // Hide the reason input } + + // Add event listeners to ensure mutual exclusivity + $('#yespen').on('change', function () { + if ($(this).prop('checked')) { + $('#nopen').prop('disabled', true); + $('#clickyesdiv').show(); + $('#Clickyes').prop('readonly', false); + } + }); + + $('#nopen').on('change', function () { + if ($(this).prop('checked')) { + $('#yespen').prop('disabled', true); + $('#clickyesdiv').hide(); + } + }); + //populate reason for provisional pension if (employeeDetails.reason_for_provisional_pension === "Others") { $('#otherReasonDiv').show(); // Show the input field for 'Others' diff --git a/frontend/pensioner/department/reports.html b/frontend/pensioner/department/reports.html index 5bf15df..3f6bfec 100644 --- a/frontend/pensioner/department/reports.html +++ b/frontend/pensioner/department/reports.html @@ -292,6 +292,7 @@ td, th { Name Designation Type of Retirement + Date of Retirement Pending Duration File Status File category @@ -588,6 +589,21 @@ td, th { { title: "Name", data: "emp_name", className: "text-center" }, { title: "Designation", data: "designation", className: "text-center" }, { title: "Type of Retirement", data: "type_of_retirement", className: "text-center" }, + { + title: "Date of Retirement", + data: "retirement_date", + className: "text-center", + render: function(data, type, row) { + if (data) { + let date = new Date(data); + let day = String(date.getDate()).padStart(2, '0'); + let month = String(date.getMonth() + 1).padStart(2, '0'); + let year = date.getFullYear(); + return `${day}-${month}-${year}`; + } + return ""; + } + }, { title: "Pending Duration", data: "reason_for_pending", className: "text-center" }, { title: "File Status", data: "fst", className: "text-center" }, { title: "File Category", data: "file_category_name", className: "text-center" }, @@ -1165,6 +1181,7 @@ td, th { emp_name: row.emp_name, designation: row.designation, type_of_retirement: row.type_of_retirement, + retirement_date: row.retirement_date, reason_for_pending: row.reason_for_pending, fst: row.fst, file_category_name:row.file_category_name, @@ -1172,6 +1189,7 @@ td, th { created_date: row.created_date, })); fileDetailsTable.clear().rows.add(formattedData).draw(); + console.log("retirement data",formattedData); } diff --git a/frontend/pensioner/pensioner/completed/contributorypensionscheme.html b/frontend/pensioner/pensioner/completed/contributorypensionscheme.html index 06dec63..45307f3 100644 --- a/frontend/pensioner/pensioner/completed/contributorypensionscheme.html +++ b/frontend/pensioner/pensioner/completed/contributorypensionscheme.html @@ -266,7 +266,7 @@ margin-top: 10px;
+
+ + +
- +
@@ -526,6 +530,7 @@ margin-top: 10px; $('#completedClass').val(cpsDetails.retirement_class); $('#completedType').val(cpsDetails.type_of_retirement); $('#completedRemarks').val(cpsDetails.remarks); + $('#completedretirementdate').val(cpsDetails.retirement_date) // Populate UAC Section if (cpsDetails.uac === "yes") { @@ -533,7 +538,7 @@ margin-top: 10px; $('#uacNo').prop('disabled', true); // Disable No radio button $('#uacInputDiv').show(); // Show date input field $('#uacDate').val(cpsDetails.uac_date || '').prop('readonly', true); // Set UAC date and make readonly - } else if (cpsDetails.uac_sent === "no") { + } else if (cpsDetails.uac === "no") { $('#uacNo').prop('checked', true); // Check No radio button $('#uacYes').prop('disabled', true); // Disable Yes radio button $('#uacInputDiv').hide(); // Hide date input field diff --git a/frontend/pensioner/pensioner/completed/familypension.html b/frontend/pensioner/pensioner/completed/familypension.html index 692c94d..d1a709a 100644 --- a/frontend/pensioner/pensioner/completed/familypension.html +++ b/frontend/pensioner/pensioner/completed/familypension.html @@ -328,18 +328,18 @@ margin-top: 10px; -
+
-
+
-
+
diff --git a/frontend/pensioner/pensioner/completed/pendency.html b/frontend/pensioner/pensioner/completed/pendency.html index de57d9f..6c89eef 100644 --- a/frontend/pensioner/pensioner/completed/pendency.html +++ b/frontend/pensioner/pensioner/completed/pendency.html @@ -306,12 +306,12 @@ margin-top: 10px;
-
+
-
+
diff --git a/frontend/pensioner/pensioner/completed/provisionalretirement.html b/frontend/pensioner/pensioner/completed/provisionalretirement.html index 2157ee3..f423be7 100644 --- a/frontend/pensioner/pensioner/completed/provisionalretirement.html +++ b/frontend/pensioner/pensioner/completed/provisionalretirement.html @@ -569,6 +569,9 @@ margin-top: 10px; $('#fifty').prop('checked', true).prop('disabled', true); $('#seventyfive').prop('disabled', true); $('#hundred').prop('disabled', true); + + $('#additionalInputDiv').show(); + $('#additionalInput').val(prAmount).prop('readonly', true); } else if (prPercentage === "75" || prPercentage === "75.00") { // Select 75% radio button and disable all $('#seventyfive').prop('checked', true).prop('disabled', true); @@ -583,6 +586,9 @@ margin-top: 10px; $('#hundred').prop('checked', true).prop('disabled', true); $('#fifty').prop('disabled', true); $('#seventyfive').prop('disabled', true); + + $('#additionalInputDiv').show(); + $('#additionalInput').val(prAmount).prop('readonly', true); } else { // If pr_percentage is NOT 50, 75, or 100, show the additional input field $('#additionalInputDiv').show(); diff --git a/frontend/pensioner/pensioner/partial/familypension.html b/frontend/pensioner/pensioner/partial/familypension.html index 34450e8..de3e20b 100644 --- a/frontend/pensioner/pensioner/partial/familypension.html +++ b/frontend/pensioner/pensioner/partial/familypension.html @@ -512,7 +512,7 @@ margin-top: 10px;
- +
diff --git a/frontend/pensioner/pensioner/partial/pendency.html b/frontend/pensioner/pensioner/partial/pendency.html index 9dec368..0d3dc7f 100644 --- a/frontend/pensioner/pensioner/partial/pendency.html +++ b/frontend/pensioner/pensioner/partial/pendency.html @@ -492,7 +492,7 @@ margin-top: 10px;
- +
diff --git a/frontend/pensioner/pensioner/partial/retirement.html b/frontend/pensioner/pensioner/partial/retirement.html index 4bdc60d..e82b927 100644 --- a/frontend/pensioner/pensioner/partial/retirement.html +++ b/frontend/pensioner/pensioner/partial/retirement.html @@ -492,7 +492,7 @@ margin-top: 10px;
- +
diff --git a/frontend/pensioner/pensioner/received/pendency.html b/frontend/pensioner/pensioner/received/pendency.html index f33e8b7..f056514 100644 --- a/frontend/pensioner/pensioner/received/pendency.html +++ b/frontend/pensioner/pensioner/received/pendency.html @@ -192,7 +192,7 @@ margin-top: 10px;