diff --git a/application/modules/User/controllers/User.php b/application/modules/User/controllers/User.php index 679b224..d5892cb 100644 --- a/application/modules/User/controllers/User.php +++ b/application/modules/User/controllers/User.php @@ -53,8 +53,8 @@ public function addUser($id='empty') { if($id != 'empty') { - $assetData = $this->Asset_model->get_asset_by_md5_id($id,user()->business_id); - $this->layout->set('assetData', $assetData); + $userData = $this->Asset_model->get_asset_by_md5_id($id,user()->business_id); + $this->layout->set('assetData', $userData); } $this->layout->buffer('main_content', 'User/add_user'); @@ -67,7 +67,7 @@ public function createUser() $data=$this->input->post(); $data['business_id'] = user()->business_id; $data['created_by'] = user()->id; - $data['role'] = "user"; + // $data['role'] = "user"; unset($data['confirm_password']); $data['password'] = hash_password($this->input->post('password')); $table="users"; diff --git a/application/modules/User/models/User_model.php b/application/modules/User/models/User_model.php index 462cb10..ce375ed 100644 --- a/application/modules/User/models/User_model.php +++ b/application/modules/User/models/User_model.php @@ -6,8 +6,9 @@ public function get_user($business_id) $this->db->select('*'); $this->db->from('users'); $this->db->where('business_id', $business_id); - $this->db->where('role', 'user'); - $this->db->where('is_active', 1); + // $this->db->where('role', 'admin'); + // $this->db->where('role', 'user'); + // $this->db->where('is_active', 1); $query = $this->db->get(); $query = $query->result(); return $query; diff --git a/application/modules/User/views/add_user.php b/application/modules/User/views/add_user.php index 21fc2b2..d48387f 100644 --- a/application/modules/User/views/add_user.php +++ b/application/modules/User/views/add_user.php @@ -3,6 +3,16 @@ +
@@ -63,6 +73,14 @@
+ +
@@ -74,36 +92,46 @@
- + +
- +
- - diff --git a/application/modules/User/views/user_list.php b/application/modules/User/views/user_list.php index 18c04ea..27a8a86 100644 --- a/application/modules/User/views/user_list.php +++ b/application/modules/User/views/user_list.php @@ -1,83 +1,54 @@
-
-
-

User Details

- - -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - $value) { ?> - - - - - - - - - - - - - -
Name Email Mobile Action
name; ?> email; ?> mobile; ?> - -   - -   -
- - - -
-
-
-
+
+
+

User Details

+ +
+
+
+
+
+ + + + + + + + + + + + $value) { ?> + + + + + + + + + +
Name Email Mobile Role Action
name; ?> email; ?> mobile; ?>role; ?> + is_active == 1) { ?> + +   + +   + + is_active == 0) { ?> + +   + +
+
+
+
+

diff --git a/assets/uploads/Screenshot_(241).png b/assets/uploads/Screenshot_(241).png new file mode 100644 index 0000000..44ec3d5 Binary files /dev/null and b/assets/uploads/Screenshot_(241).png differ