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

first commit

master
yoganandhank 2 years ago
parent
35439c10c6
commit
438950d14e
24 changed files with 168 additions and 37 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. 2
      backend/pensioner/service/DepartmentReceivedService.java
  2. 15
      backend/pensioner/service/NewEntryService.java
  3. 4
      backend/pensioner/service/ReportApiService.java
  4. 9
      frontend/pensioner/department/completed/contributorypensionscheme.html
  5. 8
      frontend/pensioner/department/completed/familypension.html
  6. 6
      frontend/pensioner/department/completed/provisionalretirement.html
  7. 8
      frontend/pensioner/department/newentry/contributorypensionscheme.html
  8. 39
      frontend/pensioner/department/newentry/provisionalretirement.html
  9. 2
      frontend/pensioner/department/partial/familypension.html
  10. 2
      frontend/pensioner/department/partial/pendency.html
  11. 2
      frontend/pensioner/department/partial/retirement.html
  12. 36
      frontend/pensioner/department/received/provisionalretirement.html
  13. 18
      frontend/pensioner/department/reports.html
  14. 11
      frontend/pensioner/pensioner/completed/contributorypensionscheme.html
  15. 6
      frontend/pensioner/pensioner/completed/familypension.html
  16. 4
      frontend/pensioner/pensioner/completed/pendency.html
  17. 6
      frontend/pensioner/pensioner/completed/provisionalretirement.html
  18. 2
      frontend/pensioner/pensioner/partial/familypension.html
  19. 2
      frontend/pensioner/pensioner/partial/pendency.html
  20. 2
      frontend/pensioner/pensioner/partial/retirement.html
  21. 2
      frontend/pensioner/pensioner/received/pendency.html
  22. 17
      frontend/pensioner/pensioner/reports.html
  23. 1
      gcc_pensioner_emptydump/gcc_pensioner_cps_pensioner_details.sql
  24. 1
      gcc_pensioner_emptydump/gcc_pensioner_cps_pensioner_details_history.sql

2
backend/pensioner/service/DepartmentReceivedService.java
View File

@ -96,7 +96,7 @@ public class DepartmentReceivedService {
file_entry_type="FILE_COMPLETED"; 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(); filestatus = getFileStatus.getFileStatus10Id();
file_entry_type="PENSION_PARTIAL"; file_entry_type="PENSION_PARTIAL";

15
backend/pensioner/service/NewEntryService.java
View File

@ -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); 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 (?,?,?, ?, ?, ?, ?, ?, ?,?,?,?,?,?,?,?,?,?,?,?,?)"; 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 (?, ?, ?, ?, ?,?)"; 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); 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 fileMovedBy = requestData.get("fileMovedBy") != null ? requestData.get("fileMovedBy").toString() : null;
String remarks = requestData.get("remarks") != null ? requestData.get("remarks").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 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 uac = (String) requestData.get("uac");
String uacDate = "yes".equals(uac) && requestData.get("uacDate") != null ? requestData.get("uacDate").toString() : null; 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 // Insert into cps_pensioner_details
String queryDetails = "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, " + "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) " + "file_status, file_entry_type, dept_id, file_category_name,temp_id) " +
"VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?)";
"VALUES (?,?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?)";
int rowsInsertedDetails = jdbcTemplate.update(queryDetails, 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, pendingDuration,reasonPending ,cps, cpsAmount, elOrLpa, elOrLpaAmount, spfgs, spfgsAmount, remarks,
fileStatus, fileEntryType, deptId, fileCategoryName,temp_id); fileStatus, fileEntryType, deptId, fileCategoryName,temp_id);
// Insert into cps_pensioner_details_history // Insert into cps_pensioner_details_history
String queryHistory = "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, " + "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) " + "file_status, file_entry_type, file_moved_by, dept_id, file_category_name,temp_id) " +
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?)";
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?,?,?)";
int rowsInsertedHistory = jdbcTemplate.update(queryHistory, 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, pendingDuration, reasonPending,cps, cpsAmount, elOrLpa, elOrLpaAmount, spfgs, spfgsAmount, remarks,
fileStatus, fileEntryType, fileMovedBy, deptId, fileCategoryName,temp_id); fileStatus, fileEntryType, fileMovedBy, deptId, fileCategoryName,temp_id);

4
backend/pensioner/service/ReportApiService.java
View File

@ -138,7 +138,7 @@ public class ReportApiService {
: ""; // Skip condition if fileStatus is empty or null : ""; // Skip condition if fileStatus is empty or null
if (fileCatId == 6) { 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 " + "fm.file_status AS fst, pd.file_category_name, pd.remarks, DATE(pd.created_date) AS created_date " +
"FROM cps_pensioner_details pd " + "FROM cps_pensioner_details pd " +
"INNER JOIN file_status_master fm ON pd.file_status = fm.id " + "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 : ""; // Skip condition if fileStatus is empty or null
if (fileCatId == 6) { 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 " + "fm.file_status AS fst, pd.file_category_name, pd.remarks, DATE(pd.created_date) AS created_date " +
"FROM cps_pensioner_details pd " + "FROM cps_pensioner_details pd " +
"INNER JOIN file_status_master fm ON pd.file_status = fm.id " + "INNER JOIN file_status_master fm ON pd.file_status = fm.id " +

9
frontend/pensioner/department/completed/contributorypensionscheme.html
View File

@ -269,7 +269,7 @@ margin-top: 10px;
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="completedDetailsModalLabel"> <h5 class="modal-title" id="completedDetailsModalLabel">
Completed Details (<span id="completedModalEmployeeCode"></span>)
Contributory pension Scheme Completed Details - (<span id="completedModalEmployeeCode"></span>)
</h5> </h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
@ -298,6 +298,10 @@ margin-top: 10px;
<label for="completedClass" class="form-label fw-bold">Class <span class="text-danger">*</span></label> <label for="completedClass" class="form-label fw-bold">Class <span class="text-danger">*</span></label>
<input type="text" id="completedClass" class="form-control" readonly> <input type="text" id="completedClass" class="form-control" readonly>
</div> </div>
<div class="col-sm-6">
<label for="completedretirementdate" class="form-label fw-bold">Retirement Date <span class="text-danger">*</span></label>
<input type="date" id="completedretirementdate" class="form-control" readonly>
</div>
<div class="col-md-6"> <div class="col-md-6">
<label for="completedType" class="form-label fw-bold">Type of Retirement <span class="text-danger">*</span></label> <label for="completedType" class="form-label fw-bold">Type of Retirement <span class="text-danger">*</span></label>
<input type="text" id="completedType" class="form-control" readonly> <input type="text" id="completedType" class="form-control" readonly>
@ -524,6 +528,7 @@ margin-top: 10px;
$('#completedClass').val(cpsDetails.retirement_class); $('#completedClass').val(cpsDetails.retirement_class);
$('#completedType').val(cpsDetails.type_of_retirement); $('#completedType').val(cpsDetails.type_of_retirement);
$('#completedRemarks').val(cpsDetails.remarks); $('#completedRemarks').val(cpsDetails.remarks);
$('#completedretirementdate').val(cpsDetails.retirement_date)
// Populate UAC Section // Populate UAC Section
if (cpsDetails.uac === "yes") { if (cpsDetails.uac === "yes") {
@ -531,7 +536,7 @@ margin-top: 10px;
$('#uacNo').prop('disabled', true); // Disable No radio button $('#uacNo').prop('disabled', true); // Disable No radio button
$('#uacInputDiv').show(); // Show date input field $('#uacInputDiv').show(); // Show date input field
$('#uacDate').val(cpsDetails.uac_date || '').prop('readonly', true); // Set UAC date and make readonly $('#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 $('#uacNo').prop('checked', true); // Check No radio button
$('#uacYes').prop('disabled', true); // Disable Yes radio button $('#uacYes').prop('disabled', true); // Disable Yes radio button
$('#uacInputDiv').hide(); // Hide date input field $('#uacInputDiv').hide(); // Hide date input field

8
frontend/pensioner/department/completed/familypension.html
View File

@ -310,7 +310,7 @@ margin-top: 10px;
<!-- pending duration--> <!-- pending duration-->
<div class="col-md-6">
<div class="col-md-4">
<label for="pendingDuration" class="form-label fw-bold"> <label for="pendingDuration" class="form-label fw-bold">
Pending Duration Pending Duration
@ -332,18 +332,18 @@ margin-top: 10px;
<!-- While in Service Death --> <!-- While in Service Death -->
<div class="col-md-6">
<div class="col-md-4">
<label for="servicedeath" class="form-label fw-bold">While in Service Death </label> <label for="servicedeath" class="form-label fw-bold">While in Service Death </label>
<input type="date" id="servicedeath" class="form-control" readonly> <input type="date" id="servicedeath" class="form-control" readonly>
</div> </div>
<!-- Relationship of Deceased --> <!-- Relationship of Deceased -->
<div class="col-md-6">
<div class="col-md-4">
<label for="relationship" class="form-label fw-bold">Relationship of Deceased </label> <label for="relationship" class="form-label fw-bold">Relationship of Deceased </label>
<input type="text" id="relationship" class="form-control" readonly> <input type="text" id="relationship" class="form-control" readonly>
</div> </div>
<div class="col-md-6">
<div class="col-md-4">
<label for="sanctionedgis" class="form-label fw-bold">Sanctioned GIS</label> <label for="sanctionedgis" class="form-label fw-bold">Sanctioned GIS</label>
<input type="text" id="sanctionedgis" class="form-control" readonly> <input type="text" id="sanctionedgis" class="form-control" readonly>
</div> </div>

6
frontend/pensioner/department/completed/provisionalretirement.html
View File

@ -564,6 +564,9 @@ margin-top: 10px;
$('#fifty').prop('checked', true).prop('disabled', true); $('#fifty').prop('checked', true).prop('disabled', true);
$('#seventyfive').prop('disabled', true); $('#seventyfive').prop('disabled', true);
$('#hundred').prop('disabled', true); $('#hundred').prop('disabled', true);
$('#additionalInputDiv').show();
$('#additionalInput').val(prAmount).prop('readonly', true);
} else if (prPercentage === "75" || prPercentage === "75.00") { } else if (prPercentage === "75" || prPercentage === "75.00") {
// Select 75% radio button and disable all // Select 75% radio button and disable all
$('#seventyfive').prop('checked', true).prop('disabled', true); $('#seventyfive').prop('checked', true).prop('disabled', true);
@ -578,6 +581,9 @@ margin-top: 10px;
$('#hundred').prop('checked', true).prop('disabled', true); $('#hundred').prop('checked', true).prop('disabled', true);
$('#fifty').prop('disabled', true); $('#fifty').prop('disabled', true);
$('#seventyfive').prop('disabled', true); $('#seventyfive').prop('disabled', true);
$('#additionalInputDiv').show();
$('#additionalInput').val(prAmount).prop('readonly', true);
} else { } else {
// If pr_percentage is NOT 50, 75, or 100, show the additional input field // If pr_percentage is NOT 50, 75, or 100, show the additional input field
$('#additionalInputDiv').show(); $('#additionalInputDiv').show();

8
frontend/pensioner/department/newentry/contributorypensionscheme.html
View File

@ -229,6 +229,11 @@ padding-top: 2%;
</div> </div>
</div> </div>
<div class="col-sm-6">
<label for="retirementdate" class="form-label fw-bold">Retirement Date <span class="text-danger">*</span></label>
<input type="date" id="retirementdate" class="form-control" readonly>
</div>
<div class="col-md-6"> <div class="col-md-6">
<label for="retirement" class="form-label fw-bold">Type Of Retirement<span class="text-danger">*</span></label> <label for="retirement" class="form-label fw-bold">Type Of Retirement<span class="text-danger">*</span></label>
<div class="dropdown" > <div class="dropdown" >
@ -508,7 +513,7 @@ padding-top: 2%;
$('#department').val(employeeDetails.DEPARTMENT); $('#department').val(employeeDetails.DEPARTMENT);
$('#designation').val(employeeDetails.DESIGNATION); $('#designation').val(employeeDetails.DESIGNATION);
$('#classes').val(employeeDetails.GROUP_TYPE); $('#classes').val(employeeDetails.GROUP_TYPE);
$('#retrirementdate').val(employeeDetails.RETIREMENT_DATE);
$('#retirementdate').val(employeeDetails.RETIREMENT_DATE);
$('#EmployeeCode').text(empCode); $('#EmployeeCode').text(empCode);
//show the modal //show the modal
@ -801,6 +806,7 @@ padding-top: 2%;
deptName: $('#department').val(), deptName: $('#department').val(),
designation: $('#designation').val(), designation: $('#designation').val(),
classes: $('#classes').val(), classes: $('#classes').val(),
retirementdate: $('#retirementdate').val()?.trim(),
fileMovedBy: $('#userId').text().trim(), fileMovedBy: $('#userId').text().trim(),
remarks: $('#remarks').val(), remarks: $('#remarks').val(),
retirementType: $('#retirement').val(), retirementType: $('#retirement').val(),

39
frontend/pensioner/department/newentry/provisionalretirement.html
View File

@ -256,7 +256,7 @@ padding-top: 2%;
<option value="" selected>-- Select Option --</option> <option value="" selected>-- Select Option --</option>
</select> </select>
<div id="otherReasonDiv" style="display: none; margin-top: 10px;"> <div id="otherReasonDiv" style="display: none; margin-top: 10px;">
<label for="otherReason" class="form-label">Please specify:</label>
<label for="otherReason" class="form-label">Please specify for selecting others reason:</label>
<input type="text" id="otherReason" class="form-control" placeholder="Enter reason"> <input type="text" id="otherReason" class="form-control" placeholder="Enter reason">
</div> </div>
</div> </div>
@ -285,7 +285,7 @@ padding-top: 2%;
</div> </div>
</div> </div>
<div id="clickyesdiv" style="display: none; margin-top: 10px;"> <div id="clickyesdiv" style="display: none; margin-top: 10px;">
<label for="clickyes" class="form-label">Please specify:<span class="text-danger">*</span></label>
<label for="clickyes" class="form-label">Please specify pending duration reason:<span class="text-danger">*</span></label>
<input type="text" id="Clickyes" class="form-control" placeholder="Enter reason"> <input type="text" id="Clickyes" class="form-control" placeholder="Enter reason">
</div> </div>
</div> </div>
@ -460,6 +460,34 @@ $(document).ready(function (){
return; // Exit if the department does not match 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 // Populate employee details in the form
$('#employeeno').val(employeeDetails.EMPLOYEE_CODE); $('#employeeno').val(employeeDetails.EMPLOYEE_CODE);
$('#employeename').val(employeeDetails.EMPLOYEE_NAME); $('#employeename').val(employeeDetails.EMPLOYEE_NAME);
@ -527,6 +555,9 @@ $(document).ready(function (){
$('#submitButton').off('click').on('click', saveEntryDetails); $('#submitButton').off('click').on('click', saveEntryDetails);
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {
// Get today's date // Get today's date
const today = new Date(); const today = new Date();
@ -620,6 +651,10 @@ function convertDateFormat(dateString) {
function toggleInputField(radio) { function toggleInputField(radio) {
const inputFieldDiv = document.getElementById('clickyesdiv'); const inputFieldDiv = document.getElementById('clickyesdiv');
if (radio.value === "Yes") { if (radio.value === "Yes") {

2
frontend/pensioner/department/partial/familypension.html
View File

@ -516,7 +516,7 @@ margin-top: 10px;
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<label for="remarks" class="form-label fw-bold">Remarks<span class="text-danger">*</span></label>
<label for="remarks" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span></label>
<textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea> <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea>
</div> </div>

2
frontend/pensioner/department/partial/pendency.html
View File

@ -512,7 +512,7 @@ margin-top: 10px;
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<label for="remarks" class="form-label fw-bold">Remarks<span class="text-danger">*</span></label>
<label for="remarks" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span></label>
<textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea> <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea>
</div> </div>

2
frontend/pensioner/department/partial/retirement.html
View File

@ -492,7 +492,7 @@ margin-top: 10px;
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<label for="remarks" class="form-label fw-bold">Remarks<span class="text-danger">*</span></label>
<label for="remarks" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span></label>
<textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea> <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea>
</div> </div>

36
frontend/pensioner/department/received/provisionalretirement.html
View File

@ -325,7 +325,7 @@ margin-top: 10px;
<option value="" selected>-- Select Option --</option> <option value="" selected>-- Select Option --</option>
</select> </select>
<div id="otherReasonDiv" style="display: none; margin-top: 10px;"> <div id="otherReasonDiv" style="display: none; margin-top: 10px;">
<label for="otherReason" class="form-label">Please specify:</label>
<label for="otherReason" class="form-label">Please specify for selecting others reason:</label>
<input type="text" id="otherReason" class="form-control" placeholder="Enter reason"> <input type="text" id="otherReason" class="form-control" placeholder="Enter reason">
</div> </div>
</div> </div>
@ -352,7 +352,7 @@ margin-top: 10px;
</div> </div>
</div> </div>
<div id="clickyesdiv" style="display: none; margin-top: 10px;"> <div id="clickyesdiv" style="display: none; margin-top: 10px;">
<label for="clickyes" class="form-label">Please specify:<span class="text-danger">*</span></label>
<label for="clickyes" class="form-label">Please specify pending duration reason:<span class="text-danger">*</span></label>
<input type="text" id="Clickyes" class="form-control" placeholder="Enter reason"> <input type="text" id="Clickyes" class="form-control" placeholder="Enter reason">
</div> </div>
</div> </div>
@ -552,7 +552,7 @@ margin-top: 10px;
$('#provisionalreason').val(employeeDetails.reason_for_provisional_pension); $('#provisionalreason').val(employeeDetails.reason_for_provisional_pension);
// Populate Pending Duration and Reason fields
/* // Populate Pending Duration and Reason fields
if (employeeDetails.pending_duration === "Yes") { if (employeeDetails.pending_duration === "Yes") {
$('#yespen').prop('checked', true); // Check the Yes radio button $('#yespen').prop('checked', true); // Check the Yes radio button
$('#clickyesdiv').show(); // Show the reason input $('#clickyesdiv').show(); // Show the reason input
@ -560,7 +560,37 @@ margin-top: 10px;
} else if (employeeDetails.pending_duration === "No") { } else if (employeeDetails.pending_duration === "No") {
$('#nopen').prop('checked', true); // Check the No radio button $('#nopen').prop('checked', true); // Check the No radio button
$('#clickyesdiv').hide(); // Hide the reason input $('#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 //populate reason for provisional pension
if (employeeDetails.reason_for_provisional_pension === "Others") { if (employeeDetails.reason_for_provisional_pension === "Others") {
$('#otherReasonDiv').show(); // Show the input field for 'Others' $('#otherReasonDiv').show(); // Show the input field for 'Others'

18
frontend/pensioner/department/reports.html
View File

@ -292,6 +292,7 @@ td, th {
<th class="text-center">Name</th> <th class="text-center">Name</th>
<th class="text-center">Designation</th> <th class="text-center">Designation</th>
<th class="text-center">Type of Retirement</th> <th class="text-center">Type of Retirement</th>
<th class="text-center">Date of Retirement</th>
<th class="text-center">Pending Duration</th> <th class="text-center">Pending Duration</th>
<th class="text-center">File Status</th> <th class="text-center">File Status</th>
<th class="text-center">File category</th> <th class="text-center">File category</th>
@ -588,6 +589,21 @@ td, th {
{ title: "Name", data: "emp_name", className: "text-center" }, { title: "Name", data: "emp_name", className: "text-center" },
{ title: "Designation", data: "designation", className: "text-center" }, { title: "Designation", data: "designation", className: "text-center" },
{ title: "Type of Retirement", data: "type_of_retirement", 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: "Pending Duration", data: "reason_for_pending", className: "text-center" },
{ title: "File Status", data: "fst", className: "text-center" }, { title: "File Status", data: "fst", className: "text-center" },
{ title: "File Category", data: "file_category_name", className: "text-center" }, { title: "File Category", data: "file_category_name", className: "text-center" },
@ -1165,6 +1181,7 @@ td, th {
emp_name: row.emp_name, emp_name: row.emp_name,
designation: row.designation, designation: row.designation,
type_of_retirement: row.type_of_retirement, type_of_retirement: row.type_of_retirement,
retirement_date: row.retirement_date,
reason_for_pending: row.reason_for_pending, reason_for_pending: row.reason_for_pending,
fst: row.fst, fst: row.fst,
file_category_name:row.file_category_name, file_category_name:row.file_category_name,
@ -1172,6 +1189,7 @@ td, th {
created_date: row.created_date, created_date: row.created_date,
})); }));
fileDetailsTable.clear().rows.add(formattedData).draw(); fileDetailsTable.clear().rows.add(formattedData).draw();
console.log("retirement data",formattedData);
} }

11
frontend/pensioner/pensioner/completed/contributorypensionscheme.html
View File

@ -266,7 +266,7 @@ margin-top: 10px;
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="completedDetailsModalLabel"> <h5 class="modal-title" id="completedDetailsModalLabel">
Completed Details (<span id="completedModalEmployeeCode"></span>)
Contributory pension Scheme Completed Details - (<span id="completedModalEmployeeCode"></span>)
</h5> </h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
@ -295,8 +295,12 @@ margin-top: 10px;
<label for="completedClass" class="form-label fw-bold">Class <span class="text-danger">*</span></label> <label for="completedClass" class="form-label fw-bold">Class <span class="text-danger">*</span></label>
<input type="text" id="completedClass" class="form-control" readonly> <input type="text" id="completedClass" class="form-control" readonly>
</div> </div>
<div class="col-sm-6">
<label for="completedretirementdate" class="form-label fw-bold">Retirement Date <span class="text-danger">*</span></label>
<input type="date" id="completedretirementdate" class="form-control" readonly>
</div>
<div class="col-md-6"> <div class="col-md-6">
<label for="completedType" class="form-label fw-bold">Type of Completion <span class="text-danger">*</span></label>
<label for="completedType" class="form-label fw-bold">Type of Retirement <span class="text-danger">*</span></label>
<input type="text" id="completedType" class="form-control" readonly> <input type="text" id="completedType" class="form-control" readonly>
</div> </div>
<!-- UAC Section --> <!-- UAC Section -->
@ -526,6 +530,7 @@ margin-top: 10px;
$('#completedClass').val(cpsDetails.retirement_class); $('#completedClass').val(cpsDetails.retirement_class);
$('#completedType').val(cpsDetails.type_of_retirement); $('#completedType').val(cpsDetails.type_of_retirement);
$('#completedRemarks').val(cpsDetails.remarks); $('#completedRemarks').val(cpsDetails.remarks);
$('#completedretirementdate').val(cpsDetails.retirement_date)
// Populate UAC Section // Populate UAC Section
if (cpsDetails.uac === "yes") { if (cpsDetails.uac === "yes") {
@ -533,7 +538,7 @@ margin-top: 10px;
$('#uacNo').prop('disabled', true); // Disable No radio button $('#uacNo').prop('disabled', true); // Disable No radio button
$('#uacInputDiv').show(); // Show date input field $('#uacInputDiv').show(); // Show date input field
$('#uacDate').val(cpsDetails.uac_date || '').prop('readonly', true); // Set UAC date and make readonly $('#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 $('#uacNo').prop('checked', true); // Check No radio button
$('#uacYes').prop('disabled', true); // Disable Yes radio button $('#uacYes').prop('disabled', true); // Disable Yes radio button
$('#uacInputDiv').hide(); // Hide date input field $('#uacInputDiv').hide(); // Hide date input field

6
frontend/pensioner/pensioner/completed/familypension.html
View File

@ -328,18 +328,18 @@ margin-top: 10px;
<!-- While in Service Death --> <!-- While in Service Death -->
<div class="col-md-6">
<div class="col-md-4">
<label for="servicedeath" class="form-label fw-bold">While in Service Death <span class="text-danger">*</span></label> <label for="servicedeath" class="form-label fw-bold">While in Service Death <span class="text-danger">*</span></label>
<input type="date" id="servicedeath" class="form-control" readonly> <input type="date" id="servicedeath" class="form-control" readonly>
</div> </div>
<!-- Relationship of Deceased --> <!-- Relationship of Deceased -->
<div class="col-md-6">
<div class="col-md-4">
<label for="relationship" class="form-label fw-bold">Relationship of Deceased <span class="text-danger">*</span></label> <label for="relationship" class="form-label fw-bold">Relationship of Deceased <span class="text-danger">*</span></label>
<input type="text" id="relationship" class="form-control" readonly> <input type="text" id="relationship" class="form-control" readonly>
</div> </div>
<div class="col-md-6">
<div class="col-md-4">
<label for="sanctionedgis" class="form-label fw-bold">Sanctioned GIS<span class="text-danger">*</span></label> <label for="sanctionedgis" class="form-label fw-bold">Sanctioned GIS<span class="text-danger">*</span></label>
<input type="text" id="sanctionedgis" class="form-control" readonly> <input type="text" id="sanctionedgis" class="form-control" readonly>
</div> </div>

4
frontend/pensioner/pensioner/completed/pendency.html
View File

@ -306,12 +306,12 @@ margin-top: 10px;
<input type="text" id="designation" class="form-control" readonly> <input type="text" id="designation" class="form-control" readonly>
</div> </div>
<div class="col-md-6">
<div class="col-md-4">
<label for="classes" class="form-label fw-bold">Class<span class="text-danger">*</span></label> <label for="classes" class="form-label fw-bold">Class<span class="text-danger">*</span></label>
<input type="text" id="classes" class="form-control" readonly> <input type="text" id="classes" class="form-control" readonly>
</div> </div>
<div class="col-md-6">
<div class="col-md-4">
<label for="retirementdate" class="form-label fw-bold">Retirement Date <span class="text-danger">*</span></label> <label for="retirementdate" class="form-label fw-bold">Retirement Date <span class="text-danger">*</span></label>
<input type="date" id="retirementdate" class="form-control" readonly> <input type="date" id="retirementdate" class="form-control" readonly>
</div> </div>

6
frontend/pensioner/pensioner/completed/provisionalretirement.html
View File

@ -569,6 +569,9 @@ margin-top: 10px;
$('#fifty').prop('checked', true).prop('disabled', true); $('#fifty').prop('checked', true).prop('disabled', true);
$('#seventyfive').prop('disabled', true); $('#seventyfive').prop('disabled', true);
$('#hundred').prop('disabled', true); $('#hundred').prop('disabled', true);
$('#additionalInputDiv').show();
$('#additionalInput').val(prAmount).prop('readonly', true);
} else if (prPercentage === "75" || prPercentage === "75.00") { } else if (prPercentage === "75" || prPercentage === "75.00") {
// Select 75% radio button and disable all // Select 75% radio button and disable all
$('#seventyfive').prop('checked', true).prop('disabled', true); $('#seventyfive').prop('checked', true).prop('disabled', true);
@ -583,6 +586,9 @@ margin-top: 10px;
$('#hundred').prop('checked', true).prop('disabled', true); $('#hundred').prop('checked', true).prop('disabled', true);
$('#fifty').prop('disabled', true); $('#fifty').prop('disabled', true);
$('#seventyfive').prop('disabled', true); $('#seventyfive').prop('disabled', true);
$('#additionalInputDiv').show();
$('#additionalInput').val(prAmount).prop('readonly', true);
} else { } else {
// If pr_percentage is NOT 50, 75, or 100, show the additional input field // If pr_percentage is NOT 50, 75, or 100, show the additional input field
$('#additionalInputDiv').show(); $('#additionalInputDiv').show();

2
frontend/pensioner/pensioner/partial/familypension.html
View File

@ -512,7 +512,7 @@ margin-top: 10px;
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<label for="remarks" class="form-label fw-bold">Remarks<span class="text-danger">*</span></label>
<label for="remarks" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span></label>
<textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea> <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea>
</div> </div>

2
frontend/pensioner/pensioner/partial/pendency.html
View File

@ -492,7 +492,7 @@ margin-top: 10px;
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<label for="remarks" class="form-label fw-bold">Remarks<span class="text-danger">*</span></label>
<label for="remarks" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span></label>
<textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea> <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea>
</div> </div>

2
frontend/pensioner/pensioner/partial/retirement.html
View File

@ -492,7 +492,7 @@ margin-top: 10px;
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<label for="remarks" class="form-label fw-bold">Remarks<span class="text-danger">*</span></label>
<label for="remarks" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span></label>
<textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea> <textarea id="remarks" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea>
</div> </div>

2
frontend/pensioner/pensioner/received/pendency.html
View File

@ -192,7 +192,7 @@ margin-top: 10px;
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="detailsModalLabel"> <h5 class="modal-title" id="detailsModalLabel">
Received From Department - Family Pension (<span id="modalEmployeeCode"></span>)
Received From Department - Pendency (<span id="modalEmployeeCode"></span>)
</h5> </h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>

17
frontend/pensioner/pensioner/reports.html
View File

@ -300,6 +300,7 @@ td, th {
<th class="text-center">Name</th> <th class="text-center">Name</th>
<th class="text-center">Designation</th> <th class="text-center">Designation</th>
<th class="text-center">Type of Retirement</th> <th class="text-center">Type of Retirement</th>
<th class="text-center">Date of Retirement</th>
<th class="text-center">Pending Duration</th> <th class="text-center">Pending Duration</th>
<th class="text-center">File Status</th> <th class="text-center">File Status</th>
<th class="text-center">File category</th> <th class="text-center">File category</th>
@ -754,6 +755,21 @@ td, th {
{ title: "Name", data: "emp_name", className: "text-center" }, { title: "Name", data: "emp_name", className: "text-center" },
{ title: "Designation", data: "designation", className: "text-center" }, { title: "Designation", data: "designation", className: "text-center" },
{ title: "Type of Retirement", data: "type_of_retirement", 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: "Pending Duration", data: "reason_for_pending", className: "text-center" },
{ title: "File Status", data: "fst", className: "text-center" }, { title: "File Status", data: "fst", className: "text-center" },
{ title: "File Category", data: "file_category_name", className: "text-center" }, { title: "File Category", data: "file_category_name", className: "text-center" },
@ -1569,6 +1585,7 @@ td, th {
dept_name: row.dept_name, dept_name: row.dept_name,
designation: row.designation, designation: row.designation,
type_of_retirement: row.type_of_retirement, type_of_retirement: row.type_of_retirement,
retirement_date: row.retirement_date,
reason_for_pending: row.reason_for_pending, reason_for_pending: row.reason_for_pending,
fst: row.fst, fst: row.fst,
file_category_name: row.file_category_name, file_category_name: row.file_category_name,

1
gcc_pensioner_emptydump/gcc_pensioner_cps_pensioner_details.sql
View File

@ -32,6 +32,7 @@ CREATE TABLE `cps_pensioner_details` (
`file_category` int NOT NULL, `file_category` int NOT NULL,
`file_category_name` varchar(70) DEFAULT NULL, `file_category_name` varchar(70) DEFAULT NULL,
`retirement_class` varchar(10) DEFAULT NULL, `retirement_class` varchar(10) DEFAULT NULL,
`retirement_date` DATE DEFAULT NULL,
`type_of_retirement` varchar(30) DEFAULT NULL, `type_of_retirement` varchar(30) DEFAULT NULL,
`remarks` text, `remarks` text,
`file_status` int NOT NULL, `file_status` int NOT NULL,

1
gcc_pensioner_emptydump/gcc_pensioner_cps_pensioner_details_history.sql
View File

@ -32,6 +32,7 @@ CREATE TABLE `cps_pensioner_details_history` (
`file_category` int NOT NULL, `file_category` int NOT NULL,
`file_category_name` varchar(70) DEFAULT NULL, `file_category_name` varchar(70) DEFAULT NULL,
`retirement_class` varchar(10) DEFAULT NULL, `retirement_class` varchar(10) DEFAULT NULL,
`retirement_date` DATE DEFAULT NULL,
`type_of_retirement` varchar(30) DEFAULT NULL, `type_of_retirement` varchar(30) DEFAULT NULL,
`remarks` text, `remarks` text,
`file_status` int NOT NULL, `file_status` int NOT NULL,

Write Preview
Loading…
Cancel
Save