master module changes-1 vadivel J 19-12-2024

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);
 
     }

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);
 

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);
      }

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);
 
     }

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);
 

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()

app/Controllers/Supplier.php

@@ -310,9 +310,15 @@ class Supplier extends BaseController
     function checksupplier()
     {
         
-        $supp_name = $this->request->getPost('id');
+        $supp_id = $this->request->getPost('supplierId') ??  '';
+
+        $supp_name = $this->request->getPost('supplierName');
+
+        $supp_name = str_replace(' ', '', $supp_name);
+        
+        
+        $query = $this->supplier_model->checkSupplierExists($supp_id , $supp_name);
 
-        $query = $this->supplier_model->checkSupplierExists($supp_name);
 
         return $this->response->setJSON($query);
     
@@ -470,8 +476,11 @@ class Supplier extends BaseController
      function checkTransporter(){               
        
             $data = $this->request->getPost();
-            $message = $this->supplier_model->checkTransporter($data['transportername']);
+            $transporterId = $data['transporterid']??'';
-            return $this->response->setJSON($message);
+            $transporterName = $data['transportername'];
+            $message = $this->supplier_model->checkTransporter($transporterId,$transporterName);
+            
+           return $this->response->setJSON($message);
              
      }
    

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.*')
+			->select('t_asset_details.*');
-			->where('AssetName', $assetName);
+
+			if(!empty($assetId)){
+				$builder = $builder->where('AssetCode !=', $assetId);
+			}
+			
+		$builder =  $builder->where('REPLACE(AssetName , " ", "") ',$assetName);	
+		
 		$query = $builder->get();
 
-		return $query->getResultArray();
+		 return $query->getResultArray();
 
 	}
 

app/Models/Config_model.php

@@ -178,14 +178,17 @@ class Config_model extends Model
         return $query->getResult();
     }
 
-    public function configNameCheck($configName){
+    public function configNameCheck($configId,$configName){
-        $builder = $this->db->table('t_configmaster')
+        $builder = $this->db->table('t_configmaster');
-        ->where('ConfigName ', $configName);
-    $query = $builder->get();
 
-  // dd( $this->db->getLastQuery());
+        if(!empty($configId)){
+            $builder = $builder -> where('Config_ID !=' ,$configId);
+        }
         
-    return $query->getResultArray();
+        $builder =  $builder->where('REPLACE(ConfigName , " ", "") ',$configName);
+        $query = $builder->get();
+
+       return $query->getResultArray();   
     }
 
     public function configValueCheck($configId , $configValue){

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')
+    ->select('CostCenterName,IsActive');
-    ->where('CostCenterName', $CostCenterName);
+
+    if(!empty($CostCenterId)){
+      $builder = $builder -> where('id !=' ,$CostCenterId);
+    }
+    $builder =  $builder->where('REPLACE(CostCenterName , " ", "") ',$CostCenterName);
     $query = $builder->get();
         
     return $query->getResult();

app/Models/Department_model.php

@@ -150,12 +150,18 @@ function getdepcode()
     }
 
 
-    function checkDepartmentName($departmentName){
+    function checkDepartmentName($depCode ,$departmentName){
-       $builder = $this->db->table('t_departmentdetails')
+       $builder = $this->db->table('t_departmentdetails');
-        ->where('DepartmentName', $departmentName);
+
+       if(!empty($depCode)){
+          $builder = $builder -> where(' DEPCode !=', $depCode);
+       }
+
+      $builder =  $builder->where('REPLACE(DepartmentName , " ", "") ',$departmentName);
       $query = $builder->get();
       $result =$query->getResultArray();
 	  return $result;
+
     }
 
     

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 [];
+        }
+
+
+    }
+
+
+
+
 }
 

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')
+            ->select('MaterialCode,MaterialName,MaterialType,Category,IsActive');
-            ->like('REPLACE(MaterialName, " ", "")', $material);
+            if(!empty($materialCode)){
+                $builder =  $builder->where('MaterialCode !=' , $materialCode);
+            }     
+            $builder->where('REPLACE(MaterialName, " ", "")' , $materialName);
 
         $query = $builder->get();
-        //print_r($query-getResult());
+        if ($query->getNumRows() > 0) {
-        return $query->getResult();
+            return $query->getResultArray();
+        } else {
+            return [];
+        }
     }
 
     function checkMaterialCategory($mc)

app/Models/Supplier_model.php

@@ -53,16 +53,17 @@ class Supplier_model extends Model
      }
 
 
-     function checkTransporter($transporterName){
+     function checkTransporter($transporterId,$transporterName){
-        $builder = $this->db->table('t_transporter')
+        $builder = $this->db->table('t_transporter');
-        ->where('name', $transporterName);
+        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,12 +199,17 @@ class Supplier_model extends Model
             return $query->getResultArray();
     }
 
-    function checkSupplierExists($supp_name)
+    function checkSupplierExists($supp_id,$supp_name)
     {
 
-        $builder = $this->db->table('t_supplierdetailsn')
+        $builder = $this->db->table('t_supplierdetailsn');
-            ->select('SupplierID,SupplierName,Address,IsActive')
+        $builder = $builder->select('SupplierID, SupplierName, Address, IsActive');
-            ->like('REPLACE(SupplierName, " ", "")', $supp_name);
+
+        if(!empty($supp_id)){
+            $builder =  $builder->where('SupplierID !=' , $supp_id);
+        }
+
+        $builder =  $builder->where('REPLACE(SupplierName, " ", "") ',$supp_name);
 
         $query = $builder->get();
         

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, '');
-        var material = materialname.replace(/ /g, '');
+
-        //alert(m.length+" "+m+" "+s+" "+s.length);
         $('#loader').show();
         $.ajax({
             data: {
-                id: material
+                 materialCode,
+                 materialName
             },
             type: "POST",
             url: "<?php echo base_url(); ?>materialExist",
@@ -335,9 +336,9 @@
                 }
 
             },
-            error: function() {
+            error: function(error) {
                 $('#loader').hide();
-                alert("Error Occur");
+                alert("Error Occur" ,error);
             },
             complete: function(){
                 $('#loader').hide();

app/Views/addSupplier.php

@@ -258,14 +258,16 @@
   }
 
   $('#supplierName').change(function() {
-    var suppliername = $('#supplierName').val();
+    var supplierName = $('#supplierName').val().trim();
-    var supplier = suppliername.replace(/ /g, '');
+    var supplierId   = $('#SupplierID').val();
+    
     $('#loader').show();
     $.ajax({
       type: "POST",
       url: "<?= base_url() . 'supplierExist' ?>",
       data: {
-        id: supplier
+        supplierId ,
+        supplierName 
       },
       success: function(data) {
         var count = data?data.length:0;

app/Views/addasset.php

@@ -25,7 +25,7 @@
 												<div class="form-row">
 													<div class=" col-md-3">
 														<label class="col-form-label" for="AssetName">Asset Name<span class="badge">*</span></label>
-														<input type="text" class="form-control " required style="text-transform:uppercase;" id="AssetName" name="AssetName" value="<?php echo isset($_POST['AssetName']) ? $_POST['AssetName'] : '' ?>">
+														<input type="text" class="form-control " required  id="AssetName" name="AssetName" value="<?php echo isset($_POST['AssetName']) ? $_POST['AssetName'] : '' ?>">
 													</div>
 
 													<div class=" col-md-3">
@@ -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:'<?php echo base_url()?>assetdetails/checkAssetName',
-	data:{assetName},
+	data:{assetId,assetName},
 	success: function(data){
 	if(data && data.length>0){
 		let IsActive = data[0].IsActive;

app/Views/addconfig.php

@@ -391,7 +391,8 @@
     $('#configurationname').change(function () {
         $('#loader').show();
         $.ajax({
-            data: {configName: $('#configurationname').val()},
+			
+            data: {configName: $('#configurationname').val().trim() , configId : $('#ConfigId').val()??''},
             type: 'POST',
             url: "<?php echo base_url(); ?>configurationctrl/configNameCheck",
 
@@ -400,8 +401,8 @@
 				
                    if(data[0].isActive == 1){
                       alert("This Configuration Name is already present. kindly change it..!!");
-                      $('#configurationname').val('');
+						$('#configurationname').val('');
-                      return;
+						return;
                    }else{
                     alert("This Configuration Name is already present in deleted section. kindly reactivate it If needed..!!");
                       $('#configurationname').val('');

app/Views/adddepartment.php

@@ -155,11 +155,12 @@
  <script>
 
     $("#DepartmentName").on('change',function(){
-        let departmentName = $("#DepartmentName").val();
+        let departmentName = $("#DepartmentName").val().trim();
+        let depCode =$("#DEPCode").val()??'';
         $('#loader').show();
         $.ajax({
             type:"POST",
-            data:{departmentName},
+            data:{departmentName,depCode},
             url:"<?php echo base_url();?>checkDepartmentName",
             success:function(data){
 

app/Views/costListing.php

@@ -124,7 +124,6 @@
                                                 <td><?php echo $record->CostCenterName ?></td>
                                                 <td><?php echo $record->FirstName ?></td>
                                                 <td><?php if ($record->IsActive == 1) {echo"Active";}else{echo "InActive";}?></td>
-                                                <td><?php if ($record->IsActive == 1) {echo"Active";}else{echo "InActive";}?></td>
                                                 <td>
                                                     <?php
                                                     if ($record->IsActive == 0) {
@@ -227,7 +226,8 @@
                 type: 'POST',
                 url: "<?php echo base_url(); ?>checkCostCenter",
                 data: {
-                    CostCenterName: $('#CostCenterName').val()
+                    CostCenterId : $('#id').val(),
+                    CostCenterName: $('#CostCenterName').val().trim()
                 },
                 success: function (data) {
                     $('#loader').hide();

app/Views/editOldasset.php

@@ -163,7 +163,7 @@ if (!empty($assetList)) {
 
 									<div class="col-md-3">
 										<label for="AssetName">Asset Name <span class="badge">*</span></label>
-										<input type="text" class="form-control" id="AssetName" name="AssetName" value="<?php echo $AssetName; ?>" style="text-transform:uppercase;" required>
+										<input type="text" class="form-control" id="AssetName" name="AssetName" value="<?php echo $AssetName; ?>" required>
 									</div>
 									<div class="col-md-3">
 										<label for="Description">Asset Description <span class="badge">*</span></label>
@@ -428,14 +428,15 @@ if (!empty($assetList)) {
 	
 	$('#AssetName').on('change',function(){
 
-		let assetName = $(this).val();
+		let assetId   = $('#AssetCode').val();
+		let assetName = $(this).val().trim();
 
 		$('#loader').show();
 
 		$.ajax({
 			type:'POST',
 			url:'<?php echo base_url()?>assetdetails/checkAssetName',
-			data:{assetName},
+			data:{assetId,assetName},
 			success: function(data){
 			if(data && data.length>0){
 				let IsActive = data[0].IsActive;
@@ -452,7 +453,7 @@ if (!empty($assetList)) {
 			},
 			error: function(error){
 				//error
-			console.error('error ocurred' + error);
+			console.error( error);
 			},
 			complete :function (){
 				$('#loader').hide();

app/Views/editRawmaterial.php

@@ -440,18 +440,20 @@ if ($total <= $reorder) {
 
     $('#MaterialName').change(function() {
 
-        var materialname = $('#MaterialName').val();
+        var materialName = $('#MaterialName').val();
+        var materialCode = $('#RMcode').val();
 
-        if(materialname == ''){
+        if(materialName == ''){
             return;
         }
 
-        var material = materialname.replace(/ /g, '');
+        var material = materialName.replace(/ /g, '');
 
         $('#loader').show();
         $.ajax({
             data: {
-                id: material
+                 materialCode,
+                 materialName
             },
             type: "POST",
             url: "<?php echo base_url(); ?>materialExist",

app/Views/editSupplier.php

@@ -596,16 +596,19 @@ if (!empty($supplier)) {
 
   //Call to ajax existing PAN
   $('#supplierName').change(function () {
-    var suppliername = $('#supplierName').val();
+    var supplierName = $('#supplierName').val().trim();
-    var supplier = suppliername.replace(/ /g, '');
+    var supplierId   = $('#SupplierID').val();
+    
     $('#loader').show();
     $.ajax({  
       type: "POST",
       url: "<?= base_url() . 'supplierExist' ?>",
       data: {
-        id: supplier
+        supplierId ,
+        supplierName 
       },
       success: function (data) {
+        console.log(data)
         var count = data.length;
         if (count >= 1) {
           $('#loader').hide();
@@ -618,21 +621,16 @@ if (!empty($supplier)) {
           $.each(data, function (i, obj) {
             related_supplier += obj.SupplierID + " - " + obj.SupplierName + " - " + obj.Address + "\n";
           });
-          alert("'" + suppliername + "' - supplier details are , " + " \n \n" + related_supplier);
+          alert("'" + supplierName + "' - supplier details are , " + " \n \n" + related_supplier);
           $("#supplierName").val('');
           $("#supplierName").focus();
         } else {
           $('#loader').hide();
-          //4Debug
-          // alert('This is New Supplier! ');
         }
-        //4Debug
+       
-        //console.log(data);
       },
       error: function (error) {
         $('#loader').hide();
-        //4Debug
-        // alert("Error Occur"); 
         console.error("an error occur supplierExist", error)
 
       }

app/Views/editconfig.php

@@ -496,7 +496,10 @@ if (!empty($master)) {
     $('#ConfigName').change(function () {
         $('#loader').show();
         $.ajax({
-            data: { configName: $('#ConfigName').val() },
+            data: { 
+                configName: $('#ConfigName').val().trim(),
+                configId  : $('#ConfigId').val().trim()
+             },
             type: 'POST',
             url: "<?php echo base_url(); ?>configurationctrl/configNameCheck",
             success: function (data) {

app/Views/editdepartment.php

@@ -169,3 +169,42 @@
          </div> <!-- container -->
      </div> <!-- content -->
  </div>
+
+
+ <script>
+
+$("#DepartmentName").on('change',function(){
+    let departmentName = $("#DepartmentName").val().trim();
+    let depCode =$("#DEPCode").val();
+    $('#loader').show();
+    $.ajax({
+        type:"POST",
+        data:{departmentName,depCode},
+        url:"<?php echo base_url();?>checkDepartmentName",
+        success:function(data){
+
+            if(data && data.length >0){
+                let isActive = data[0].IsActive;
+                if(isActive == 1){
+                    alert("Department name already Exists ..!! ");
+                }else{
+                    alert("Department Name already Existing in the deleted section.!!");
+                }
+                window.location.reload();
+            }
+
+        },
+        error:function(error){
+            console.log("error occured..!!")
+            console.error(error);
+        },
+        complete:function(){
+            $('#loader').hide();
+            console.log("ajax call is completed..!!")
+        }
+
+    })
+
+})
+
+</script>

app/Views/factoryMachineMasterDetailsForm.php

@@ -52,6 +52,8 @@ $energyType = $masterData['energy_type'] ?? '';
                     <div class="card">
                         <div class="card-body">
 
+                       
+
                             <form action="<?= empty($masterData)
                                 ? base_url('createFactoryMachineMasterDetails')
                                 : base_url('updateFactoryMachineMasterDetails?id=' . $masterData['id']); ?>" method="post"
@@ -90,6 +92,9 @@ $energyType = $masterData['energy_type'] ?? '';
                                     </div>
                                 </div>
 
+                                <?php if(!empty($masterData)){ ?>
+                                <input type="hidden" id="machineId" value="<?=$masterData['id']?>">
+                                <?php } ?>
                                 <br>
 
                                 <!-- submit and cancel button section -->
@@ -123,12 +128,13 @@ $energyType = $masterData['energy_type'] ?? '';
 
 <script>
     $('#machineName').on('change', function () {
-        let machineName = $(this).val();
+        let machineName = $(this).val().trim();
+        let machineId   = $('#machineId').val()??'';     
         $('#loader').show();
         $.ajax({
             type: "POST",
             url: "<?php echo base_url(); ?>/checkMachineName",
-            data: { machineName },
+            data: { machineName , machineId },
             success: function (data) {
                 if (data && data.length > 0) {
                     let isActive = data[0].is_active;

app/Views/transporterListing.php

@@ -259,7 +259,7 @@
 
             var formData = {
                 transporterid: $('#transporterid').val(),
-                transportername: $('#transportername').val()
+                transportername: $('#transportername').val().trim()     
             };
 
             let checkTransporterExists = function checkTransporterExists() {
@@ -269,6 +269,7 @@
                     type: 'POST',
                     url: "<?php echo base_url(); ?>checkTransporter",
                     data: {
+                        transporterid:$('#transporterid').val()??'',
                         transportername
                     },
                     success: function (data) {