diff --git a/adminwww/application/controllers/Dash.php b/adminwww/application/controllers/Dash.php index cfa71bd..3bdde9b 100644 --- a/adminwww/application/controllers/Dash.php +++ b/adminwww/application/controllers/Dash.php @@ -33,9 +33,10 @@ class Dash extends Admin_Controller { // Pending practice data + $case_statement = "(CASE WHEN status=1 THEN 'Pending' WHEN status=0 THEN 'Deleted' WHEN status=3 THEN 'Deleted' WHEN status=5 THEN 'Acive' ELSE 'Unknown' END)"; $mysql = "SELECT '' AS process, '' AS semail, - status, + $case_statement AS status, practice_name,username,email,added::date from practice_pending ORDER BY id DESC LIMIT 7"; $data['pending_practice'] = ""; $query = $this->db->query($mysql); diff --git a/adminwww/application/controllers/Practice.php b/adminwww/application/controllers/Practice.php index de6a776..38cf522 100644 --- a/adminwww/application/controllers/Practice.php +++ b/adminwww/application/controllers/Practice.php @@ -72,7 +72,6 @@ class Practice extends Admin_Controller { public function resendEmail() { $data['pending_practice_id'] = trim($this->input->get('pending_practice_id')); - echo "Sending " . $data['pending_practice_id']; // return false; @@ -87,7 +86,7 @@ class Practice extends Admin_Controller { $practice_id = $data['practice_id'] = trim($this->input->get('practice_id')); $this->load->model('Practice_model'); $query = $this->Practice_model->loadPracticeUsers($practice_id); - $this->table->set_heading( array('data' => 'Edit', 'style' => 'width:50px'), 'Firstname', 'Lastname','Username','Phone','Location','Last Login','Email', array('data' => 'ACTION', 'style' => 'width:40px'), array('data' => 'Select', 'style' => 'width:40px')); + $this->table->set_heading(array('data' => 'Edit', 'style' => 'width:50px'), 'Status', 'Firstname', 'Lastname', 'Username', 'Phone', 'Email', 'Added', 'Last Login'); $data['practice_users'] = $this->table->generate($query); diff --git a/adminwww/application/models/Practice_model.php b/adminwww/application/models/Practice_model.php index 952097a..c38e662 100644 --- a/adminwww/application/models/Practice_model.php +++ b/adminwww/application/models/Practice_model.php @@ -58,8 +58,9 @@ class Practice_model extends CI_Model { public function loadPracticeUsers($practice_id) { $data = []; - $mysql = "SELECT '' AS Edit,firstname,lastname,email,phone,username, added::date,last_login,loc,status FROM practice_users WHERE practice_id = $practice_id "; - return $query = $this->db->query($mysql); + $case_statement = "(CASE WHEN status=1 THEN 'Active' WHEN status=0 THEN 'Deleted' WHEN status=3 THEN 'Deleted' WHEN status=5 THEN 'Acive' ELSE 'Unknown' END)"; + $mysql = "SELECT '' AS Edit,$case_statement AS Status,firstname,lastname,email,phone,username, added::date,last_login FROM practice_users WHERE practice_id = $practice_id "; + return $query = $this->db->query($mysql); } } diff --git a/adminwww/application/views/practice/parts/view_practiceusers.php b/adminwww/application/views/practice/parts/view_practiceusers.php index 40ebfa9..39cd636 100644 --- a/adminwww/application/views/practice/parts/view_practiceusers.php +++ b/adminwww/application/views/practice/parts/view_practiceusers.php @@ -1,17 +1,7 @@

Practice Users List

- - - - - - - - - - - +