From 7f69a7abeddd0509cda26b3b33d6408b90602d04 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 17 May 2025 10:45:06 +0000 Subject: [PATCH] Assigned issues fixes --- app/Controllers/Employeedetails.php | 4 +- app/Models/Dashboard_model.php | 2 +- app/Views/addEmployeenew.php | 89 ++++++++++++----------------- app/Views/editEmployeenew.php | 62 ++++++++++---------- 4 files changed, 73 insertions(+), 84 deletions(-) diff --git a/app/Controllers/Employeedetails.php b/app/Controllers/Employeedetails.php index d6fb02f1..50c2e40a 100755 --- a/app/Controllers/Employeedetails.php +++ b/app/Controllers/Employeedetails.php @@ -279,9 +279,9 @@ class Employeedetails extends BaseController $Nominee = $this->request->getPost('nomineename'); $createdby = $this->session->get('userId'); $is_management_team = $this->request->getPost('is_management_team'); - $is_management_team = ($is_management_team != '') ? '1' : '0'; + $is_management_team = ($is_management_team === '1') ? '1' : '0'; $is_driver = $this->request->getPost('is_driver'); - $is_driver = ($is_driver != '') ? '1' : '0'; + $is_driver = ($is_driver === '1') ? '1' : '0'; $TDS_Rate = $this->request->getPost('TDS_Rate'); $tds_applicable=$this->request->getPost('tds_applicable'); diff --git a/app/Models/Dashboard_model.php b/app/Models/Dashboard_model.php index 2a85ed61..12a3925f 100755 --- a/app/Models/Dashboard_model.php +++ b/app/Models/Dashboard_model.php @@ -2234,7 +2234,7 @@ join t_purchaseorder_master po on po.PONO = pl.PONO join t_supplierdetailsn sup on sup.SupplierID=po.SupplierID join t_materialmaster mm on mm.MaterialCode=pl.MaterialCode join t_configdetails cd on cd.key = mm.Category -where po.Status != 'ST030' and po.Status = 'ST026' and (po.IsOpenOrder IS NULL OR po.IsOpenOrder = 1) +where po.Status != 'ST030' and po.Status = 'ST026' and (po.IsOpenOrder IS NULL OR po.IsOpenOrder = 0) "; if ($cname != '') { diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index 0aa07060..26a5cbe3 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -1350,10 +1350,10 @@ success: function(response) { $('#loader').hide(); // Hide the loader after a successful response - let responseCheck = response.data[0]; - let responseEmail=response.data[0].EmailId; + let responseCheck = response.data; - if(responseCheck ){ + if (responseCheck && responseCheck.length > 0) { + let responseEmail=response.data[0].EmailId; if ( responseEmail == emailId) { @@ -1405,22 +1405,22 @@ if (getMobileValidation()) { success: function(response) { $('#loader').hide(); - let responseCheck = response.data[0]; - let responseContactNumber=response.data[0].ContactNumber; + let responseCheck = response.data; + if (responseCheck && responseCheck.length > 0) { + let responseContactNumber=response.data[0].ContactNumber; - if(responseCheck ){ - if (responseContactNumber == ContactNumber) { - - var answer = confirm(" Contact Number details is already exists !!.Kindly Provide us another Contact Number" - ) - - $('#ContactNumber').val(''); - $('#ContactNumber').focus(); - return false; - + if (responseContactNumber == ContactNumber) { + var answer = confirm( + " Contact Number details is already exists !!.Kindly Provide us another Contact Number" + ); - } - } + $('#ContactNumber').val(''); + $('#ContactNumber').focus(); + + return; + } + } + }, complete: function() { @@ -1447,27 +1447,21 @@ if (getMobileValidation()) { success: function(response) { $('#loader').hide(); - let responseCheck = response.data[0]; - let responsePanNo=response.data[0].PANNo; + let responseCheck = response.data; + if (responseCheck && responseCheck.length > 0) { + let responsePanNo=response.data[0].PANNo; - if(responseCheck ){ if (responsePanNo == panNo) { - // alert( data+""+" Employee already exists in the database.Please Change the Pan Card Number"); - // $('#panno').val(''); - // $('#panno').focus(); + var answer = confirm( + " Pan Number details is already exists !!.Kindly Provide us another Pan Number" + ); - var answer = confirm( - " Pan Number details is already exists !!.Kindly Provide us another Pan Number" - ) - $('#panno').val(''); $('#panno').focus(); - return false; - - } - } - + return; + } + } }, complete: function() { $('#loader').hide(); // Ensure the loader is always hidden after the request completes @@ -1492,29 +1486,22 @@ if (getMobileValidation()) { url: "employeecheckAadharNoExist", success: function(response) { $('#loader').hide(); - + let responseCheck = response.data; - let responseCheck = response.data[0]; - let responseAadharNo=response.data[0].AadharNo; - + if (responseCheck && responseCheck.length > 0) { + let responseAadharNo = responseCheck[0].AadharNo; - //let response=response.data[0]; - if(responseCheck ){ - if ( responseAadharNo == aadharNo) { - + if (responseAadharNo == aadharNo) { + var answer = confirm( + " Aadhar details is already exists !!.Kindly Change Aadhar Details" + ); - var answer = confirm( - " Aadhar details is already exists !!.Kindly Change Aadhar Details" - ) - - $('#aadharno').val(''); - $('#aadharno').focus(); - return false; - + $('#aadharno').val(''); + $('#aadharno').focus(); - } - } - + return; + } + } }, complete: function() { $('#loader').hide(); // Ensure the loader is always hidden after the request completes diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index 0a9752aa..2e6397f5 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -1941,17 +1941,19 @@ if (!empty($EmpDetails)) { success: function (response) { $('#loader').hide(); // Hide the loader after a successful response - let responseCheck = response.data[0]; - let responseEmail = response.data[0].EmailId; + let responseCheck = response.data; + if (responseCheck && responseCheck.length > 0) { + let responseEmail = response.data[0].EmailId; - if (responseCheck) { if (responseEmail == emailId) { - alert( - "Another Employee already exists !!.Please Change the mail id"); + var answer = confirm( + "Another Employee already exists !!.Please Change the mail id" + ); + $("#email").val(''); $("#email").focus(); - return false; + return; } } @@ -1979,22 +1981,21 @@ if (getMobileValidation() && ContactNumber != "") { success: function(response) { $('#loader').hide(); - let responseCheck = response.data[0]; - let responseContactNumber=response.data[0].ContactNumber; + let responseCheck = response.data; + if (responseCheck && responseCheck.length > 0) { + let responseContactNumber=response.data[0].ContactNumber; - if(responseCheck ){ - if (responseContactNumber == ContactNumber) { - - var answer = confirm(" Contact Number details is already exists !!.Kindly Provide us another Contact Number" - ) - - $('#ContactNumber').val(''); - $('#ContactNumber').focus(); - return false; + if (responseContactNumber == ContactNumber) { + var answer = confirm( + " Contact Number details is already exists !!.Kindly Provide us another Contact Number" + ); - } - } + $('#ContactNumber').val(''); + $('#ContactNumber').focus(); + return; + } + } }, complete: function() { $('#loader').hide(); // Ensure the loader is always hidden after the request completes @@ -2020,17 +2021,19 @@ if (getMobileValidation() && ContactNumber != "") { success: function (response) { $('#loader').hide(); - let responseCheck = response.data[0]; - let responsePanNo = response.data[0].PANNo; + let responseCheck = response.data; + if (responseCheck && responseCheck.length > 0) { + let responsePanNo = response.data[0].PANNo; - if (responseCheck) { if (responsePanNo == panNo) { - alert( + var answer = confirm( " Employee with this pan number already exists in the database.Please Change the Pan Card Number" ); + $('#panno').val(''); $('#panno').focus(); + return; } } @@ -2056,21 +2059,20 @@ if (getMobileValidation() && ContactNumber != "") { url: "employeecheckAadharNoExist", success: function (response) { $('#loader').hide(); + let responseCheck = response.data; + if (responseCheck && responseCheck.length > 0) { + let responseAadharNo = responseCheck[0].AadharNo; - let responseCheck = response.data[0]; - let responseAadharNo = response.data[0].AadharNo; - - - //let response=response.data[0]; - if (responseCheck) { if (responseAadharNo == aadharNo) { - alert( + var answer = confirm( "Another Employee with this aadhar number already exists ..!!.Please Change the Aadhar card Number" ); + $('#aadharno').val(''); $('#aadharno').focus(); + return; } } }