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

updated files

master
yoganandhan 2 years ago
parent
438950d14e
commit
6cd8216d59
28 changed files with 354 additions and 252 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/controller/PensionReceivedApiController.java
  2. 3
      backend/pensioner/service/NewEntryService.java
  3. 87
      frontend/pensioner/department/completed/contributorypensionscheme.html
  4. 9
      frontend/pensioner/department/completed/familypension.html
  5. 6
      frontend/pensioner/department/completed/gis.html
  6. 10
      frontend/pensioner/department/completed/pendency.html
  7. 26
      frontend/pensioner/department/completed/provisionalretirement.html
  8. 10
      frontend/pensioner/department/completed/retirement.html
  9. 104
      frontend/pensioner/department/newentry/contributorypensionscheme.html
  10. 2
      frontend/pensioner/department/newentry/provisionalretirement.html
  11. 2
      frontend/pensioner/department/partial/familypension.html
  12. 2
      frontend/pensioner/department/partial/pendency.html
  13. 3
      frontend/pensioner/department/partial/retirement.html
  14. 3
      frontend/pensioner/department/received/familypension.html
  15. 20
      frontend/pensioner/department/received/pendency.html
  16. 8
      frontend/pensioner/department/received/provisionalretirement.html
  17. 3
      frontend/pensioner/department/received/retirement.html
  18. 79
      frontend/pensioner/pensioner/completed/contributorypensionscheme.html
  19. 60
      frontend/pensioner/pensioner/completed/familypension.html
  20. 2
      frontend/pensioner/pensioner/completed/gis.html
  21. 60
      frontend/pensioner/pensioner/completed/pendency.html
  22. 26
      frontend/pensioner/pensioner/completed/provisionalretirement.html
  23. 58
      frontend/pensioner/pensioner/completed/retirement.html
  24. 2
      frontend/pensioner/pensioner/partial/retirement.html
  25. 3
      frontend/pensioner/pensioner/received/familypension.html
  26. 2
      frontend/pensioner/pensioner/received/gis.html
  27. 11
      frontend/pensioner/pensioner/received/pendency.html
  28. 3
      frontend/pensioner/pensioner/received/retirement.html

2
backend/pensioner/controller/PensionReceivedApiController.java
View File

@ -77,7 +77,7 @@ public class PensionReceivedApiController {
if(updated) if(updated)
{ {
return ResponseEntity.ok("File Saved successfully!");
return ResponseEntity.ok("File completed successfully!");
} }
else { else {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to save details in history."); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to save details in history.");

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

@ -701,8 +701,7 @@ public class NewEntryService {
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;
String pendingDuration = (String) requestData.get("pendingDuration"); 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 cps =(String) requestData.get("cps");
String cpsAmount = "yes".equals(cps) && requestData.get("cpsAmount") != null ? requestData.get("cpsAmount").toString() : null; String cpsAmount = "yes".equals(cps) && requestData.get("cpsAmount") != null ? requestData.get("cpsAmount").toString() : null;

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

@ -278,37 +278,37 @@ margin-top: 10px;
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<label for="completedEmployeeNo" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
<label for="completedEmployeeNo" class="form-label fw-bold">Employee No </label>
<input type="text" id="completedEmployeeNo" class="form-control" readonly> <input type="text" id="completedEmployeeNo" class="form-control" readonly>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="completedEmployeeName" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
<label for="completedEmployeeName" class="form-label fw-bold">Employee Name </label>
<input type="text" id="completedEmployeeName" class="form-control" readonly> <input type="text" id="completedEmployeeName" class="form-control" readonly>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="completedDepartment" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
<label for="completedDepartment" class="form-label fw-bold">Department </label>
<input type="text" id="completedDepartment" class="form-control" readonly> <input type="text" id="completedDepartment" class="form-control" readonly>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="completedDesignation" class="form-label fw-bold">Designation <span class="text-danger">*</span></label>
<label for="completedDesignation" class="form-label fw-bold">Designation </label>
<input type="text" id="completedDesignation" class="form-control" readonly> <input type="text" id="completedDesignation" class="form-control" readonly>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="completedClass" class="form-label fw-bold">Class <span class="text-danger">*</span></label>
<label for="completedClass" class="form-label fw-bold">Class </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"> <div class="col-sm-6">
<label for="completedretirementdate" class="form-label fw-bold">Retirement Date <span class="text-danger">*</span></label>
<label for="completedretirementdate" class="form-label fw-bold">Retirement Date </label>
<input type="date" id="completedretirementdate" class="form-control" readonly> <input type="date" id="completedretirementdate" class="form-control" readonly>
</div> </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 </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 -->
<div class="col-md-6"> <div class="col-md-6">
<label class="form-label fw-bold" for="uac">Whether File Sent UAC Date <span class="text-danger">*</span></label>
<label class="form-label fw-bold" for="uac">Whether File Sent UAC Date </label>
<div class="d-flex"> <div class="d-flex">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
<input type="radio" id="uacYes" name="uac" class="form-check-input" value="Yes" > <input type="radio" id="uacYes" name="uac" class="form-check-input" value="Yes" >
@ -326,25 +326,24 @@ margin-top: 10px;
<div class="col-md-6">
<label for="pendingDuration" class="form-label fw-bold">
Pending Duration
<span class="text-danger">*</span>
</label>
<div class="d-flex align-items-center">
<div class="form-check" style="padding-right:10px;">
<input type="radio" id="pendingDurationYes" name="pendingDuration" value="yes" class="form-check-input">
<label for="pendingDurationYes" class="form-check-label">Yes</label>
</div>
<div class="form-check">
<input type="radio" id="pendingDurationNo" name="pendingDuration" value="no" class="form-check-input">
<label for="pendingDurationNo" class="form-check-label">No</label>
</div>
</div>
<div class="dropdown" id="pendingDurationInputContainer" style="display: none; margin-top: 10px;">
<input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control" placeholder="Enter details for pending duration">
</div>
</div>
<!-- Pending Duration -->
<div class="col-md-6">
<label for="pendingDuration" class="form-label fw-bold">Pending Duration </label>
<div class="d-flex align-items-center">
<div class="form-check" style="padding-right:10px;">
<input type="radio" id="yespen" name="pendingDuration" value="Yes" class="form-check-input" disabled>
<label for="yespen" class="form-check-label">Yes</label>
</div>
<div class="form-check">
<input type="radio" id="nopen" name="pendingDuration" value="No" class="form-check-input" disabled>
<label for="nopen" class="form-check-label">No</label>
</div>
</div>
<div id="clickyesdiv" style="display: none; margin-top: 10px;">
<label for="clickyes" class="form-label">Please specify:</label>
<input type="text" id="Clickyes" class="form-control">
</div>
</div>
<!-- CPS Section --> <!-- CPS Section -->
<div class="col-md-6"> <div class="col-md-6">
@ -366,7 +365,7 @@ margin-top: 10px;
<!-- EL/LPA Section --> <!-- EL/LPA Section -->
<div class="col-md-6"> <div class="col-md-6">
<label class="form-label fw-bold">Whether EL/LPA Amount Settled <span class="text-danger">*</span></label>
<label class="form-label fw-bold">Whether EL/LPA Amount Settled </label>
<div class="d-flex"> <div class="d-flex">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
<input type="radio" id="elLpaYes" name="el_or_lpa" class="form-check-input" value="yes" > <input type="radio" id="elLpaYes" name="el_or_lpa" class="form-check-input" value="yes" >
@ -384,7 +383,7 @@ margin-top: 10px;
<!-- SPFGS Section --> <!-- SPFGS Section -->
<div class="col-md-6"> <div class="col-md-6">
<label class="form-label fw-bold">Whether SPFGS Amount Settled <span class="text-danger">*</span></label>
<label class="form-label fw-bold">Whether SPFGS Amount Settled </label>
<div class="d-flex"> <div class="d-flex">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
<input type="radio" id="spfgsYes" name="spfgs" class="form-check-input" value="yes" > <input type="radio" id="spfgsYes" name="spfgs" class="form-check-input" value="yes" >
@ -401,7 +400,7 @@ margin-top: 10px;
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<label for="completedRemarks" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
<label for="completedRemarks" class="form-label fw-bold">Comments/Remarks </label>
<textarea id="completedRemarks" class="form-control" rows="4" placeholder="Enter remarks" readonly></textarea> <textarea id="completedRemarks" class="form-control" rows="4" placeholder="Enter remarks" readonly></textarea>
</div> </div>
@ -424,14 +423,6 @@ margin-top: 10px;
<div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div> <div th:replace="~{fragments/modules/base/app_module_menu_box :: div}"></div>
@ -542,7 +533,20 @@ margin-top: 10px;
$('#uacInputDiv').hide(); // Hide date input field $('#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") { if (cpsDetails.pending_duration === "yes") {
$('#pendingDurationYes').prop('checked', true); $('#pendingDurationYes').prop('checked', true);
$('#pendingDurationNo').prop('disabled', true); // Disable the other option $('#pendingDurationNo').prop('disabled', true); // Disable the other option
@ -553,7 +557,7 @@ margin-top: 10px;
$('#pendingDurationNo').prop('checked', true); $('#pendingDurationNo').prop('checked', true);
$('#pendingDurationInputContainer').hide(); // Show reason input field $('#pendingDurationInputContainer').hide(); // Show reason input field
}
} */
// Populate CPS Section based on response or data // Populate CPS Section based on response or data
if (cpsDetails.cps === "yes") { if (cpsDetails.cps === "yes") {
@ -681,9 +685,6 @@ margin-top: 10px;
} }
</script> </script>
</body> </body>

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

@ -445,7 +445,7 @@ margin-top: 10px;
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label> <label for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
<input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee" readonly>
<input type="text" id="recoveryemployeevalue" class="form-control" readonly>
</div> </div>
@ -469,14 +469,14 @@ margin-top: 10px;
<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span> <span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span>
</div> </div>
<div class="col-md-6 mt-2 mb-2">
<div class="col-md-4 mt-2 mb-2">
<label for="pensionNumber" class="form-label">Pension Number</label> <label for="pensionNumber" class="form-label">Pension Number</label>
<input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly> <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly>
</div> </div>
<div class="col-md-6 mt-2 mb-2">
<div class="col-md-4 mt-2 mb-2">
<label for="ledgerNumber" class="form-label">Ledger Number</label> <label for="ledgerNumber" class="form-label">Ledger Number</label>
<input type="number" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
<input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
</div> </div>
@ -639,6 +639,7 @@ margin-top: 10px;
$('#servicedeath').val(employeeDetails.service_death); $('#servicedeath').val(employeeDetails.service_death);
$('#relationship').val(employeeDetails.relationship_deceased); $('#relationship').val(employeeDetails.relationship_deceased);
$('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount); $('#sanctionedgis').val(employeeDetails.sanctioned_gis_amount);
$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
//$('#classes').val(employeeDetails.retirement_class); //$('#classes').val(employeeDetails.retirement_class);
$('#datefile_modal').val(employeeDetails.file_moved_date); $('#datefile_modal').val(employeeDetails.file_moved_date);
$('#remarks_modal').val(employeeDetails.remarks); $('#remarks_modal').val(employeeDetails.remarks);

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

@ -249,7 +249,7 @@ margin-top: 10px;
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="gisentry" class="form-label fw-bold">GIS Entry Type<span class="text-danger">*</span></label>
<label for="gisentry" class="form-label fw-bold">GIS Entry Type</label>
<input type="text" id="gisentry" class="form-control" readonly> <input type="text" id="gisentry" class="form-control" readonly>
</div> </div>
@ -261,11 +261,11 @@ margin-top: 10px;
</label> </label>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
<input type="radio" id="gisyes" name="gisamount" class="form-check-input" value="Yes">
<input type="radio" id="gisyes" name="gisamount" class="form-check-input" value="Yes" disabled>
<label for="gisyes" class="form-check-label">Yes</label> <label for="gisyes" class="form-check-label">Yes</label>
</div> </div>
<div class="form-check"> <div class="form-check">
<input type="radio" id="gisno" name="gisamount" class="form-check-input" value="No">
<input type="radio" id="gisno" name="gisamount" class="form-check-input" value="No" disabled>
<label for="gisno" class="form-check-label">No</label> <label for="gisno" class="form-check-label">No</label>
</div> </div>
</div> </div>

10
frontend/pensioner/department/completed/pendency.html
View File

@ -440,7 +440,7 @@ margin-top: 10px;
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label> <label for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
<input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee" readonly>
<input type="text" id="recoveryemployeevalue" class="form-control" readonly>
</div> </div>
@ -474,14 +474,14 @@ margin-top: 10px;
<input type="number" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly> <input type="number" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
</div> --> </div> -->
<div class="col-md-4">
<div class="col-md-4 mb-2">
<label for="pensionNumber" class="form-label">Pension Number</label> <label for="pensionNumber" class="form-label">Pension Number</label>
<input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly> <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly>
</div> </div>
<div class="col-md-4">
<div class="col-md-4 mb-2">
<label for="ledgerNumber" class="form-label">Ledger Number</label> <label for="ledgerNumber" class="form-label">Ledger Number</label>
<input type="number" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
<input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
</div> </div>
@ -682,6 +682,8 @@ margin-top: 10px;
$('#spfgsAmountDiv').hide(); $('#spfgsAmountDiv').hide();
} }
//recover emp
$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
// DCRG File // DCRG File
$('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);

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

@ -275,49 +275,49 @@ margin-top: 10px;
<div class="row"> <div class="row">
<!-- Employee No --> <!-- Employee No -->
<div class="col-md-6"> <div class="col-md-6">
<label for="employeenomodel" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
<label for="employeenomodel" class="form-label fw-bold">Employee No </label>
<input type="number" id="employeenomodel" class="form-control" readonly> <input type="number" id="employeenomodel" class="form-control" readonly>
</div> </div>
<!-- Employee Name --> <!-- Employee Name -->
<div class="col-md-6"> <div class="col-md-6">
<label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
<label for="employeename" class="form-label fw-bold">Employee Name </label>
<input type="text" id="employeename" class="form-control" readonly> <input type="text" id="employeename" class="form-control" readonly>
</div> </div>
<!-- Department --> <!-- Department -->
<div class="col-md-6"> <div class="col-md-6">
<label for="department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
<label for="department" class="form-label fw-bold">Department </label>
<input type="text" id="department" class="form-control" readonly> <input type="text" id="department" class="form-control" readonly>
</div> </div>
<!-- Designation --> <!-- Designation -->
<div class="col-md-6"> <div class="col-md-6">
<label for="designation" class="form-label fw-bold">Designation <span class="text-danger">*</span></label>
<label for="designation" class="form-label fw-bold">Designation </label>
<input type="text" id="designation" class="form-control" readonly> <input type="text" id="designation" class="form-control" readonly>
</div> </div>
<!-- Class --> <!-- Class -->
<div class="col-md-6"> <div class="col-md-6">
<label for="classes" class="form-label fw-bold">Class<span class="text-danger">*</span></label>
<label for="classes" class="form-label fw-bold">Class</label>
<input type="text" id="classes" class="form-control" readonly> <input type="text" id="classes" class="form-control" readonly>
</div> </div>
<!-- Type Of Retirement --> <!-- Type Of Retirement -->
<div class="col-md-6"> <div class="col-md-6">
<label for="typeofretirement" class="form-label fw-bold">Type Of Retirement<span class="text-danger">*</span></label>
<label for="typeofretirement" class="form-label fw-bold">Type Of Retirement</label>
<input type="text" id="typeofretirement" class="form-control" readonly> <input type="text" id="typeofretirement" class="form-control" readonly>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<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 </label>
<input type="date" id="retirementdate" class="form-control" readonly> <input type="date" id="retirementdate" class="form-control" readonly>
</div> </div>
<!-- Reason For Provisional Pension is given --> <!-- Reason For Provisional Pension is given -->
<!-- provisionalreason <!-- provisionalreason
otherReason --> otherReason -->
<div class="col-md-6"> <div class="col-md-6">
<label for="provisionalreason" class="form-label fw-bold">Reason For Provisional Pension is given <span class="text-danger">*</span></label>
<label for="provisionalreason" class="form-label fw-bold">Reason For Provisional Pension is given </label>
<input type="text" id="provisionalreason" class="form-control" readonly> <input type="text" id="provisionalreason" class="form-control" readonly>
<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:</label>
@ -330,13 +330,13 @@ margin-top: 10px;
<!-- Date File Sent to Pension Section --> <!-- Date File Sent to Pension Section -->
<div class="col-md-6"> <div class="col-md-6">
<label for="datefile_modal" class="form-label fw-bold">Date File Sent to Pension Section <span class="text-danger">*</span></label>
<label for="datefile_modal" class="form-label fw-bold">Date File Sent to Pension Section </label>
<input type="date" id="datefile_modal" class="form-control" readonly onclick="this.showPicker()"> <input type="date" id="datefile_modal" class="form-control" readonly onclick="this.showPicker()">
</div> </div>
<!-- Pending Duration --> <!-- Pending Duration -->
<div class="col-md-6"> <div class="col-md-6">
<label for="pendingDuration" class="form-label fw-bold">Pending Duration <span class="text-danger">*</span></label>
<label for="pendingDuration" class="form-label fw-bold">Pending Duration </label>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
<input type="radio" id="yespen" name="pendingDuration" value="Yes" class="form-check-input" disabled> <input type="radio" id="yespen" name="pendingDuration" value="Yes" class="form-check-input" disabled>
@ -355,7 +355,7 @@ margin-top: 10px;
<!-- dp --> <!-- dp -->
<div class="col-md-6"> <div class="col-md-6">
<label for="DP" class="form-label fw-bold">DP<span class="text-danger">*</span></label>
<label for="DP" class="form-label fw-bold">DP</label>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<div class="form-check " style="padding-right:10px;"> <div class="form-check " style="padding-right:10px;">
<input type="radio" id="yes" name="DP" value="yes" class="form-check-input" disabled> <input type="radio" id="yes" name="DP" value="yes" class="form-check-input" disabled>
@ -372,7 +372,7 @@ margin-top: 10px;
<!-- Retirement Amount --> <!-- Retirement Amount -->
<div class="col-md-6"> <div class="col-md-6">
<label for="RetirementAmount" class="form-label fw-bold"> <label for="RetirementAmount" class="form-label fw-bold">
Provisional Retirement Amount <span class="text-danger">*</span>
Provisional Retirement Amount
</label> </label>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
@ -398,7 +398,7 @@ margin-top: 10px;
<!-- Remarks --> <!-- Remarks -->
<div class="col-md-12"> <div class="col-md-12">
<label for="remarks_modal" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
<label for="remarks_modal" class="form-label fw-bold">Comments/Remarks </label>
<textarea id="remarks_modal" class="form-control" rows="2" placeholder="Enter your remarks here" readonly></textarea> <textarea id="remarks_modal" class="form-control" rows="2" placeholder="Enter your remarks here" readonly></textarea>
</div> </div>

10
frontend/pensioner/department/completed/retirement.html
View File

@ -417,7 +417,7 @@ margin-top: 10px;
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label> <label for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
<input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee" readonly>
<input type="text" id="recoveryemployeevalue" class="form-control" readonly>
</div> </div>
@ -441,14 +441,14 @@ margin-top: 10px;
<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span> <span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span>
</div> </div>
<div class="col-md-6 mt-2 mb-2">
<div class="col-md-4 mt-2 mb-2">
<label for="pensionNumber" class="form-label">Pension Number</label> <label for="pensionNumber" class="form-label">Pension Number</label>
<input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly> <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly>
</div> </div>
<div class="col-md-6 mt-2 mb-2">
<div class="col-md-4 mt-2 mb-2">
<label for="ledgerNumber" class="form-label">Ledger Number</label> <label for="ledgerNumber" class="form-label">Ledger Number</label>
<input type="number" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
<input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
</div> </div>
@ -628,6 +628,8 @@ margin-top: 10px;
} else { } else {
$('#spfgsAmountDiv').hide(); $('#spfgsAmountDiv').hide();
} }
//recover emp
$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
// DCRG File // DCRG File
$('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);

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

@ -234,6 +234,24 @@ padding-top: 2%;
<input type="date" id="retirementdate" class="form-control" readonly> <input type="date" id="retirementdate" class="form-control" readonly>
</div> </div>
<div class="col-md-6">
<label for="pendingDuration" class="form-label fw-bold">Pending Duration <span class="text-danger">*</span></label>
<div class="d-flex align-items-center">
<div class="form-check" style="padding-right:10px;">
<input type="radio" id="yespen" name="pendingDuration" value="Yes" class="form-check-input" onclick="toggleInputField(this)">
<label for="yespen" class="form-check-label">Yes</label>
</div>
<div class="form-check">
<input type="radio" id="nopen" name="pendingDuration" value="No" class="form-check-input" onclick="toggleInputField(this)">
<label for="nopen" class="form-check-label">No</label>
</div>
</div>
<div id="clickyesdiv" style="display: none; margin-top: 10px;">
<label for="clickyes" class="form-label">Please specify:<span class="text-danger">*</span></label>
<input type="text" id="Clickyes" class="form-control" placeholder="Enter Pending Duration">
</div>
</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" >
@ -267,7 +285,7 @@ padding-top: 2%;
</div> </div>
<div class="col-md-6">
<!-- <div class="col-md-6">
<label for="pendingDuration" class="form-label fw-bold"> <label for="pendingDuration" class="form-label fw-bold">
Pending Duration Pending Duration
<span class="text-danger">*</span> <span class="text-danger">*</span>
@ -285,7 +303,7 @@ padding-top: 2%;
<div class="dropdown" id="pendingDurationInputContainer" style="display: none; margin-top: 10px;"> <div class="dropdown" id="pendingDurationInputContainer" style="display: none; margin-top: 10px;">
<input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control" placeholder="Enter details for pending duration"> <input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control" placeholder="Enter details for pending duration">
</div> </div>
</div>
</div> -->
<div class="col-md-6"> <div class="col-md-6">
<label for="cpsamount" class="form-label fw-bold"> <label for="cpsamount" class="form-label fw-bold">
@ -507,6 +525,36 @@ padding-top: 2%;
}); });
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();
$('#employeeno').val(employeeDetails.EMPLOYEE_CODE); $('#employeeno').val(employeeDetails.EMPLOYEE_CODE);
$('#employeename').val(employeeDetails.EMPLOYEE_NAME); $('#employeename').val(employeeDetails.EMPLOYEE_NAME);
@ -566,6 +614,18 @@ padding-top: 2%;
}) })
function toggleInputField(radio) {
const inputFieldDiv = document.getElementById('clickyesdiv');
if (radio.value === "Yes") {
inputFieldDiv.style.display = 'block';
} else {
inputFieldDiv.style.display = 'none';
document.getElementById('Clickyes').value = ''; // Clear the input field
}
}
$(document).ready(function () { $(document).ready(function () {
function loadRetirementTypes() { function loadRetirementTypes() {
@ -657,19 +717,7 @@ padding-top: 2%;
}); });
}); });
document.querySelectorAll('input[name="pendingDuration"]').forEach(radio => {
radio.addEventListener('change', function () {
const pendingDurationInputContainer = document.getElementById('pendingDurationInputContainer');
if (this.value === 'yes') {
pendingDurationInputContainer.style.display = 'block'; // Show the input field
} else {
pendingDurationInputContainer.style.display = 'none'; // Hide the input field
document.getElementById('pendingDurationInput').value = ''; // Clear the input field
}
});
});
document.querySelectorAll('input[name="cpsamount"]').forEach(radio => { document.querySelectorAll('input[name="cpsamount"]').forEach(radio => {
radio.addEventListener('change', function () { radio.addEventListener('change', function () {
@ -718,7 +766,12 @@ padding-top: 2%;
let selecteduacValue = $('input[name="filesentuac"]:checked').val(); let selecteduacValue = $('input[name="filesentuac"]:checked').val();
let uacDate = null; let uacDate = null;
let selectedPendingDurationValue = $('input[name="pendingDuration"]:checked').val();
let selectedReasonValue = $('#Clickyes').val();
if (selecteduacValue === 'yes') { if (selecteduacValue === 'yes') {
uacDate = $('#dateInput').val(); uacDate = $('#dateInput').val();
if (!uacDate) { if (!uacDate) {
@ -799,6 +852,21 @@ padding-top: 2%;
} }
// Check for "Yes" in Pending Duration
if (selectedPendingDurationValue === 'Yes') {
selectedReasonPending = $('#Clickyes').val()?.trim() || null;
if (!selectedReasonPending) {
Swal.fire({
icon: 'warning',
title: 'Validation Error',
text: 'Please specify the reason for selecting "Yes" for Pending Duration.',
confirmButtonText: 'OK'
});
return;
}
}
// Collecting input values // Collecting input values
let entryDetails = { let entryDetails = {
empNo: $('#employeeno').val(), empNo: $('#employeeno').val(),
@ -813,8 +881,8 @@ padding-top: 2%;
uac: selecteduacValue, uac: selecteduacValue,
uacDate: uacDate, uacDate: uacDate,
pendingDuration: pendingDuration,
reasonPending: pendingDurationReason,
pendingDuration: selectedPendingDurationValue,
reasonPending: selectedReasonValue || null,
cps: selcpsamount, cps: selcpsamount,
cpsAmount: selcpsamountval, cpsAmount: selcpsamountval,
elOrLpa: selelamount, elOrLpa: selelamount,
@ -857,6 +925,8 @@ padding-top: 2%;
} }
if(!entryDetails.cps){ if(!entryDetails.cps){
Swal.fire({ Swal.fire({
icon: 'warning', icon: 'warning',

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

@ -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 pending duration reason:<span class="text-danger">*</span></label>
<label for="clickyes" class="form-label">Please specify:<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>

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

@ -706,6 +706,8 @@ document.getElementById("submitbutton").addEventListener("click", function () {
} else { } else {
$('#spfgsAmountDiv').hide(); $('#spfgsAmountDiv').hide();
} }
//recover emp
$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
// DCRG File // DCRG File
$('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);

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

@ -699,6 +699,8 @@ document.getElementById("submitbutton").addEventListener("click", function () {
} else { } else {
$('#spfgsAmountDiv').hide(); $('#spfgsAmountDiv').hide();
} }
//recover emp
$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
// DCRG File // DCRG File
$('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);

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

@ -661,7 +661,8 @@ function convertDateFormat(dateString) {
} else { } else {
$('#spfgsAmountDiv').hide(); $('#spfgsAmountDiv').hide();
} }
//recover emp
$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
// DCRG File // DCRG File
$('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);
if(employeeDetails.dcrg ==="yes"){ if(employeeDetails.dcrg ==="yes"){

3
frontend/pensioner/department/received/familypension.html
View File

@ -608,7 +608,8 @@ margin-top: 10px;
} else { } else {
$('#spfgsAmountDiv').hide(); $('#spfgsAmountDiv').hide();
} }
//recover emp
$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
// DCRG File // DCRG File
$('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);

20
frontend/pensioner/department/received/pendency.html
View File

@ -131,7 +131,7 @@ margin-top: 10px;
<div class="col-md-12"> <div class="col-md-12">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-block">
<h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
<h5 style="font-weight:bold;"> <span th:text="${deptname}" id="deptname"></span>&nbsp;Department</h5>
<h5 style="font-weight:bold;">Received From Pension - Pendency</h5> <h5 style="font-weight:bold;">Received From Pension - Pendency</h5>
<h5 style="font-weight:bold;"><span th:text="${deptId}" id="deptId" style="display:none"></span></h5> <h5 style="font-weight:bold;"><span th:text="${deptId}" id="deptId" style="display:none"></span></h5>
<span th:text="${userId}" id="userId" style="display:none"></span> <span th:text="${userId}" id="userId" style="display:none"></span>
@ -393,7 +393,7 @@ margin-top: 10px;
<!-- Remarks --> <!-- Remarks -->
<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" ></textarea> <textarea id="remarks" class="form-control" rows="4" ></textarea>
</div> </div>
@ -406,13 +406,9 @@ margin-top: 10px;
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -533,10 +529,10 @@ margin-top: 10px;
$('#department').val(employeeDetails.dept_name); $('#department').val(employeeDetails.dept_name);
$('#designation').val(employeeDetails.designation); $('#designation').val(employeeDetails.designation);
$('#typeofretirement').val(employeeDetails.type_of_retirement); $('#typeofretirement').val(employeeDetails.type_of_retirement);
$('#classes').val(employeeDetails.retirement_class);
$('#datefile_modal').val(employeeDetails.file_moved_date);
$('#classes').val(employeeDetails.retirement_class);
$('#datefile_modal').val(employeeDetails.file_moved_date);
$('#remarks_modal').val(employeeDetails.remarks); $('#remarks_modal').val(employeeDetails.remarks);
$('#retirementdate').val(employeeDetails.retirement_date);
$('#retirementdate').val(employeeDetails.retirement_date);
let pendingDuration = employeeDetails.pending_duration; // Assuming this comes from the response let pendingDuration = employeeDetails.pending_duration; // Assuming this comes from the response
@ -597,8 +593,10 @@ margin-top: 10px;
$('#spfgsAmount').val(employeeDetails.spfgs_amount); $('#spfgsAmount').val(employeeDetails.spfgs_amount);
} else { } else {
$('#spfgsAmountDiv').hide(); $('#spfgsAmountDiv').hide();
} }
//recover emp
$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
// DCRG File // DCRG File
$('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);

8
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 for selecting others reason:</label>
<label for="otherReason" class="form-label">Please specify:</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 pending duration reason:<span class="text-danger">*</span></label>
<label for="clickyes" class="form-label">Please specify:<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>
@ -395,7 +395,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>
@ -424,7 +424,7 @@ margin-top: 10px;
<script th:replace="~{fragments/modules/base/script :: script}"></script> <script th:replace="~{fragments/modules/base/script :: script}"></script>
<script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script> <script src="node_modules/tempusdominus-bootstrap-4/build/js/tempusdominus-bootstrap-4.min.js"></script>
<!-- Bootstrap 5 JS --> <!-- Bootstrap 5 JS -->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script> <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>

3
frontend/pensioner/department/received/retirement.html
View File

@ -587,7 +587,8 @@ margin-top: 10px;
} else { } else {
$('#spfgsAmountDiv').hide(); $('#spfgsAmountDiv').hide();
} }
//recover emp
$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
// DCRG File // DCRG File
$('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);

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

@ -275,37 +275,37 @@ margin-top: 10px;
<div class="modal-body"> <div class="modal-body">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<label for="completedEmployeeNo" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
<label for="completedEmployeeNo" class="form-label fw-bold">Employee No </label>
<input type="text" id="completedEmployeeNo" class="form-control" readonly> <input type="text" id="completedEmployeeNo" class="form-control" readonly>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="completedEmployeeName" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
<label for="completedEmployeeName" class="form-label fw-bold">Employee Name </label>
<input type="text" id="completedEmployeeName" class="form-control" readonly> <input type="text" id="completedEmployeeName" class="form-control" readonly>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="completedDepartment" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
<label for="completedDepartment" class="form-label fw-bold">Department </label>
<input type="text" id="completedDepartment" class="form-control" readonly> <input type="text" id="completedDepartment" class="form-control" readonly>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="completedDesignation" class="form-label fw-bold">Designation <span class="text-danger">*</span></label>
<label for="completedDesignation" class="form-label fw-bold">Designation </label>
<input type="text" id="completedDesignation" class="form-control" readonly> <input type="text" id="completedDesignation" class="form-control" readonly>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="completedClass" class="form-label fw-bold">Class <span class="text-danger">*</span></label>
<label for="completedClass" class="form-label fw-bold">Class </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"> <div class="col-sm-6">
<label for="completedretirementdate" class="form-label fw-bold">Retirement Date <span class="text-danger">*</span></label>
<label for="completedretirementdate" class="form-label fw-bold">Retirement Date </label>
<input type="date" id="completedretirementdate" class="form-control" readonly> <input type="date" id="completedretirementdate" class="form-control" readonly>
</div> </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 </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 -->
<div class="col-md-6"> <div class="col-md-6">
<label class="form-label fw-bold" for="uac">Whether File Sent UAC Date <span class="text-danger">*</span></label>
<label class="form-label fw-bold" for="uac">Whether File Sent UAC Date </label>
<div class="d-flex"> <div class="d-flex">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
<input type="radio" id="uacYes" name="uac" class="form-check-input" value="Yes" > <input type="radio" id="uacYes" name="uac" class="form-check-input" value="Yes" >
@ -323,7 +323,7 @@ margin-top: 10px;
<!-- Pending Duration Section --> <!-- Pending Duration Section -->
<!-- <div class="col-md-6"> <!-- <div class="col-md-6">
<label class="form-label fw-bold">Pending Duration <span class="text-danger">*</span></label>
<label class="form-label fw-bold">Pending Duration </label>
<div class="d-flex"> <div class="d-flex">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
<input type="radio" id="oneYear" name="pendingDuration" class="form-check-input" value="ONE_YEAR" disabled> <input type="radio" id="oneYear" name="pendingDuration" class="form-check-input" value="ONE_YEAR" disabled>
@ -340,29 +340,28 @@ margin-top: 10px;
</div> --> </div> -->
<div class="col-md-6">
<label for="pendingDuration" class="form-label fw-bold">
Pending Duration
<span class="text-danger">*</span>
</label>
<div class="d-flex align-items-center">
<div class="form-check" style="padding-right:10px;">
<input type="radio" id="pendingDurationYes" name="pendingDuration" value="yes" class="form-check-input">
<label for="pendingDurationYes" class="form-check-label">Yes</label>
</div>
<div class="form-check">
<input type="radio" id="pendingDurationNo" name="pendingDuration" value="no" class="form-check-input">
<label for="pendingDurationNo" class="form-check-label">No</label>
</div>
</div>
<div class="dropdown" id="pendingDurationInputContainer" style="display: none; margin-top: 10px;">
<input type="text" id="pendingDurationInput" name="pendingDurationValue" class="form-control" placeholder="Enter details for pending duration">
</div>
</div>
<!-- Pending Duration -->
<div class="col-md-6">
<label for="pendingDuration" class="form-label fw-bold">Pending Duration </label>
<div class="d-flex align-items-center">
<div class="form-check" style="padding-right:10px;">
<input type="radio" id="yespen" name="pendingDuration" value="Yes" class="form-check-input" disabled>
<label for="yespen" class="form-check-label">Yes</label>
</div>
<div class="form-check">
<input type="radio" id="nopen" name="pendingDuration" value="No" class="form-check-input" disabled>
<label for="nopen" class="form-check-label">No</label>
</div>
</div>
<div id="clickyesdiv" style="display: none; margin-top: 10px;">
<label for="clickyes" class="form-label">Please specify:</label>
<input type="text" id="Clickyes" class="form-control" >
</div>
</div>
<!-- CPS Section --> <!-- CPS Section -->
<div class="col-md-6"> <div class="col-md-6">
<label class="form-label fw-bold">Whether CPS Amount Settled <span class="text-danger">*</span></label>
<label class="form-label fw-bold">Whether CPS Amount Settled </label>
<div class="d-flex"> <div class="d-flex">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
<input type="radio" id="cpsYes" name="cps" class="form-check-input" value="Yes" > <input type="radio" id="cpsYes" name="cps" class="form-check-input" value="Yes" >
@ -380,7 +379,7 @@ margin-top: 10px;
<!-- EL/LPA Section --> <!-- EL/LPA Section -->
<div class="col-md-6"> <div class="col-md-6">
<label class="form-label fw-bold">Whether EL/LPA Amount Settled <span class="text-danger">*</span></label>
<label class="form-label fw-bold">Whether EL/LPA Amount Settled </label>
<div class="d-flex"> <div class="d-flex">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
<input type="radio" id="elLpaYes" name="el_or_lpa" class="form-check-input" value="yes" > <input type="radio" id="elLpaYes" name="el_or_lpa" class="form-check-input" value="yes" >
@ -398,7 +397,7 @@ margin-top: 10px;
<!-- SPFGS Section --> <!-- SPFGS Section -->
<div class="col-md-6"> <div class="col-md-6">
<label class="form-label fw-bold">Whether SPFGS Amount Settled <span class="text-danger">*</span></label>
<label class="form-label fw-bold">Whether SPFGS Amount Settled </label>
<div class="d-flex"> <div class="d-flex">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
<input type="radio" id="spfgsYes" name="spfgs" class="form-check-input" value="yes" > <input type="radio" id="spfgsYes" name="spfgs" class="form-check-input" value="yes" >
@ -415,7 +414,7 @@ margin-top: 10px;
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<label for="completedRemarks" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
<label for="completedRemarks" class="form-label fw-bold">Comments/Remarks </label>
<textarea id="completedRemarks" class="form-control" rows="4" placeholder="Enter remarks" readonly></textarea> <textarea id="completedRemarks" class="form-control" rows="4" placeholder="Enter remarks" readonly></textarea>
</div> </div>
@ -544,7 +543,19 @@ margin-top: 10px;
$('#uacInputDiv').hide(); // Hide date input field $('#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") { if (cpsDetails.pending_duration === "yes") {
$('#pendingDurationYes').prop('checked', true); $('#pendingDurationYes').prop('checked', true);
$('#pendingDurationNo').prop('disabled', true); // Disable the other option $('#pendingDurationNo').prop('disabled', true); // Disable the other option
@ -555,7 +566,7 @@ margin-top: 10px;
$('#pendingDurationNo').prop('checked', true); $('#pendingDurationNo').prop('checked', true);
$('#pendingDurationInputContainer').hide(); // Show reason input field $('#pendingDurationInputContainer').hide(); // Show reason input field
}
} */
// Populate CPS Section based on response or data // Populate CPS Section based on response or data
if (cpsDetails.cps === "yes") { if (cpsDetails.cps === "yes") {

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

@ -284,32 +284,32 @@ margin-top: 10px;
<!-- Employee No --> <!-- Employee No -->
<div class="col-md-4"> <div class="col-md-4">
<label for="employeenomodel" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
<label for="employeenomodel" class="form-label fw-bold">Employee No </label>
<input type="number" id="employeenomodel" class="form-control" readonly> <input type="number" id="employeenomodel" class="form-control" readonly>
</div> </div>
<!-- Employee Name --> <!-- Employee Name -->
<div class="col-md-4"> <div class="col-md-4">
<label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
<label for="employeename" class="form-label fw-bold">Employee Name </label>
<input type="text" id="employeename" class="form-control" readonly> <input type="text" id="employeename" class="form-control" readonly>
</div> </div>
<!-- Department --> <!-- Department -->
<div class="col-md-4"> <div class="col-md-4">
<label for="department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
<label for="department" class="form-label fw-bold">Department </label>
<input type="text" id="department" class="form-control" readonly> <input type="text" id="department" class="form-control" readonly>
</div> </div>
<!-- Designation --> <!-- Designation -->
<div class="col-md-4"> <div class="col-md-4">
<label for="designation" class="form-label fw-bold">Designation <span class="text-danger">*</span></label>
<label for="designation" class="form-label fw-bold">Designation </label>
<input type="text" id="designation" class="form-control" readonly> <input type="text" id="designation" class="form-control" readonly>
</div> </div>
<div class="col-md-4"> <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
<span class="text-danger">*</span>
</label> </label>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
@ -329,30 +329,30 @@ margin-top: 10px;
<!-- While in Service Death --> <!-- While in Service Death -->
<div class="col-md-4"> <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 </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-4"> <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 </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-4"> <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</label>
<input type="text" id="sanctionedgis" class="form-control" readonly> <input type="text" id="sanctionedgis" class="form-control" readonly>
</div> </div>
<!-- Date File Sent to Audit --> <!-- Date File Sent to Audit -->
<div class="col-md-4"> <div class="col-md-4">
<label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit <span class="text-danger">*</span></label>
<label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit </label>
<input type="date" id="datefile_modal" class="form-control" readonly> <input type="date" id="datefile_modal" class="form-control" readonly>
</div> </div>
<!-- Remarks --> <!-- Remarks -->
<div class="col-md-12"> <div class="col-md-12">
<label for="remarks_modal" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
<label for="remarks_modal" class="form-label fw-bold">Comments/Remarks </label>
<textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea> <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
</div> </div>
@ -370,7 +370,7 @@ margin-top: 10px;
</div> </div>
<!-- GPF --> <!-- GPF -->
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">GPF<span class="text-danger">*</span></label>
<label class="form-label fw-bold">GPF</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes" disabled> <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes" disabled>
@ -387,7 +387,7 @@ margin-top: 10px;
</div> </div>
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="gpfAmountDiv" class="mt-3" style="display: none;"> <div id="gpfAmountDiv" class="mt-3" style="display: none;">
<label for="gpfAmount" class="form-label">Enter GPF Amount<span class="text-danger">*</span></label>
<label for="gpfAmount" class="form-label">Enter GPF Amount</label>
<input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" readonly> <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" readonly>
</div> </div>
</div> </div>
@ -395,7 +395,7 @@ margin-top: 10px;
<!-- Earned Leave & Leave on Private Affairs --> <!-- Earned Leave & Leave on Private Affairs -->
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">Earned Leave & Leave on Private Affairs<span class="text-danger">*</span></label>
<label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -410,14 +410,14 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="earnedleaveAmountDiv" class="mt-3" style="display: none;"> <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
<label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount<span class="text-danger">*</span></label>
<label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount</label>
<input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" readonly> <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" readonly>
</div> </div>
</div> </div>
<!-- SPFGS --> <!-- SPFGS -->
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">SPFGS<span class="text-danger">*</span></label>
<label class="form-label fw-bold">SPFGS</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -432,7 +432,7 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="spfgsAmountDiv" class="mt-3" style="display: none;"> <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
<label for="spfgsAmount" class="form-label">Enter SPFGS Amount<span class="text-danger">*</span></label>
<label for="spfgsAmount" class="form-label">Enter SPFGS Amount</label>
<input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" readonly> <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" readonly>
</div> </div>
</div> </div>
@ -441,14 +441,14 @@ margin-top: 10px;
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label> <label for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
<input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee" readonly>
<input type="text" id="recoveryemployeevalue" class="form-control" readonly>
</div> </div>
<!-- DCRF File is Ready --> <!-- DCRF File is Ready -->
<div class="col-md-4"> <div class="col-md-4">
<label class="form-label fw-bold">DCRG File is Ready<span class="text-danger">*</span></label>
<label class="form-label fw-bold">DCRG File is Ready</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes" disabled> <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes" disabled>
@ -465,19 +465,19 @@ margin-top: 10px;
<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span> <span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span>
</div> </div>
<div class="col-md-6 mt-2 mb-2">
<label for="pensionNumber" class="form-label">Pension Number<span class="text-danger">*</span></label>
<div class="col-md-4 mt-2 mb-2">
<label for="pensionNumber" class="form-label">Pension Number</label>
<input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly> <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly>
</div> </div>
<div class="col-md-6 mt-2 mb-2">
<label for="ledgerNumber" class="form-label">Ledger Number<span class="text-danger">*</span></label>
<input type="number" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
<div class="col-md-4 mt-2 mb-2">
<label for="ledgerNumber" class="form-label">Ledger Number</label>
<input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
</div> </div>
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">Sanctions Pensions Benefit-Pension<span class="text-danger">*</span></label>
<label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -492,13 +492,13 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="PbAmountDiv" class="mt-3" style="display: none;"> <div id="PbAmountDiv" class="mt-3" style="display: none;">
<label for="benefit_pension_amount" class="form-label">Enter Pensions Benefit Amount<span class="text-danger">*</span></label>
<label for="benefit_pension_amount" class="form-label">Enter Pensions Benefit Amount</label>
<input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" readonly> <input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" readonly>
</div> </div>
</div> </div>
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG<span class="text-danger">*</span></label>
<label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -513,13 +513,13 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="dcrgAmountDiv" class="mt-3" style="display: none;"> <div id="dcrgAmountDiv" class="mt-3" style="display: none;">
<label for="benefit_dcrg_amount" class="form-label">Enter Benefit DCRG Amount<span class="text-danger">*</span></label>
<label for="benefit_dcrg_amount" class="form-label">Enter Benefit DCRG Amount</label>
<input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" readonly> <input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" readonly>
</div> </div>
</div> </div>
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation<span class="text-danger">*</span></label>
<label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -534,7 +534,7 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="CommutationAmountDiv" class="mt-3" style="display: none;"> <div id="CommutationAmountDiv" class="mt-3" style="display: none;">
<label for="benefit_commutation_amount" class="form-label">Enter Benefit Commutation Amount<span class="text-danger">*</span></label>
<label for="benefit_commutation_amount" class="form-label">Enter Benefit Commutation Amount</label>
<input type="number" id="benefit_commutation_amount" class="form-control" placeholder="Enter Pensions Benefit Commutation Amount" readonly> <input type="number" id="benefit_commutation_amount" class="form-control" placeholder="Enter Pensions Benefit Commutation Amount" readonly>
</div> </div>
</div> </div>
@ -689,6 +689,8 @@ margin-top: 10px;
} else { } else {
$('#spfgsAmountDiv').hide(); $('#spfgsAmountDiv').hide();
} }
//recover emp
$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
// DCRG File // DCRG File
$('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);

2
frontend/pensioner/pensioner/completed/gis.html
View File

@ -248,7 +248,7 @@ margin-top: 10px;
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<label for="gisentry" class="form-label fw-bold">GIS Entry Type<span class="text-danger">*</span></label>
<label for="gisentry" class="form-label fw-bold">GIS Entry Type</label>
<input type="text" id="gisentry" class="form-control" readonly> <input type="text" id="gisentry" class="form-control" readonly>
</div> </div>

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

@ -284,48 +284,48 @@ margin-top: 10px;
<!-- Employee No --> <!-- Employee No -->
<div class="col-md-4"> <div class="col-md-4">
<label for="employeenomodel" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
<label for="employeenomodel" class="form-label fw-bold">Employee No </label>
<input type="number" id="employeenomodel" class="form-control" readonly> <input type="number" id="employeenomodel" class="form-control" readonly>
</div> </div>
<!-- Employee Name --> <!-- Employee Name -->
<div class="col-md-4"> <div class="col-md-4">
<label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
<label for="employeename" class="form-label fw-bold">Employee Name </label>
<input type="text" id="employeename" class="form-control" readonly> <input type="text" id="employeename" class="form-control" readonly>
</div> </div>
<!-- Department --> <!-- Department -->
<div class="col-md-4"> <div class="col-md-4">
<label for="department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
<label for="department" class="form-label fw-bold">Department </label>
<input type="text" id="department" class="form-control" readonly> <input type="text" id="department" class="form-control" readonly>
</div> </div>
<!-- Designation --> <!-- Designation -->
<div class="col-md-4"> <div class="col-md-4">
<label for="designation" class="form-label fw-bold">Designation <span class="text-danger">*</span></label>
<label for="designation" class="form-label fw-bold">Designation </label>
<input type="text" id="designation" class="form-control" readonly> <input type="text" id="designation" class="form-control" readonly>
</div> </div>
<div class="col-md-4"> <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</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-4"> <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 </label>
<input type="date" id="retirementdate" class="form-control" readonly> <input type="date" id="retirementdate" class="form-control" readonly>
</div> </div>
<!-- Type of Retirement --> <!-- Type of Retirement -->
<div class="col-md-4"> <div class="col-md-4">
<label for="typeofretirement" class="form-label fw-bold">Type of Retirement <span class="text-danger">*</span></label>
<label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
<input type="text" id="typeofretirement" class="form-control" readonly> <input type="text" id="typeofretirement" class="form-control" readonly>
</div> </div>
<div class="col-md-4"> <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
<span class="text-danger">*</span>
</label> </label>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
@ -343,13 +343,13 @@ margin-top: 10px;
</div> </div>
<!-- Date File Sent to Audit --> <!-- Date File Sent to Audit -->
<div class="col-md-4"> <div class="col-md-4">
<label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit <span class="text-danger">*</span></label>
<label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit </label>
<input type="date" id="datefile_modal" class="form-control" readonly> <input type="date" id="datefile_modal" class="form-control" readonly>
</div> </div>
<!-- Remarks --> <!-- Remarks -->
<div class="col-md-12"> <div class="col-md-12">
<label for="remarks_modal" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
<label for="remarks_modal" class="form-label fw-bold">Comments/Remarks </label>
<textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea> <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
</div> </div>
@ -367,7 +367,7 @@ margin-top: 10px;
</div> </div>
<!-- GPF --> <!-- GPF -->
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">GPF<span class="text-danger">*</span></label>
<label class="form-label fw-bold">GPF</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes" disabled> <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes" disabled>
@ -384,7 +384,7 @@ margin-top: 10px;
</div> </div>
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="gpfAmountDiv" class="mt-3" style="display: none;"> <div id="gpfAmountDiv" class="mt-3" style="display: none;">
<label for="gpfAmount" class="form-label">Enter GPF Amount<span class="text-danger">*</span></label>
<label for="gpfAmount" class="form-label">Enter GPF Amount</label>
<input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" readonly> <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" readonly>
</div> </div>
</div> </div>
@ -392,7 +392,7 @@ margin-top: 10px;
<!-- Earned Leave & Leave on Private Affairs --> <!-- Earned Leave & Leave on Private Affairs -->
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">Earned Leave & Leave on Private Affairs<span class="text-danger">*</span></label>
<label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -407,14 +407,14 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="earnedleaveAmountDiv" class="mt-3" style="display: none;"> <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
<label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount<span class="text-danger">*</span></label>
<label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount</label>
<input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" readonly> <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" readonly>
</div> </div>
</div> </div>
<!-- SPFGS --> <!-- SPFGS -->
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">SPFGS<span class="text-danger">*</span></label>
<label class="form-label fw-bold">SPFGS</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -429,7 +429,7 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="spfgsAmountDiv" class="mt-3" style="display: none;"> <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
<label for="spfgsAmount" class="form-label">Enter SPFGS Amount<span class="text-danger">*</span></label>
<label for="spfgsAmount" class="form-label">Enter SPFGS Amount</label>
<input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" readonly> <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" readonly>
</div> </div>
</div> </div>
@ -438,14 +438,14 @@ margin-top: 10px;
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label> <label for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
<input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee" readonly>
<input type="text" id="recoveryemployeevalue" class="form-control" readonly>
</div> </div>
<!-- DCRF File is Ready --> <!-- DCRF File is Ready -->
<div class="col-md-4"> <div class="col-md-4">
<label class="form-label fw-bold">DCRG File is Ready<span class="text-danger">*</span></label>
<label class="form-label fw-bold">DCRG File is Ready</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes" disabled> <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes" disabled>
@ -462,19 +462,19 @@ margin-top: 10px;
<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span> <span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span>
</div> </div>
<div class="col-md-6 mt-2 mb-2">
<label for="pensionNumber" class="form-label">Pension Number<span class="text-danger">*</span></label>
<div class="col-md-4 mt-2 mb-2">
<label for="pensionNumber" class="form-label">Pension Number</label>
<input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly> <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly>
</div> </div>
<div class="col-md-6 mt-2 mb-2">
<label for="ledgerNumber" class="form-label">Ledger Number<span class="text-danger">*</span></label>
<input type="number" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
<div class="col-md-4 mt-2 mb-2">
<label for="ledgerNumber" class="form-label">Ledger Number</label>
<input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
</div> </div>
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">Sanctions Pensions Benefit-Pension<span class="text-danger">*</span></label>
<label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -489,13 +489,13 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="PbAmountDiv" class="mt-3" style="display: none;"> <div id="PbAmountDiv" class="mt-3" style="display: none;">
<label for="benefit_pension_amount" class="form-label">Enter Pensions Benefit Amount<span class="text-danger">*</span></label>
<label for="benefit_pension_amount" class="form-label">Enter Pensions Benefit Amount</label>
<input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" readonly> <input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" readonly>
</div> </div>
</div> </div>
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG<span class="text-danger">*</span></label>
<label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -510,13 +510,13 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="dcrgAmountDiv" class="mt-3" style="display: none;"> <div id="dcrgAmountDiv" class="mt-3" style="display: none;">
<label for="benefit_dcrg_amount" class="form-label">Enter Benefit DCRG Amount<span class="text-danger">*</span></label>
<label for="benefit_dcrg_amount" class="form-label">Enter Benefit DCRG Amount</label>
<input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" readonly> <input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" readonly>
</div> </div>
</div> </div>
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation<span class="text-danger">*</span></label>
<label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -531,7 +531,7 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="CommutationAmountDiv" class="mt-3" style="display: none;"> <div id="CommutationAmountDiv" class="mt-3" style="display: none;">
<label for="benefit_commutation_amount" class="form-label">Enter Benefit Commutation Amount<span class="text-danger">*</span></label>
<label for="benefit_commutation_amount" class="form-label">Enter Benefit Commutation Amount</label>
<input type="number" id="benefit_commutation_amount" class="form-control" placeholder="Enter Pensions Benefit Commutation Amount" readonly> <input type="number" id="benefit_commutation_amount" class="form-control" placeholder="Enter Pensions Benefit Commutation Amount" readonly>
</div> </div>
</div> </div>
@ -669,6 +669,8 @@ margin-top: 10px;
$('#spfgsAmountDiv').hide(); $('#spfgsAmountDiv').hide();
} }
//recover emp
$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
// DCRG File // DCRG File
$('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);

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

@ -274,42 +274,42 @@ margin-top: 10px;
<div class="row"> <div class="row">
<!-- Employee No --> <!-- Employee No -->
<div class="col-md-6"> <div class="col-md-6">
<label for="employeenomodel" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
<label for="employeenomodel" class="form-label fw-bold">Employee No </label>
<input type="number" id="employeenomodel" class="form-control" readonly> <input type="number" id="employeenomodel" class="form-control" readonly>
</div> </div>
<!-- Employee Name --> <!-- Employee Name -->
<div class="col-md-6"> <div class="col-md-6">
<label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
<label for="employeename" class="form-label fw-bold">Employee Name </label>
<input type="text" id="employeename" class="form-control" readonly> <input type="text" id="employeename" class="form-control" readonly>
</div> </div>
<!-- Department --> <!-- Department -->
<div class="col-md-6"> <div class="col-md-6">
<label for="department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
<label for="department" class="form-label fw-bold">Department </label>
<input type="text" id="department" class="form-control" readonly> <input type="text" id="department" class="form-control" readonly>
</div> </div>
<!-- Designation --> <!-- Designation -->
<div class="col-md-6"> <div class="col-md-6">
<label for="designation" class="form-label fw-bold">Designation <span class="text-danger">*</span></label>
<label for="designation" class="form-label fw-bold">Designation </label>
<input type="text" id="designation" class="form-control" readonly> <input type="text" id="designation" class="form-control" readonly>
</div> </div>
<!-- Class --> <!-- Class -->
<div class="col-md-6"> <div class="col-md-6">
<label for="classes" class="form-label fw-bold">Class<span class="text-danger">*</span></label>
<label for="classes" class="form-label fw-bold">Class</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-6">
<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 </label>
<input type="date" id="retirementdate" class="form-control" readonly> <input type="date" id="retirementdate" class="form-control" readonly>
</div> </div>
<!-- Type Of Retirement --> <!-- Type Of Retirement -->
<div class="col-md-6"> <div class="col-md-6">
<label for="typeofretirement" class="form-label fw-bold">Type Of Retirement<span class="text-danger">*</span></label>
<label for="typeofretirement" class="form-label fw-bold">Type Of Retirement</label>
<input type="text" id="typeofretirement" class="form-control" readonly> <input type="text" id="typeofretirement" class="form-control" readonly>
</div> </div>
@ -318,7 +318,7 @@ margin-top: 10px;
<!-- provisionalreason <!-- provisionalreason
otherReason --> otherReason -->
<div class="col-md-6"> <div class="col-md-6">
<label for="provisionalreason" class="form-label fw-bold">Reason For Provisional Pension is given <span class="text-danger">*</span></label>
<label for="provisionalreason" class="form-label fw-bold">Reason For Provisional Pension is given </label>
<input type="text" id="provisionalreason" class="form-control" readonly> <input type="text" id="provisionalreason" class="form-control" readonly>
<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:</label>
@ -331,13 +331,13 @@ margin-top: 10px;
<!-- Date File Sent to Pension Section --> <!-- Date File Sent to Pension Section -->
<div class="col-md-6"> <div class="col-md-6">
<label for="datefile_modal" class="form-label fw-bold">Date File Sent to Pension Section <span class="text-danger">*</span></label>
<label for="datefile_modal" class="form-label fw-bold">Date File Sent to Pension Section </label>
<input type="date" id="datefile_modal" class="form-control" readonly onclick="this.showPicker()"> <input type="date" id="datefile_modal" class="form-control" readonly onclick="this.showPicker()">
</div> </div>
<!-- Pending Duration --> <!-- Pending Duration -->
<div class="col-md-6"> <div class="col-md-6">
<label for="pendingDuration" class="form-label fw-bold">Pending Duration <span class="text-danger">*</span></label>
<label for="pendingDuration" class="form-label fw-bold">Pending Duration </label>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
<input type="radio" id="yespen" name="pendingDuration" value="Yes" class="form-check-input" disabled> <input type="radio" id="yespen" name="pendingDuration" value="Yes" class="form-check-input" disabled>
@ -356,7 +356,7 @@ margin-top: 10px;
<!-- dp --> <!-- dp -->
<div class="col-md-6"> <div class="col-md-6">
<label for="DP" class="form-label fw-bold">DP<span class="text-danger">*</span></label>
<label for="DP" class="form-label fw-bold">DP</label>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<div class="form-check " style="padding-right:10px;"> <div class="form-check " style="padding-right:10px;">
<input type="radio" id="yes" name="DP" value="yes" class="form-check-input" disabled> <input type="radio" id="yes" name="DP" value="yes" class="form-check-input" disabled>
@ -373,7 +373,7 @@ margin-top: 10px;
<!-- Retirement Amount --> <!-- Retirement Amount -->
<div class="col-md-6"> <div class="col-md-6">
<label for="RetirementAmount" class="form-label fw-bold"> <label for="RetirementAmount" class="form-label fw-bold">
Provisional Retirement Amount <span class="text-danger">*</span>
Provisional Retirement Amount
</label> </label>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<div class="form-check" style="padding-right:10px;"> <div class="form-check" style="padding-right:10px;">
@ -399,7 +399,7 @@ margin-top: 10px;
<!-- Remarks --> <!-- Remarks -->
<div class="col-md-12"> <div class="col-md-12">
<label for="remarks_modal" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
<label for="remarks_modal" class="form-label fw-bold">Comments/Remarks </label>
<textarea id="remarks_modal" class="form-control" rows="2" placeholder="Enter your remarks here" readonly></textarea> <textarea id="remarks_modal" class="form-control" rows="2" placeholder="Enter your remarks here" readonly></textarea>
</div> </div>

58
frontend/pensioner/pensioner/completed/retirement.html
View File

@ -284,54 +284,54 @@ margin-top: 10px;
<!-- Employee No --> <!-- Employee No -->
<div class="col-md-4"> <div class="col-md-4">
<label for="employeenomodel" class="form-label fw-bold">Employee No <span class="text-danger">*</span></label>
<label for="employeenomodel" class="form-label fw-bold">Employee No </label>
<input type="number" id="employeenomodel" class="form-control" readonly> <input type="number" id="employeenomodel" class="form-control" readonly>
</div> </div>
<!-- Employee Name --> <!-- Employee Name -->
<div class="col-md-4"> <div class="col-md-4">
<label for="employeename" class="form-label fw-bold">Employee Name <span class="text-danger">*</span></label>
<label for="employeename" class="form-label fw-bold">Employee Name </label>
<input type="text" id="employeename" class="form-control" readonly> <input type="text" id="employeename" class="form-control" readonly>
</div> </div>
<!-- Department --> <!-- Department -->
<div class="col-md-4"> <div class="col-md-4">
<label for="department" class="form-label fw-bold">Department <span class="text-danger">*</span></label>
<label for="department" class="form-label fw-bold">Department </label>
<input type="text" id="department" class="form-control" readonly> <input type="text" id="department" class="form-control" readonly>
</div> </div>
<!-- Designation --> <!-- Designation -->
<div class="col-md-4"> <div class="col-md-4">
<label for="designation" class="form-label fw-bold">Designation <span class="text-danger">*</span></label>
<label for="designation" class="form-label fw-bold">Designation </label>
<input type="text" id="designation" class="form-control" readonly> <input type="text" id="designation" class="form-control" readonly>
</div> </div>
<div class="col-md-4"> <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 </label>
<input type="date" id="retirementdate" class="form-control" readonly> <input type="date" id="retirementdate" class="form-control" readonly>
</div> </div>
<!-- Class --> <!-- Class -->
<div class="col-md-4"> <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 </label>
<input type="text" id="classes" class="form-control" readonly> <input type="text" id="classes" class="form-control" readonly>
</div> </div>
<!-- Type of Retirement --> <!-- Type of Retirement -->
<div class="col-md-4"> <div class="col-md-4">
<label for="typeofretirement" class="form-label fw-bold">Type of Retirement <span class="text-danger">*</span></label>
<label for="typeofretirement" class="form-label fw-bold">Type of Retirement </label>
<input type="text" id="typeofretirement" class="form-control" readonly> <input type="text" id="typeofretirement" class="form-control" readonly>
</div> </div>
<!-- Date File Sent to Audit --> <!-- Date File Sent to Audit -->
<div class="col-md-4"> <div class="col-md-4">
<label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit <span class="text-danger">*</span></label>
<label for="datefile_modal" class="form-label fw-bold">Date File Sent to Audit </label>
<input type="date" id="datefile_modal" class="form-control" readonly> <input type="date" id="datefile_modal" class="form-control" readonly>
</div> </div>
<!-- Remarks --> <!-- Remarks -->
<div class="col-md-12"> <div class="col-md-12">
<label for="remarks_modal" class="form-label fw-bold">Comments/Remarks <span class="text-danger">*</span></label>
<label for="remarks_modal" class="form-label fw-bold">Comments/Remarks </label>
<textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea> <textarea id="remarks_modal" class="form-control" rows="4" placeholder="Enter your remarks here" readonly></textarea>
</div> </div>
@ -349,7 +349,7 @@ margin-top: 10px;
</div> </div>
<!-- GPF --> <!-- GPF -->
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">GPF<span class="text-danger">*</span></label>
<label class="form-label fw-bold">GPF</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes" disabled> <input class="form-check-input" type="radio" id="gpfYes" name="gpf" value="yes" disabled>
@ -366,7 +366,7 @@ margin-top: 10px;
</div> </div>
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="gpfAmountDiv" class="mt-3" style="display: none;"> <div id="gpfAmountDiv" class="mt-3" style="display: none;">
<label for="gpfAmount" class="form-label">Enter GPF Amount<span class="text-danger">*</span></label>
<label for="gpfAmount" class="form-label">Enter GPF Amount</label>
<input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" readonly> <input type="number" id="gpfAmount" class="form-control" placeholder="Enter GPF amount" readonly>
</div> </div>
</div> </div>
@ -374,7 +374,7 @@ margin-top: 10px;
<!-- Earned Leave & Leave on Private Affairs --> <!-- Earned Leave & Leave on Private Affairs -->
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">Earned Leave & Leave on Private Affairs<span class="text-danger">*</span></label>
<label class="form-label fw-bold">Earned Leave & Leave on Private Affairs</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -389,14 +389,14 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="earnedleaveAmountDiv" class="mt-3" style="display: none;"> <div id="earnedleaveAmountDiv" class="mt-3" style="display: none;">
<label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount<span class="text-danger">*</span></label>
<label for="earnedleaveAmount" class="form-label">Enter EL and LPA Amount</label>
<input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" readonly> <input type="number" id="earnedleaveAmount" class="form-control" placeholder="Enter Amount" readonly>
</div> </div>
</div> </div>
<!-- SPFGS --> <!-- SPFGS -->
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">SPFGS<span class="text-danger">*</span></label>
<label class="form-label fw-bold">SPFGS</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -411,7 +411,7 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="spfgsAmountDiv" class="mt-3" style="display: none;"> <div id="spfgsAmountDiv" class="mt-3" style="display: none;">
<label for="spfgsAmount" class="form-label">Enter SPFGS Amount<span class="text-danger">*</span></label>
<label for="spfgsAmount" class="form-label">Enter SPFGS Amount</label>
<input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" readonly> <input type="number" id="spfgsAmount" class="form-control" placeholder="Enter spfgs Amount" readonly>
</div> </div>
</div> </div>
@ -420,14 +420,14 @@ margin-top: 10px;
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label> <label for="recoveryemployeevalue" class="form-label fw-bold">Recovery From Employee</label>
<input type="text" id="recoveryemployeevalue" class="form-control" placeholder="Enter Recovery From Employee" readonly>
<input type="text" id="recoveryemployeevalue" class="form-control" readonly>
</div> </div>
<!-- DCRF File is Ready --> <!-- DCRF File is Ready -->
<div class="col-md-4"> <div class="col-md-4">
<label class="form-label fw-bold">DCRG File is Ready<span class="text-danger">*</span></label>
<label class="form-label fw-bold">DCRG File is Ready</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes" disabled> <input class="form-check-input" type="radio" id="dcrgYes" name="dcrg" value="yes" disabled>
@ -444,19 +444,19 @@ margin-top: 10px;
<span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span> <span style="font-weight: bold;font-size: medium;text-decoration: underline;">Pension Benefits</span>
</div> </div>
<div class="col-md-6 mt-2 mb-2">
<label for="pensionNumber" class="form-label">Pension Number<span class="text-danger">*</span></label>
<div class="col-md-4 mt-2 mb-2">
<label for="pensionNumber" class="form-label">Pension Number</label>
<input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly> <input type="number" id="pensionNumber" class="form-control" placeholder="Enter Employee Pension Number" readonly>
</div> </div>
<div class="col-md-6 mt-2 mb-2">
<label for="ledgerNumber" class="form-label">Ledger Number<span class="text-danger">*</span></label>
<input type="number" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
<div class="col-md-4 mt-2 mb-2">
<label for="ledgerNumber" class="form-label">Ledger Number</label>
<input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number" readonly>
</div> </div>
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">Sanctions Pensions Benefit-Pension<span class="text-danger">*</span></label>
<label class="form-label fw-bold">Sanctions Pensions Benefit-Pension</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -471,13 +471,13 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="PbAmountDiv" class="mt-3" style="display: none;"> <div id="PbAmountDiv" class="mt-3" style="display: none;">
<label for="benefit_pension_amount" class="form-label">Enter Pensions Benefit Amount<span class="text-danger">*</span></label>
<label for="benefit_pension_amount" class="form-label">Enter Pensions Benefit Amount</label>
<input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" readonly> <input type="number" id="benefit_pension_amount" class="form-control" placeholder="Enter Pensions Benefit Amount" readonly>
</div> </div>
</div> </div>
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG<span class="text-danger">*</span></label>
<label class="form-label fw-bold">Sanctions Pensions Benefit-DCRG</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -492,13 +492,13 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="dcrgAmountDiv" class="mt-3" style="display: none;"> <div id="dcrgAmountDiv" class="mt-3" style="display: none;">
<label for="benefit_dcrg_amount" class="form-label">Enter Benefit DCRG Amount<span class="text-danger">*</span></label>
<label for="benefit_dcrg_amount" class="form-label">Enter Benefit DCRG Amount</label>
<input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" readonly> <input type="number" id="benefit_dcrg_amount" class="form-control" placeholder="Enter Pensions Benefit DCRG Amount" readonly>
</div> </div>
</div> </div>
<div class="col-md-4 mb-2"> <div class="col-md-4 mb-2">
<label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation<span class="text-danger">*</span></label>
<label class="form-label fw-bold">Sanctions Pensions Benefit-Commutation</label>
<div class="d-flex align-items-center gap-5"> <div class="d-flex align-items-center gap-5">
<div class="form-check"> <div class="form-check">
@ -513,7 +513,7 @@ margin-top: 10px;
<!-- Placeholder for dynamically added input --> <!-- Placeholder for dynamically added input -->
<div id="CommutationAmountDiv" class="mt-3" style="display: none;"> <div id="CommutationAmountDiv" class="mt-3" style="display: none;">
<label for="benefit_commutation_amount" class="form-label">Enter Benefit Commutation Amount<span class="text-danger">*</span></label>
<label for="benefit_commutation_amount" class="form-label">Enter Benefit Commutation Amount</label>
<input type="number" id="benefit_commutation_amount" class="form-control" placeholder="Enter Pensions Benefit Commutation Amount" readonly> <input type="number" id="benefit_commutation_amount" class="form-control" placeholder="Enter Pensions Benefit Commutation Amount" readonly>
</div> </div>
</div> </div>
@ -631,6 +631,8 @@ margin-top: 10px;
} else { } else {
$('#spfgsAmountDiv').hide(); $('#spfgsAmountDiv').hide();
} }
//recover emp
$('#recoveryemployeevalue').val(employeeDetails.recovery_emp);
// DCRG File // DCRG File
$('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true); $('input[name="dcrg"][value="' + employeeDetails.dcrg + '"]').prop('checked', true);

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

@ -414,7 +414,7 @@ margin-top: 10px;
<div class="col-md-4 mt-2 mb-2"> <div class="col-md-4 mt-2 mb-2">
<label for="ledgerNumber" class="form-label">Ledger Number<span class="text-danger">*</span></label> <label for="ledgerNumber" class="form-label">Ledger Number<span class="text-danger">*</span></label>
<input type="textr" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
<input type="text" id="ledgerNumber" class="form-control" placeholder="Enter Ledger Number">
</div> </div>
</div> </div>

3
frontend/pensioner/pensioner/received/familypension.html
View File

@ -806,8 +806,9 @@ margin-top: 10px;
$('input[name="filepending"][value="' + BenefitDetails.file_pending + '"]').prop('checked', true); $('input[name="filepending"][value="' + BenefitDetails.file_pending + '"]').prop('checked', true);
$('#filependingContainer').show(); $('#filependingContainer').show();
$('#datefileyes').val(BenefitDetails.file_moved_date); $('#datefileyes').val(BenefitDetails.file_moved_date);
$('#remarksyes').val(BenefitDetails.remarks);
$('#remarksyes').val(BenefitDetails.remarks).prop('readonly', true); // Make readonly
$('#pendingbutton').prop('disabled', true); $('#pendingbutton').prop('disabled', true);
$('#pendingbutton').hide();
} else { } else {
$('input[name="filepending"]').prop('checked', false); $('input[name="filepending"]').prop('checked', false);
document.getElementById("receivedcard").style.display = "none"; document.getElementById("receivedcard").style.display = "none";

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

@ -704,6 +704,8 @@ margin-top: 10px;
// Set max attribute to disable future dates // Set max attribute to disable future dates
servicedeathInput.setAttribute("max", today); servicedeathInput.setAttribute("max", today);
// Set the max attribute to disable future dates
document.getElementById("sanctionalGISDate").setAttribute("max", today);
// Prevent manual future date entry // Prevent manual future date entry
servicedeathInput.addEventListener("change", function () { servicedeathInput.addEventListener("change", function () {

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

@ -358,7 +358,7 @@ margin-top: 10px;
<!-- Remarks --> <!-- Remarks -->
<div class="col-md-12"> <div class="col-md-12">
<label for="remarks_modal" class="form-label fw-bold">Remarks </label>
<label for="remarks_modal" class="form-label fw-bold">Comments/Remarks</label>
<textarea id="remarks_modal" class="form-control" rows="4" readonly></textarea> <textarea id="remarks_modal" class="form-control" rows="4" readonly></textarea>
</div> </div>
</div> </div>
@ -408,7 +408,7 @@ margin-top: 10px;
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<label for="remarksyes" class="form-label fw-bold">Remarks<span class="text-danger">*</span></label>
<label for="remarksyes" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span></label>
<textarea id="remarksyes" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea> <textarea id="remarksyes" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea>
</div> </div>
</div> </div>
@ -503,7 +503,7 @@ margin-top: 10px;
<div class="col-md-12"> <div class="col-md-12">
<label for="remarksreceived" class="form-label fw-bold">Remarks<span class="text-danger">*</span></label>
<label for="remarksreceived" class="form-label fw-bold">Comments/Remarks<span class="text-danger">*</span></label>
<textarea id="remarksreceived" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea> <textarea id="remarksreceived" class="form-control" rows="4" placeholder="Enter your remarks here"></textarea>
</div> </div>
@ -528,7 +528,7 @@ margin-top: 10px;
<!-- Remarks --> <!-- Remarks -->
<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>
@ -804,7 +804,8 @@ margin-top: 10px;
$('#filependingContainer').show(); $('#filependingContainer').show();
$('#datefileyes').val(BenefitDetails.file_moved_date); $('#datefileyes').val(BenefitDetails.file_moved_date);
$('#remarksyes').val(BenefitDetails.remarks); $('#remarksyes').val(BenefitDetails.remarks);
$('#pendingbutton').prop('disabled', true);
$('#pendingbutton').prop('disabled', true);
$('#pendingbutton').hide();
} else { } else {
$('input[name="filepending"]').prop('checked', false); $('input[name="filepending"]').prop('checked', false);
document.getElementById("receivedcard").style.display = "none"; document.getElementById("receivedcard").style.display = "none";

3
frontend/pensioner/pensioner/received/retirement.html
View File

@ -756,7 +756,8 @@ margin-top: 10px;
$('#filependingContainer').show(); $('#filependingContainer').show();
$('#datefileyes').val(BenefitDetails.file_moved_date); $('#datefileyes').val(BenefitDetails.file_moved_date);
$('#remarksyes').val(BenefitDetails.remarks); $('#remarksyes').val(BenefitDetails.remarks);
$('#pendingbutton').prop('disabled', true);
$('#pendingbutton').prop('disabled', true);
$('#pendingbutton').hide();
} else { } else {
$('input[name="filepending"]').prop('checked', false); $('input[name="filepending"]').prop('checked', false);
document.getElementById("receivedcard").style.display = "none"; document.getElementById("receivedcard").style.display = "none";

Write Preview
Loading…
Cancel
Save