Bigbamboo/bbone
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GWM

Browse Source
This commit is contained in:
sriramv 2023-01-12 17:29:14 +05:30
parent d2b703e6e8
commit 2dfaaef9ea
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
application/modules/Asset/controllers/Asset.php
View File

@ -27,6 +27,7 @@ public function __construct()
parent::__construct();
$this->load->model('MY_Model');
$this->load->model('Asset_model');
$this->load->model('Audit_model');
$this->load->helper(array('form', 'url'));
}
@ -124,7 +125,8 @@ public function editAsset($id)
$asset_amc = $this->Asset_model->get_amc_with_join($id,user()->business_id);
$asset_insurance = $this->Asset_model->get_insurance_with_join($id,user()->business_id);
$asset_images = $this->Asset_model->get_by_asset_id($id,'asset_images',user()->business_id);
$data = array('asset_id'=>$assetData->id,'asset_value' => $asset_value ,'asset_usage' => $asset_usage , 'asset_amc' =>$asset_amc ,'asset_insurance'=>$asset_insurance, 'asset_images'=>$asset_images);
$asset_history = $this->Audit_model->get_history($id,'asset',user()->business_id);
$data = array('asset_id'=>$assetData->id,'asset_value' => $asset_value ,'asset_usage' => $asset_usage , 'asset_amc' =>$asset_amc ,'asset_insurance'=>$asset_insurance, 'asset_images'=>$asset_images , 'asset_history'=>$asset_history);
$sub_asset_value_htmlPage = $this->load->view('asset_sub_value_list.php',$data,true);
$this->layout->set('sub_asset_value_htmlPage', $sub_asset_value_htmlPage);
$this->layout->set('editData', $assetData);
@ -214,7 +216,8 @@ public function view_asset_details($id)
$asset_amc = $this->Asset_model->get_amc_with_join($id,user()->business_id);
$asset_insurance = $this->Asset_model->get_insurance_with_join($id,user()->business_id);
$asset_images = $this->Asset_model->get_by_asset_id($id,'asset_images',user()->business_id);
$data = array('asset_id'=>$assetData->id,'asset_value' => $asset_value ,'asset_usage' => $asset_usage , 'asset_amc' =>$asset_amc ,'asset_insurance'=>$asset_insurance, 'asset_images'=>$asset_images,'tab'=>$tab);
$asset_history = $this->Audit_model->get_history($id,'asset',user()->business_id);
$data = array('asset_id'=>$assetData->id,'asset_value' => $asset_value ,'asset_usage' => $asset_usage , 'asset_amc' =>$asset_amc ,'asset_insurance'=>$asset_insurance, 'asset_images'=>$asset_images,'asset_history'=>$asset_history,'tab'=>$tab);
$sub_asset_value_htmlPage = $this->load->view('asset_sub_value_list.php',$data,true);
$this->layout->set('sub_asset_value_htmlPage', $sub_asset_value_htmlPage);
$this->layout->set('editData', $assetData);
@ -495,29 +498,8 @@ public function deleteAssetInsurance($id)
public function test()
{
$this->audit->set('id',1);
$this->audit->set('table','asset');
// $test = $this->audit->fetch('old_data');
// $this->audit->set('id',2);
$this->audit->fetch('new_data');
$test = $this->audit->create_history('insert');
// $id = 1;
// $table = "asset";
// $assetData = $this->MY_Model->getData($table,$id,user()->business_id);
// $object = (object) $action;
// $data = audit_history($object,$table,user()->business_id);
// print_r($data);die();
// echo "</br>";
// $data = audit_history($assetData,$table,user()->business_id);
print_r($test);
$data = $this->Audit_model->get_history(13,'asset',user()->business_id);
print_r($data);die();
}

23
application/modules/Asset/views/asset_sub_value_list.php
View File

@ -249,9 +249,26 @@
</div>
<div class="tab-pane fade" id="audit_history" role="tabpanel" aria-labelledby="audit_history-tab">
</div>
<div class="tab-pane fade" id="audit_history" role="tabpanel" aria-labelledby="audit_history-tab">
<div class="card-box table-responsive">
<?php foreach ($asset_history as $key => $value) { ?>
<div id="data" style="padding : 10px;">
<lable class="col-form-label" id="first-line"><?php echo my_date_show_time($value->created_at). " " ?><i><?php echo $value->user_name; ?></i></lable></br>
<lable class="column-title" style="color : black;" >
<?php
$column_name = str_replace("_"," ",$value->column_name);
$column_name = ucwords($column_name);
if($value->old_value == null)
{ echo "'$column_name'"." Created with "."'$value->new_value'"; }
else{ echo $column_name." Changed from "."'$value->old_value'"." to "."'$value->new_value'"; }
?>
</lable></br>
</div>
<?php } ?>
</div>
</div>
</div>

7
application/modules/Audit/models/Audit_model.php
View File

@ -3,12 +3,13 @@ class Audit_model extends MY_Model {
public function get_history($id,$table,$business_id)
{
$this->db->select('A.* , user.name as user_name ');
$this->db->select('A.* , users.name as user_name ');
$this->db->from('history A');
$this->db->join('user', 'user.id = A.created_by', 'left');
$this->db->join('users', 'users.id = A.created_by', 'left');
$this->db->where('A.business_id', $business_id);
$this->db->where('A.primary_id', $id);
$this->db->where('md5(A.primary_id)', $id);
$this->db->where('A.table_name', $table);
$this->db->order_by('A.id','DESC');
$query = $this->db->get();
$query = $query->result();
return $query;