diff --git a/app/Controllers/Assetdetails.php b/app/Controllers/Assetdetails.php index a837f714..ddd3a208 100755 --- a/app/Controllers/Assetdetails.php +++ b/app/Controllers/Assetdetails.php @@ -346,7 +346,9 @@ class Assetdetails extends BaseController function checkAssetName(){ $data = $this->request->getPost(); - $result = $this->assetdetails_model->checkAssetName($data['assetName']); + $assetId = $data['assetId']??''; + $assetName = str_replace(" ","",$data['assetName']) ; + $result = $this->assetdetails_model->checkAssetName($assetId,$assetName); return $this->response->setJSON($result); } diff --git a/app/Controllers/Configurationctrl.php b/app/Controllers/Configurationctrl.php index 2a583b2b..68061b09 100755 --- a/app/Controllers/Configurationctrl.php +++ b/app/Controllers/Configurationctrl.php @@ -159,9 +159,12 @@ class Configurationctrl extends BaseController public function configNameCheck(){ $data = $this->request->getPost(); - $configName = ($data['configName']); + $configName = str_replace(" ","",$data['configName']); + $configId = $data['configId']; - $result = $this->configmodel->configNameCheck($configName); + $result = $this->configmodel->configNameCheck($configId,$configName); + + // dd($result); return $this->response->setJSON($result); diff --git a/app/Controllers/CostCenter.php b/app/Controllers/CostCenter.php index 62393226..c5825f51 100755 --- a/app/Controllers/CostCenter.php +++ b/app/Controllers/CostCenter.php @@ -136,7 +136,11 @@ class CostCenter extends BaseController function checkCostCenter(){ $data = $this->request->getPost(); - $result = $this->costcenter_model->checkCostCenter( $data['CostCenterName']); + + $CostCenterId = $data['CostCenterId']; + $CostCenterName = $data['CostCenterName']; + + $result = $this->costcenter_model->checkCostCenter( $CostCenterId,$CostCenterName); return $this->response->setJSON($result); } diff --git a/app/Controllers/Department.php b/app/Controllers/Department.php index 79866a19..0c2daa07 100755 --- a/app/Controllers/Department.php +++ b/app/Controllers/Department.php @@ -250,8 +250,10 @@ class Department extends BaseController function checkDepartmentName(){ $data = $this->request->getPost(); + $departmentName = str_replace(" ","",$data['departmentName']); + $depCode =$data['depCode']; $departmentName = $data['departmentName']; - $result = $this->department_model->checkDepartmentName($departmentName); + $result = $this->department_model->checkDepartmentName($depCode,$departmentName); return $this->response->setJSON($result); } diff --git a/app/Controllers/FactoryMachineController.php b/app/Controllers/FactoryMachineController.php index 41784c63..002f78dd 100644 --- a/app/Controllers/FactoryMachineController.php +++ b/app/Controllers/FactoryMachineController.php @@ -177,9 +177,11 @@ class FactoryMachineController extends BaseController $data = $this->request->getPost(); - $machineName = $data['machineName']; + $machineId = $data['machineId']; - $result = $this->factoryMachineMaster_model->where('machine_name',$machineName)->find(); + $machineName = str_replace(" ","", $data['machineName']); + + $result = $this->factoryMachineMaster_model->checkMachineName($machineId , $machineName); return $this->response->setJSON($result); diff --git a/app/Controllers/Rawmaterialdetails.php b/app/Controllers/Rawmaterialdetails.php index 85c9754a..e8e6744b 100755 --- a/app/Controllers/Rawmaterialdetails.php +++ b/app/Controllers/Rawmaterialdetails.php @@ -414,14 +414,16 @@ class Rawmaterialdetails extends BaseController function checkmaterial() { - $material = $this->request->getPost('id'); + $data = $this->request->getPost(); + $materialCode = $data['materialCode'] ?? ''; + $materialName = str_replace(' ', '', $data['materialName']); + $this->rawmaterialdetails_model = new rawmaterialdetails_model();; - $query = $this->rawmaterialdetails_model->checkMaterialExists($material); + $query = $this->rawmaterialdetails_model->checkMaterialExists($materialCode , $materialName); + + return $this->response->setJSON($query); - //if(!empty($material)){ - // echo json_encode($query); - //} } function exportmaterial() diff --git a/app/Controllers/Supplier.php b/app/Controllers/Supplier.php index 60800309..2e0a5441 100755 --- a/app/Controllers/Supplier.php +++ b/app/Controllers/Supplier.php @@ -309,11 +309,17 @@ class Supplier extends BaseController function checksupplier() { + + $supp_id = $this->request->getPost('supplierId') ?? ''; - $supp_name = $this->request->getPost('id'); + $supp_name = $this->request->getPost('supplierName'); + + $supp_name = str_replace(' ', '', $supp_name); - $query = $this->supplier_model->checkSupplierExists($supp_name); + $query = $this->supplier_model->checkSupplierExists($supp_id , $supp_name); + + return $this->response->setJSON($query); } @@ -467,11 +473,14 @@ class Supplier extends BaseController * check the Transporter exists? */ - function checkTransporter(){ + function checkTransporter(){ $data = $this->request->getPost(); - $message = $this->supplier_model->checkTransporter($data['transportername']); - return $this->response->setJSON($message); + $transporterId = $data['transporterid']??''; + $transporterName = $data['transportername']; + $message = $this->supplier_model->checkTransporter($transporterId,$transporterName); + + return $this->response->setJSON($message); } diff --git a/app/Models/Assetdetails_model.php b/app/Models/Assetdetails_model.php index ec3b3d0e..4cd4dee9 100755 --- a/app/Models/Assetdetails_model.php +++ b/app/Models/Assetdetails_model.php @@ -269,14 +269,20 @@ class Assetdetails_model extends Model } - function checkAssetName($assetName) + function checkAssetName($assetId,$assetName) { $builder = $this->db->table('t_asset_details') - ->select('t_asset_details.*') - ->where('AssetName', $assetName); - $query = $builder->get(); + ->select('t_asset_details.*'); + + if(!empty($assetId)){ + $builder = $builder->where('AssetCode !=', $assetId); + } + + $builder = $builder->where('REPLACE(AssetName , " ", "") ',$assetName); - return $query->getResultArray(); + $query = $builder->get(); + + return $query->getResultArray(); } diff --git a/app/Models/Config_model.php b/app/Models/Config_model.php index 1fddb1a9..f810f571 100755 --- a/app/Models/Config_model.php +++ b/app/Models/Config_model.php @@ -178,14 +178,17 @@ class Config_model extends Model return $query->getResult(); } - public function configNameCheck($configName){ - $builder = $this->db->table('t_configmaster') - ->where('ConfigName ', $configName); - $query = $builder->get(); + public function configNameCheck($configId,$configName){ + $builder = $this->db->table('t_configmaster'); - // dd( $this->db->getLastQuery()); + if(!empty($configId)){ + $builder = $builder -> where('Config_ID !=' ,$configId); + } + + $builder = $builder->where('REPLACE(ConfigName , " ", "") ',$configName); + $query = $builder->get(); - return $query->getResultArray(); + return $query->getResultArray(); } public function configValueCheck($configId , $configValue){ diff --git a/app/Models/Costcenter_model.php b/app/Models/Costcenter_model.php index f3ec9348..c23a0f47 100755 --- a/app/Models/Costcenter_model.php +++ b/app/Models/Costcenter_model.php @@ -429,10 +429,14 @@ where Dept.DEPCode not in return "Cost center $CostCenterCode deactivated successfully."; } - function checkCostCenter($CostCenterName){ + function checkCostCenter($CostCenterId,$CostCenterName){ $builder = $this->db->table('t_costcenter_master') - ->select('CostCenterName,IsActive') - ->where('CostCenterName', $CostCenterName); + ->select('CostCenterName,IsActive'); + + if(!empty($CostCenterId)){ + $builder = $builder -> where('id !=' ,$CostCenterId); + } + $builder = $builder->where('REPLACE(CostCenterName , " ", "") ',$CostCenterName); $query = $builder->get(); return $query->getResult(); diff --git a/app/Models/Department_model.php b/app/Models/Department_model.php index 97309b19..c5d87d7d 100755 --- a/app/Models/Department_model.php +++ b/app/Models/Department_model.php @@ -150,12 +150,18 @@ function getdepcode() } - function checkDepartmentName($departmentName){ - $builder = $this->db->table('t_departmentdetails') - ->where('DepartmentName', $departmentName); + function checkDepartmentName($depCode ,$departmentName){ + $builder = $this->db->table('t_departmentdetails'); + + if(!empty($depCode)){ + $builder = $builder -> where(' DEPCode !=', $depCode); + } + + $builder = $builder->where('REPLACE(DepartmentName , " ", "") ',$departmentName); $query = $builder->get(); $result =$query->getResultArray(); return $result; + } diff --git a/app/Models/FactoryMachineModel.php b/app/Models/FactoryMachineModel.php index 9f41778f..12fd7af4 100644 --- a/app/Models/FactoryMachineModel.php +++ b/app/Models/FactoryMachineModel.php @@ -38,5 +38,31 @@ class FactoryMachineModel extends Model // Skip validation (set to true to skip validation rules) protected $skipValidation = false; + + public function checkMachineName($machineId,$machineName){ + + $builder = $this->db->table('t_factoryMachineMaster'); + + if(!empty($machineId)){ + $builder = $builder->where('id !=' , $machineId); + } + + $builder = $builder->where('REPLACE(machine_name, " ", "") ',$machineName); + + $query = $builder->get(); + + + if ($query->getNumRows() > 0) { + return $query->getResultArray(); + } else { + return []; + } + + + } + + + + } diff --git a/app/Models/Rawmaterialdetails_model.php b/app/Models/Rawmaterialdetails_model.php index 82396724..f55d0740 100755 --- a/app/Models/Rawmaterialdetails_model.php +++ b/app/Models/Rawmaterialdetails_model.php @@ -313,20 +313,21 @@ class Rawmaterialdetails_model extends Model // $this->db->update('T_PurchaseOrderDetails', $POInfo); // return $this->db->affectedRows(); // } - function checkMaterialExists($material) + function checkMaterialExists($materialCode , $materialName) { - // $sql="SELECT MaterialCode, MaterialName, MaterialType, Category,REPLACE(MaterialName, ' ', '') - // FROM t_materialmaster - // WHERE REPLACE(MaterialName, ' ', '') LIKE REPLACE('%'".$material."'%', ' ', '')"; - - $builder = $this->db->table('t_materialmaster') - ->select('MaterialCode,MaterialName,MaterialType,Category,IsActive') - ->like('REPLACE(MaterialName, " ", "")', $material); + ->select('MaterialCode,MaterialName,MaterialType,Category,IsActive'); + if(!empty($materialCode)){ + $builder = $builder->where('MaterialCode !=' , $materialCode); + } + $builder->where('REPLACE(MaterialName, " ", "")' , $materialName); $query = $builder->get(); - //print_r($query-getResult()); - return $query->getResult(); + if ($query->getNumRows() > 0) { + return $query->getResultArray(); + } else { + return []; + } } function checkMaterialCategory($mc) diff --git a/app/Models/Supplier_model.php b/app/Models/Supplier_model.php index 03dd3f8c..c2e69512 100755 --- a/app/Models/Supplier_model.php +++ b/app/Models/Supplier_model.php @@ -53,16 +53,17 @@ class Supplier_model extends Model } - function checkTransporter($transporterName){ - $builder = $this->db->table('t_transporter') - ->where('name', $transporterName); + function checkTransporter($transporterId,$transporterName){ + $builder = $this->db->table('t_transporter'); + if(!empty($transporterId)){ + $builder = $builder->where('id !=',$transporterId); + } + $builder = $builder->where('REPLACE(name , " ", "") ',$transporterName); $query = $builder->get(); - + return $query->getResult(); } - - function deleteTransporter($Sid, $SupplierInfo){ $builder = $this->db->table('t_transporter') @@ -198,15 +199,20 @@ class Supplier_model extends Model return $query->getResultArray(); } - function checkSupplierExists($supp_name) + function checkSupplierExists($supp_id,$supp_name) { - $builder = $this->db->table('t_supplierdetailsn') - ->select('SupplierID,SupplierName,Address,IsActive') - ->like('REPLACE(SupplierName, " ", "")', $supp_name); + $builder = $this->db->table('t_supplierdetailsn'); + $builder = $builder->select('SupplierID, SupplierName, Address, IsActive'); + + if(!empty($supp_id)){ + $builder = $builder->where('SupplierID !=' , $supp_id); + } + + $builder = $builder->where('REPLACE(SupplierName, " ", "") ',$supp_name); $query = $builder->get(); - + if ($query->getNumRows() > 0) { return $query->getResultArray(); } else { diff --git a/app/Views/addRawMaterial.php b/app/Views/addRawMaterial.php index f3a388f4..89c0ed44 100755 --- a/app/Views/addRawMaterial.php +++ b/app/Views/addRawMaterial.php @@ -293,19 +293,20 @@ $('#MaterialName').change(function() { - var materialname = $('#MaterialName').val().trim(); + var materialName = $('#MaterialName').val(); + var materialCode = ''; - if(materialname == ''){ + if(materialName == ''){ return; } - //material = material.replace(/\s*$/,""); - var material = materialname.replace(/ /g, ''); - //alert(m.length+" "+m+" "+s+" "+s.length); + var material = materialName.replace(/ /g, ''); + $('#loader').show(); $.ajax({ data: { - id: material + materialCode, + materialName }, type: "POST", url: "materialExist", @@ -335,9 +336,9 @@ } }, - error: function() { + error: function(error) { $('#loader').hide(); - alert("Error Occur"); + alert("Error Occur" ,error); }, complete: function(){ $('#loader').hide(); diff --git a/app/Views/addSupplier.php b/app/Views/addSupplier.php index b6cc9f3b..4de6577b 100755 --- a/app/Views/addSupplier.php +++ b/app/Views/addSupplier.php @@ -258,14 +258,16 @@ } $('#supplierName').change(function() { - var suppliername = $('#supplierName').val(); - var supplier = suppliername.replace(/ /g, ''); + var supplierName = $('#supplierName').val().trim(); + var supplierId = $('#SupplierID').val(); + $('#loader').show(); $.ajax({ type: "POST", url: "", data: { - id: supplier + supplierId , + supplierName }, success: function(data) { var count = data?data.length:0; diff --git a/app/Views/addasset.php b/app/Views/addasset.php index 02e72ca6..5a6c2770 100755 --- a/app/Views/addasset.php +++ b/app/Views/addasset.php @@ -25,7 +25,7 @@
- +
@@ -433,14 +433,15 @@ $('#AssetName').on('change',function(){ -let assetName = $(this).val(); +let assetName = $(this).val().trim(); +let assetId = $('#AssetCode').val() ?? ''; $('#loader').show(); $.ajax({ type:'POST', url:'assetdetails/checkAssetName', - data:{assetName}, + data:{assetId,assetName}, success: function(data){ if(data && data.length>0){ let IsActive = data[0].IsActive; diff --git a/app/Views/addconfig.php b/app/Views/addconfig.php index 6d41b5c2..b61ae06f 100755 --- a/app/Views/addconfig.php +++ b/app/Views/addconfig.php @@ -391,17 +391,18 @@ $('#configurationname').change(function () { $('#loader').show(); $.ajax({ - data: {configName: $('#configurationname').val()}, + + data: {configName: $('#configurationname').val().trim() , configId : $('#ConfigId').val()??''}, type: 'POST', url: "configurationctrl/configNameCheck", - success: function (data) { + success: function (data) { if(data && data.length > 0){ - + if(data[0].isActive == 1){ alert("This Configuration Name is already present. kindly change it..!!"); - $('#configurationname').val(''); - return; + $('#configurationname').val(''); + return; }else{ alert("This Configuration Name is already present in deleted section. kindly reactivate it If needed..!!"); $('#configurationname').val(''); diff --git a/app/Views/adddepartment.php b/app/Views/adddepartment.php index db26a475..707b24e4 100755 --- a/app/Views/adddepartment.php +++ b/app/Views/adddepartment.php @@ -155,11 +155,12 @@ \ No newline at end of file diff --git a/app/Views/factoryMachineMasterDetailsForm.php b/app/Views/factoryMachineMasterDetailsForm.php index eec20a97..acf72a75 100644 --- a/app/Views/factoryMachineMasterDetailsForm.php +++ b/app/Views/factoryMachineMasterDetailsForm.php @@ -52,6 +52,8 @@ $energyType = $masterData['energy_type'] ?? '';
+ +
+ + +
@@ -123,12 +128,13 @@ $energyType = $masterData['energy_type'] ?? '';