From 3ae47e1bd120ea3c263f2d5de53e426d859143b9 Mon Sep 17 00:00:00 2001 From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com> Date: Thu, 12 Jan 2023 17:22:38 +0530 Subject: [PATCH] suseendhiran --- application/core/MY_Model.php | 2 ++ .../modules/Audit/controllers/Audit.php | 8 ++++- .../modules/Audit/models/Audit_model.php | 8 +++-- .../modules/Business/controllers/Business.php | 4 +-- .../modules/Business/views/business_list.php | 22 +++++++++++- application/modules/User/controllers/User.php | 22 +++++++++++- .../modules/User/models/User_model.php | 4 ++- application/modules/User/views/user_list.php | 25 +++++++++++++- .../modules/User/views/view_history.php | 34 +++++++++++++++++++ assets/default/customize/ajax.js | 3 ++ 10 files changed, 122 insertions(+), 10 deletions(-) create mode 100644 application/modules/User/views/view_history.php diff --git a/application/core/MY_Model.php b/application/core/MY_Model.php index 371d75d..edd976f 100644 --- a/application/core/MY_Model.php +++ b/application/core/MY_Model.php @@ -264,7 +264,9 @@ function getData($table,$id,$business_id) { $this->db->select(); $this->db->from($table); + if($business_id != NULL) { $this->db->where('business_id', $business_id); + } $this->db->where('id', $id); $query = $this->db->get(); $query = $query->row(); diff --git a/application/modules/Audit/controllers/Audit.php b/application/modules/Audit/controllers/Audit.php index ab246a0..21a13eb 100644 --- a/application/modules/Audit/controllers/Audit.php +++ b/application/modules/Audit/controllers/Audit.php @@ -47,7 +47,13 @@ public function set() public function fetch() { $args = func_get_args(); - $data = $this->MY_Model->getData($this->table,$this->id,user()->business_id); + if(is_superadmin()){ + $business_id = NULL; + } + else{ + $business_id = user()->business_id; + } + $data = $this->MY_Model->getData($this->table,$this->id, $business_id); if($args[0] == 'old_data'){ $this->old_data = $data; return $this->old_data; } else if($args[0] == 'new_data'){ $this->new_data = $data; return $this->new_data; } diff --git a/application/modules/Audit/models/Audit_model.php b/application/modules/Audit/models/Audit_model.php index e6eb229..efe06a4 100644 --- a/application/modules/Audit/models/Audit_model.php +++ b/application/modules/Audit/models/Audit_model.php @@ -3,10 +3,12 @@ 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->where('A.business_id', $business_id); + $this->db->join('users', 'users.id = A.created_by', 'left'); + if($business_id != NULL) { + $this->db->where('A.business_id', $business_id); + } $this->db->where('A.primary_id', $id); $this->db->where('A.table_name', $table); $query = $this->db->get(); diff --git a/application/modules/Business/controllers/Business.php b/application/modules/Business/controllers/Business.php index acfc07a..e18df50 100644 --- a/application/modules/Business/controllers/Business.php +++ b/application/modules/Business/controllers/Business.php @@ -153,8 +153,8 @@ public function edit_business() //fetch old_data before new_data update $this->audit->fetch('old_data'); //insert new data - $assetData = $this->MY_Model->edit_option($action, $id, $table); - if($assetData) + $businessData = $this->MY_Model->edit_option($action, $id, $table); + if($businessData) { //fetch new_data after post data update $this->audit->fetch('new_data'); diff --git a/application/modules/Business/views/business_list.php b/application/modules/Business/views/business_list.php index 3d29c75..e69493a 100644 --- a/application/modules/Business/views/business_list.php +++ b/application/modules/Business/views/business_list.php @@ -57,6 +57,8 @@   +   + @@ -77,4 +79,22 @@ - \ No newline at end of file + + + + \ No newline at end of file diff --git a/application/modules/User/controllers/User.php b/application/modules/User/controllers/User.php index 8e33439..e573a93 100644 --- a/application/modules/User/controllers/User.php +++ b/application/modules/User/controllers/User.php @@ -27,6 +27,7 @@ public function __construct() parent::__construct(); $this->load->model('MY_Model'); $this->load->model('user_model'); + $this->load->model('audit_model'); // $this->load->helper(array('form', 'url')); } @@ -124,7 +125,6 @@ public function editUsers() $this->audit->fetch('new_data'); //audit history generation for update $test = $this->audit->create_history('update'); - print_r( $test);die(); } redirect('user/userList'); @@ -220,4 +220,24 @@ public function businessProfile($business_id) $this->layout->render('default_layout'); } + + public function view_user_history($id) + { + $table = 'users'; + $user_history = $this->audit_model->get_history( $id , $table , user()->business_id); + $data = array('title'=> "view" , 'user_history'=> $user_history ); + $htmlPage = $this->load->view('view_history.php',$data,true); + echo json_encode($htmlPage); + } + + + public function view_business_history($id) + { + $table = 'business'; + $user_history = $this->audit_model->get_history( $id , $table , user()->business_id); + $data = array('title'=> "view" , 'user_history'=> $user_history ); + $htmlPage = $this->load->view('view_history.php',$data,true); + echo json_encode($htmlPage); + } + } diff --git a/application/modules/User/models/User_model.php b/application/modules/User/models/User_model.php index 493ce03..aefc847 100644 --- a/application/modules/User/models/User_model.php +++ b/application/modules/User/models/User_model.php @@ -30,7 +30,9 @@ public function get_user_by_md5_id($id,$business_id) { $this->db->select('*'); $this->db->from('users'); - $this->db->where('business_id', $business_id); + if ($business_id != NULL) { + $this->db->where('business_id', $business_id); + } $this->db->where('md5(id)', $id); $query = $this->db->get(); $query = $query->row(); diff --git a/application/modules/User/views/user_list.php b/application/modules/User/views/user_list.php index 98d476e..6a4481d 100644 --- a/application/modules/User/views/user_list.php +++ b/application/modules/User/views/user_list.php @@ -38,10 +38,13 @@   + is_active == 0) { ?> +   +   @@ -57,7 +60,27 @@
+ + + + - \ No newline at end of file + + diff --git a/application/modules/User/views/view_history.php b/application/modules/User/views/view_history.php new file mode 100644 index 0000000..bd62bf9 --- /dev/null +++ b/application/modules/User/views/view_history.php @@ -0,0 +1,34 @@ + + + + +
+
+
+ + +
+
+ $value) { ?> +
+ created_at). " " ?>user_name; ?>
+ + 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'"; } + ?> +
+
+ +
+
+ + +
+
+
+ \ No newline at end of file diff --git a/assets/default/customize/ajax.js b/assets/default/customize/ajax.js index 907949c..e32e3a7 100644 --- a/assets/default/customize/ajax.js +++ b/assets/default/customize/ajax.js @@ -244,6 +244,9 @@ $("#file_profile").change(function(){ + + +