From f6be56e88c8c03dafa944a72897bf83aa967d497 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Fri, 13 Sep 2024 18:26:09 +0530 Subject: [PATCH] CHANGE_TRACKER_ISSUE_4 --- app/Views/addEmployeenew.php | 19 - app/Views/editEmployeenew.php | 1696 +++++++++++++++++---------------- 2 files changed, 849 insertions(+), 866 deletions(-) diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index 38b68481..227b5bfd 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -848,25 +848,6 @@ onkeypress="return alpha(event);"> - - -
-
ESI Number - -
-
-
-
- ESI Rate(%) - * -
diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index 15f886d5..b0031ffe 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -141,902 +141,904 @@ if (!empty($EmpDetails)) {
-
-
-
-
-

Edit Employee

- Back -
+
+
+
+

Edit Employee

-
-
-
-
-
- +
+ Back +
-
+
-
+
+
+
+
+
+ -
-
+
-
+
-
- your image
- - + +
- - +
+
+ your image
+ + + + + + +
+ +

+ +
+ Employee ID* + +
+ +
+ + + name="isactive" value="1"> Is Active +
+ + +
+ + + + +
+ +
+ +
+ Full Name* +
-

- -
- Employee ID* - +
+ Father / Husband Name* +
-
- - - name="isactive" value="1"> Is Active +
+ Contact Number* +
-
+
- -
- -
- -
- Full Name* - -
- -
- Father / Husband Name* - -
- -
- Contact Number* - -
- -
- - -
- -
- Gender* - + + + ConfigValue; ?> + + + + + - + + - -
- -
- Date Of Birth* - -
- -
- Age* - -
- +
+
+ Date Of Birth* + +
-
+
+ Age* + +
-
- Personal Email ID - -
+
-
- Official Email ID - -
-
+
- Blood group* - +
+ +
+ Official Email ID + +
+ +
+ + Blood group* + -
+ + +
-
-
- Marital Status* - + + + ConfigValue; ?> + + + + + - - -
+ + + +
-
- Current Address* - -
+
+ Current Address* + +
-
- Permanent Address* - -
+
+ Permanent Address* + +
+ +
+ +
+ +
+ Emergency Contact Name + +
+ +
+ Emergency Contact Number + +
+ +
+ Current address same as permanent + address +
+ +
+ + +
+
+ + + +
+ +
+
+
+
+
+
+
+
+ Designation* + + + +
+
+ Department* + + +
+
+ Date Of Joining* + +
+
+ Previous Years of Experience + +
+
+ + +
+
+
+
+
+
+
+ +
+ Qualification* + +
+ + + + + +
+ Work Location* +
-
- -
- Emergency Contact Name - +
+
+ Management + Team +
+
+
-
- Emergency Contact Number - + + +
+
+ + + +
+ +
+
+ +
+
+
+
+
+
+ Bank Name + + +
+
+ Account Number + +
+
+ IFSC Code + +
+
+ Bank Address + +
+
+
+ + +
+ +
+
+
+
+
+
+
+ + Total Salary + * + + + +
+
+
+
+ Basic Pay + * + + +
+
+
+
+ HRA Rate(%) + * + + + +
+
+
+
+ HRA Amount + * + + + +
+
+ +
+
+ +
+ +
+
+
+
+
+
+ ESI Number +
- -
- Current address same as permanent - address -
-
+
+
+ ESI Rate(%) + * + -
-
- - - -
- -
-
-
-
-
-
-
-
- Designation* - - - -
-
- Department* - - -
-
- Date Of Joining* - -
-
- Previous Years of Experience -
- - -
-
-
-
-
-
-
- -
- Qualification* - -
- - - - - -
- Work Location* - - -
- -
-
- Management - Team - -
-
-
- -
- - -
-
- -
- -
- -
-
- -
-
-
-
-
-
- Bank Name - - -
-
- Account Number - -
-
- IFSC Code - -
-
- Bank Address - -
-
-
- - -
- -
-
-
-
-
-
-
- - Total Salary - * - - - -
-
-
-
- Basic Pay - * - - -
-
-
-
- HRA Rate(%) - * - - - -
-
-
-
- HRA Amount - * - - - -
-
- -
-
- -
- -
-
-
-
-
-
- ESI Number - -
-
-
-
- ESI Rate(%) - * - - - -
-
-
-
- UAN - -
-
- -
-
- PF Rate(%) - * - - -
-
-
-
-
- -
-
-
-
-
-
- ESI - Applicable - -
-
- -
-
- PF - Applicable - -
-
-
-
-
- - - - -
- -
- -
-
-
-
-
-
-
-
- Aadhar Number * - -
-
- PAN Number - -
-
- Passport Number - -
-
- Passport Expiry Date - -
- -
-
-
-
-
-
-
-
-
- Voter ID - -
-
- Driving License - - +
+ UAN +
+
+ +
+
+ PF Rate(%) + * + -
- Driving License Expiry Date -
- -
- Nominee reference - -
- -
+
- - -
+
+
+
+
+
+
+ ESI + Applicable + +
+
-
-
-
-
+
+
+ PF + Applicable + +
+
-
- - - - 0) { ?> +
+
- $value) { ?> + +
+ +
-
-
- File Name - -
-
- - - -
-
- - -
- -
+
+
+
+
+
+
+
+
+ Aadhar Number * + +
+
+ PAN Number + +
+
+ Passport Number + +
+
+ Passport Expiry Date + +
+ +
+
+
+
+
+
+
+
+
+ Voter ID + +
+
+ Driving License + + +
+ +
+ Driving License Expiry Date + +
+ +
+ Nominee reference + +
+ + +
+
+
+ +
+ +
+ +
+
+
+
+
+
+ + + + 0) { ?> + +
+ +
+ + $value) { ?> -
File Name - +
-
- File - +
+ + +
-
- +
+
- + +
+
+ File Name + +
+
+ File + +
+
+ +
+
-
- - -
+ + +
+ +
+
- - -
+ +
-
-
-
-
-
-
+
+
+
+
+
+
@@ -1045,7 +1047,7 @@ if (!empty($EmpDetails)) { if (input.files && input.files[0]) { var reader = new FileReader(); - reader.onload = function(e) { + reader.onload = function (e) { $('#profilepicture') .attr('src', e.target.result) .width(166) @@ -1057,8 +1059,8 @@ if (!empty($EmpDetails)) { } } - $(function() { - $('#checksame').click(function() { + $(function () { + $('#checksame').click(function () { if ($('#checksame').prop('checked')) { $('#permanentaddress').val($('#currentaddress').val()); @@ -1397,7 +1399,7 @@ if (!empty($EmpDetails)) { } - $(function() { + $(function () { var d = new Date(); var month = d.getMonth(); @@ -1459,7 +1461,7 @@ if (!empty($EmpDetails)) { } - $(document).ready(function() { + $(document).ready(function () { $("#gender").select2(); $("#bloodgroup").select2(); $("#MartialStatus").select2(); @@ -1467,7 +1469,7 @@ if (!empty($EmpDetails)) { $("#departmentname").select2(); $("#eduqualifaction").select2(); $("#work_location").select2(); - document.getElementById('aadharno').addEventListener('input', function(e) { + document.getElementById('aadharno').addEventListener('input', function (e) { e.target.value = e.target.value.replace(/[^\d]/g, '').replace(/(.{4})/g, '$1 ').trim(); }); }); @@ -1548,7 +1550,7 @@ if (!empty($EmpDetails)) { }, type: "POST", url: "deleteEmployeeFile", - success: function(data) { + success: function (data) { if (data) { alert("File removed"); return false; @@ -1571,7 +1573,7 @@ if (!empty($EmpDetails)) { } - $("#email").change(function() { + $("#email").change(function () { var id = $('#email').val(); if (validateEmail()) { @@ -1582,7 +1584,7 @@ if (!empty($EmpDetails)) { type: "POST", url: "employeedetails/CheckEmail", - success: function(data) { + success: function (data) { if (data) { alert(data + "" + " Employee already exists in the database.Please Change the mail id"); @@ -1595,7 +1597,7 @@ if (!empty($EmpDetails)) { } }); - $('#panno').change(function() { + $('#panno').change(function () { var id = $('#panno').val(); if (id != '') { @@ -1606,7 +1608,7 @@ if (!empty($EmpDetails)) { type: "POST", url: "employeedetails/checkPAN", - success: function(data) { + success: function (data) { if (data) { alert(data + "" + " Employee already exists in the database.Please Change the Pan Card Number" @@ -1622,7 +1624,7 @@ if (!empty($EmpDetails)) { } }); - $('#aadharno').change(function() { + $('#aadharno').change(function () { var id = $('#aadharno').val(); if (id != '') { @@ -1632,7 +1634,7 @@ if (!empty($EmpDetails)) { }, type: "POST", url: "employeedetails/checkAadharNo", - success: function(data) { + success: function (data) { if (data) { alert(data + "" + " Employee already exists in the database.Please Change the Aadhar card Number" @@ -1649,7 +1651,7 @@ if (!empty($EmpDetails)) { }); - $('#bankbranchname').change(function() { + $('#bankbranchname').change(function () { var bank = $('#bankbranchname').val(); @@ -1657,7 +1659,7 @@ if (!empty($EmpDetails)) { var y = ; - $.each(y, function(idx, obj) { + $.each(y, function (idx, obj) { if (bank == obj.Bank_name) { $("#ifsccode").val(obj.IFSC); @@ -1670,8 +1672,8 @@ if (!empty($EmpDetails)) { }); - $(document).ready(function() { - $('.next').click(function(e) { + $(document).ready(function () { + $('.next').click(function (e) { e.preventDefault(); // Prevent default action var isValid = true; @@ -1680,7 +1682,7 @@ if (!empty($EmpDetails)) { var $forms = $('.tab-pane form'); // Validate all forms before proceeding - $forms.each(function(index) { + $forms.each(function (index) { var $form = $(this); if (index <= currentIndex) { // Only validate forms up to the current tab @@ -1711,12 +1713,12 @@ if (!empty($EmpDetails)) { } }); - $('.submit').click(function(e) { + $('.submit').click(function (e) { e.preventDefault(); var isValid = true; var combinedFormData = new FormData(); var formIds = ['#accountForm', '#profileForm', '#bankForm', '#proofForm', '#fileForm']; // Add all your form IDs here - formIds.forEach(function(formId) { + formIds.forEach(function (formId) { var $form = $(formId); if (!$form[0].checkValidity()) { @@ -1725,13 +1727,13 @@ if (!empty($EmpDetails)) { return false; // Break the loop if any form is invalid } // Append the form data to FormData - $form.serializeArray().forEach(function(field) { + $form.serializeArray().forEach(function (field) { combinedFormData.append(field.name, field.value); }); // Handle file inputs separately - $form.find('input[type="file"]').each(function() { + $form.find('input[type="file"]').each(function () { var input = $(this); - $.each(input[0].files, function(i, file) { + $.each(input[0].files, function (i, file) { combinedFormData.append(input.attr('name'), file); }); }); @@ -1749,7 +1751,7 @@ if (!empty($EmpDetails)) { data: combinedFormData, processData: false, // Prevent jQuery from processing the data contentType: false, // Prevent jQuery from setting the content type - success: function(response) { + success: function (response) { console.log(response); console.log('Form submitted successfully:', response == 'true'); @@ -1759,7 +1761,7 @@ if (!empty($EmpDetails)) { alert('Employee details Not Update...'); } }, - error: function(error) { + error: function (error) { console.log('Form submission failed:', error); } }); @@ -1780,7 +1782,7 @@ if (!empty($EmpDetails)) { } // Handle form submission - $('#fileForm').on('submit', function(event) { + $('#fileForm').on('submit', function (event) { event.preventDefault(); // Prevent default form submission // Your form submission logic here });