changes in master details-2 vadivel J 21-11-2024

This commit is contained in:
vadivelJ96 2024-11-21 16:37:40 +05:30
parent 36a8ac8ccc
commit 14d177c493
7 changed files with 311 additions and 206 deletions

View File

@ -84,6 +84,7 @@ $routes->post('assetdetails/getline','Assetdetails::getline');
$routes->get('assetdetails/editOldasset', 'Assetdetails::editOldasset'); $routes->get('assetdetails/editOldasset', 'Assetdetails::editOldasset');
$routes->get('assetdetails/deleteAsset', 'Assetdetails::deleteAsset'); $routes->get('assetdetails/deleteAsset', 'Assetdetails::deleteAsset');
$routes->get('assetdetails/reActivateAsset', 'Assetdetails::reActivateAsset'); $routes->get('assetdetails/reActivateAsset', 'Assetdetails::reActivateAsset');
$routes->post('assetdetails/checkAssetName', 'Assetdetails::checkAssetName');
//uncommenting addNewAsset //uncommenting addNewAsset
$routes->post('addNewasset', 'Assetdetails::addNewasset'); $routes->post('addNewasset', 'Assetdetails::addNewasset');

View File

@ -343,6 +343,14 @@ class Assetdetails extends BaseController
} }
function checkAssetName(){
$data = $this->request->getPost();
$result = $this->assetdetails_model->checkAssetName($data['assetName']);
return $this->response->setJSON($result);
}
/** /**
* This function is used to edit the user information * This function is used to edit the user information

View File

@ -245,7 +245,8 @@ class Assetdetails_model extends Model
return $count; return $count;
} }
function deleteAsset ($assetCode , $assetInfo){ function deleteAsset($assetCode, $assetInfo)
{
$this->db->table('t_asset_details') $this->db->table('t_asset_details')
->where('AssetCode', $assetCode) ->where('AssetCode', $assetCode)
@ -256,7 +257,8 @@ class Assetdetails_model extends Model
} }
function reActivateAsset ($assetCode , $assetInfo){ function reActivateAsset($assetCode, $assetInfo)
{
$this->db->table('t_asset_details') $this->db->table('t_asset_details')
->where('AssetCode', $assetCode) ->where('AssetCode', $assetCode)
@ -267,6 +269,18 @@ class Assetdetails_model extends Model
} }
function checkAssetName($assetName)
{
$builder = $this->db->table('t_asset_details')
->select('t_asset_details.*')
->where('AssetName', $assetName);
$query = $builder->get();
return $query->getResultArray();
}
function viewasset($asset, $Asset_Code) function viewasset($asset, $Asset_Code)
{ {

View File

@ -430,4 +430,43 @@
return true; return true;
} }
$('#AssetName').on('change',function(){
let assetName = $(this).val();
$('#loader').show();
$.ajax({
type:'POST',
url:'<?php echo base_url()?>assetdetails/checkAssetName',
data:{assetName},
success: function(data){
if(data && data.length>0){
let IsActive = data[0].IsActive;
if(IsActive == 1){
alert("Asset Name Exists..!!");
$('#AssetName').val('');
$('#AssetName').focus();
}else{
alert("Asset Name Existing in deleted section..!!");
$('#AssetName').val('');
$('#AssetName').focus();
}
}
},
error: function(error){
//error
console.error('error ocurred' + error);
},
complete :function (){
$('#loader').hide();
console.log('ajax call completed..!!');
}
})
});
</script> </script>

View File

@ -54,6 +54,8 @@
</li> </li>
</ol> </ol>
</div> </div>
<a href="<?php echo base_url();?>addasset" class="btn btn-success">Add New
Asset</a>
</div> </div>
</div> </div>
</div> </div>
@ -123,12 +125,7 @@
$cdate = date('d-m-Y', strtotime($record->CreatedDt)); $cdate = date('d-m-Y', strtotime($record->CreatedDt));
} ?> } ?>
<td><?php echo $cdate; ?></td> <td><?php echo $cdate; ?></td>
<td> <td><?php echo $record->AssetCode ?></td>
<a href="<?php echo base_url() . 'assetdetails/editOldasset/?AssetID=' . $record->AssetCode ?>"
data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to view Asset details">
<?php echo substr($record->AssetCode, 5) ?>
</a>
</td>
<td><?php echo $record->AssetName ?></td> <td><?php echo $record->AssetName ?></td>
<td><?php echo $record->Description ?></td> <td><?php echo $record->Description ?></td>
<td><?php echo $record->DepartmentName ?></td> <td><?php echo $record->DepartmentName ?></td>
@ -154,13 +151,14 @@
<?php } else { ?> <?php } else { ?>
<a <a
onclick ="confirmDeleteAsset()"
href="<?php echo base_url() . 'assetdetails/editOldasset/?AssetID=' . $record->AssetCode ?>" href="<?php echo base_url() . 'assetdetails/editOldasset/?AssetID=' . $record->AssetCode ?>"
data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to View Asset Details"> data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to View Asset Details">
<i class="fa fa-edit" ></i> <i class="fa fa-edit" ></i>
</a> </a>
&nbsp;&nbsp; &nbsp;&nbsp;
<a href="<?php echo base_url() . 'assetdetails/deleteAsset/?AssetID=' . $record->AssetCode ?>" <a
onclick ="confirmDeleteAsset(event)"
href="<?php echo base_url() . 'assetdetails/deleteAsset/?AssetID=' . $record->AssetCode ?>"
data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to Delete Asset Details"> data-toggle="tooltip" title="<?php echo $record->AssetCode; ?> - Click here to Delete Asset Details">
<i class="fa fa-trash" ></i> <i class="fa fa-trash" ></i>
</a> </a>
@ -298,12 +296,16 @@
showArchiveList(); showArchiveList();
}); });
function confirmReActivatingAsset(){ function confirmReActivatingAsset(event){
let result = confirm("Do You Want to Re-Activate Asset details ?");
if(result){return;}else{event.preventDefault();}
} }
function confirmDeleteAsset(){ function confirmDeleteAsset(){
let result = confirm("Do You Want to Delete Asset details ?");
if(result){return;}else{event.preventDefault();}
} }
</script> </script>

View File

@ -54,7 +54,7 @@
</ol> </ol>
</div> </div>
<a data-toggle="modal" href="#ccwizard" data-id="0" data-name="" class="btn btn-success">Add New <a data-toggle="modal" href="#ccwizard" data-id="0" data-name="" class="btn btn-success">Add New
Cost List</a> Asset </a>
</div> </div>
</div> </div>
</div> </div>

View File

@ -423,4 +423,45 @@ if (!empty($assetList)) {
}); });
$('#AssetName').on('change',function(){
let assetName = $(this).val();
$('#loader').show();
$.ajax({
type:'POST',
url:'<?php echo base_url()?>assetdetails/checkAssetName',
data:{assetName},
success: function(data){
if(data && data.length>0){
let IsActive = data[0].IsActive;
if(IsActive == 1){
alert("Asset Name Exists..!!");
$('#AssetName').val('');
$('#AssetName').focus();
}else{
alert("Asset Name Existing in deleted section..!!");
$('#AssetName').val('');
$('#AssetName').focus();
}
}
},
error: function(error){
//error
console.error('error ocurred' + error);
},
complete :function (){
$('#loader').hide();
console.log('ajax call completed..!!');
}
})
});
</script> </script>