MERMS/MermsEmrWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2021-02-18 09:33:34 -05:00
parent 165eca40f4
commit 3ff0d309fc
2 changed files with 350 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adminwww/application/controllers/Dash.php
+46 -17
View File
@@ -45,56 +45,85 @@ class Dash extends Admin_Controller {
private function dashData() { private function dashData() {
$data = []; $data = [];
//$query = $this->db->query("SELECT count(*) FROM members WHERE acc_link IS NULL AND status = 1")->num_rows();
// $query = $this->db->query(" SELECT count(*) FROM members WHERE acc_link IS NOT NULL AND status = 1")->num_rows();
$data["new_patient"] = $this->db->query("SELECT id FROM members WHERE acc_link IS NULL AND status = 1")->num_rows(); $data["new_patient"] = $this->db->query("SELECT id FROM members WHERE acc_link IS NULL AND status = 1")->num_rows();
$data["establish_pateint"] = $this->db->query(" SELECT id FROM members WHERE acc_link IS NOT NULL AND status = 1")->num_rows(); $data["establish_pateint"] = $this->db->query(" SELECT id FROM members WHERE acc_link IS NOT NULL AND status = 1")->num_rows();
$data['deleted_users'] = $this->db->query(" SELECT id FROM members WHERE status <> 1")->num_rows(); $data['deleted_users'] = $this->db->query(" SELECT id FROM members WHERE status <> 1")->num_rows();
$data["new_patient_percent"] = ceil(100 * $data["establish_pateint"] / ($data["establish_pateint"] + $data["new_patient"])); $data["new_patient_percent"] = ceil(100 * $data["establish_pateint"] / ($data["establish_pateint"] + $data["new_patient"]));
$data["establish_pateint_percent"] = ceil(100 * $data["new_patient"] / ($data["establish_pateint"] + $data["new_patient"])); $data["establish_pateint_percent"] = ceil(100 * $data["new_patient"] / ($data["establish_pateint"] + $data["new_patient"]));
// $data["new_patient"] = $this->db->query("SELECT id FROM members WHERE acc_link IS NULL AND status = 1")->num_rows();
//$data["establish_pateint"] = $this->db->query(" SELECT id FROM members WHERE acc_link IS NOT NULL AND status = 1")->num_rows();
return $data; return $data;
} }
public function pendingpractice() { public function pendingpractice() {
$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)";
$data = array(); $data = array();
$data["page_title"] = "Pending Practice"; $data["page_title"] = "Pending Practice";
$this->load->library('table'); $this->load->library('table');
$this->table->set_template($this->template); $this->table->set_template($this->template);
$mysql = "SELECT '<button type=\"button\" class=\"btn btn-warning\" onclick=\"approvePractice('||id||');\">Process</button>' AS process, echo $mysql = "SELECT '<button type=\"button\" class=\"btn btn-warning\" onclick=\"approvePractice('||id||');\">Process</button>' AS process,
'<button type=\"button\" class=\"btn btn-danger\" onclick=\"resendEmail('||id||');\">Email</button>' AS semail, '<button type=\"button\" class=\"btn btn-danger\" onclick=\"resendEmail('||id||');\">Email</button>' AS semail,
status, $case_statement AS status,
practice_name,username,email,added::date from practice_pending ORDER BY id DESC LIMIT 20"; practice_name,username,email,added::date from practice_pending ORDER BY id DESC LIMIT 200";
$data['pending_practice'] = ""; $data['pending_practice'] = "";
$query = $this->db->query($mysql); $query = $this->db->query($mysql);
//$this->table->set_heading( array('data' => 'ID', 'style' => 'width:50px'),'Email', 'Firstname', 'Lastname','Last Login','Location', array('data' => 'ACTION', 'style' => 'width:40px'), array('data' => 'Select', 'style' => 'width:40px'));
$this->table->set_heading(array('data' => 'Process', 'style' => 'width:50px'), 'Resend Email', 'Status', 'Practice Name', 'Username', 'Email', array('data' => 'Date Added', 'style' => 'width:40px')); $this->table->set_heading(array('data' => 'Process', 'style' => 'width:50px'), 'Resend Email', 'Status', 'Practice Name', 'Username', 'Email', array('data' => 'Date Added', 'style' => 'width:40px'));
$data['pending_practice'] = $this->table->generate($query); $data['pending_practice'] = $this->table->generate($query);
$this->renderAdminPage('view_pendingpractice', $data); $this->renderAdminPage('view_pendingpractice', $data);
} }
public function pendingusers() { public function pendingusers() {
$case_statement = "(CASE WHEN status=1 THEN 'Active' WHEN status=0 THEN 'Inactive' ELSE 'Unknown' END)";
$data = array(); $data = array();
$data["page_title"] = "Pending Members"; $data["page_title"] = "Pending Members";
$this->load->library('table'); $this->load->library('table');
$this->table->set_template($this->template); $this->table->set_template($this->template);
$data['recent_members'] = ""; $data['recent_members'] = "";
$mysql = "SELECT '<button type=\"button\" class=\"btn btn-warning\" onclick=\"approvePractice('||id||');\">Select</button>' AS process,"
. "username,firstname,lastname,added::date,loc,last_login,acc_link FROM members ORDER by id DESC LIMIT 15";
$query = $this->db->query($mysql);
$this->table->set_heading(array('data' => 'Select', 'style' => 'width:50px'), 'Username', 'Firstname', 'Lastname', 'Added', 'Location', 'Last Login', 'Link');
$data['recent_members'] = $this->table->generate($query);
$this->renderAdminPage('view_pendingusers', $data);
}
public function invoices() {
$data = array();
$data["page_title"] = "Invoices";
$this->load->library('table');
$this->table->set_template($this->template);
$data['recent_members'] = "";
$mysql = "SELECT id,username,firstname,lastname,added::date,loc,last_login,acc_link FROM members ORDER by id DESC LIMIT 15"; $mysql = "SELECT id,username,firstname,lastname,added::date,loc,last_login,acc_link FROM members ORDER by id DESC LIMIT 15";
$query = $this->db->query($mysql); $query = $this->db->query($mysql);
//$this->table->set_heading( array('data' => 'ID', 'style' => 'width:50px'),'Email', 'Firstname', 'Lastname','Last Login','Location', array('data' => 'ACTION', 'style' => 'width:40px'), array('data' => 'Select', 'style' => 'width:40px')); //$this->table->set_heading( array('data' => 'ID', 'style' => 'width:50px'),'Email', 'Firstname', 'Lastname','Last Login','Location', array('data' => 'ACTION', 'style' => 'width:40px'), array('data' => 'Select', 'style' => 'width:40px'));
$data['recent_members'] = $this->table->generate($query); $data['recent_members'] = $this->table->generate($query);
$this->renderAdminPage('view_pendingusers', $data); $this->renderAdminPage('view_invoices', $data);
}
public function payments() {
$data = array();
$data["page_title"] = "Payments";
$this->load->library('table');
$this->table->set_template($this->template);
$data['recent_members'] = "";
$mysql = "SELECT id,username,firstname,lastname,added::date,loc,last_login,acc_link FROM members ORDER by id DESC LIMIT 15";
$query = $this->db->query($mysql);
//$this->table->set_heading( array('data' => 'ID', 'style' => 'width:50px'),'Email', 'Firstname', 'Lastname','Last Login','Location', array('data' => 'ACTION', 'style' => 'width:40px'), array('data' => 'Select', 'style' => 'width:40px'));
$data['recent_members'] = $this->table->generate($query);
$this->renderAdminPage('view_payments', $data);
}
public function usersactivities() {
$data = array();
$data["page_title"] = "Users Activities";
$this->load->library('table');
$this->table->set_template($this->template);
$data['recent_members'] = "";
$mysql = "SELECT id,username,firstname,lastname,added::date,loc,last_login,acc_link FROM members ORDER by id DESC LIMIT 15";
$query = $this->db->query($mysql);
//$this->table->set_heading( array('data' => 'ID', 'style' => 'width:50px'),'Email', 'Firstname', 'Lastname','Last Login','Location', array('data' => 'ACTION', 'style' => 'width:40px'), array('data' => 'Select', 'style' => 'width:40px'));
$data['recent_members'] = $this->table->generate($query);
$this->renderAdminPage('view_usersactivities', $data);
} }
protected function renderAdminPage($page_name, $data) { protected function renderAdminPage($page_name, $data) {
adminwww/application/views/template/secure_header.php
+14 -18
View File
@@ -245,9 +245,8 @@
<ul aria-expanded="false"> <ul aria-expanded="false">
<li> <a href='/dash/pendingusers'>Pending Users</a> </li> <li> <a href='/dash/pendingusers'>Pending Users</a> </li>
<li> <a href='/dash/pendingpractice'>Pending Practice</a> </li> <li> <a href='/dash/pendingpractice'>Pending Practice</a> </li>
<li> <a href='/dash/users'>Users</a> </li> <li> <a href='/dash/usersactivities'>Users Activities</a> </li>
<li> <a href='/dash/practice'>Practice</a> </li> <li> <a href='#'>..........</a> </li>
<li> <a href='/dash/invoices'>Invoices</a> </li> <li> <a href='/dash/invoices'>Invoices</a> </li>
<li> <a href='/dash/payments'>Payments</a> </li> <li> <a href='/dash/payments'>Payments</a> </li>
</ul> </ul>
@@ -255,23 +254,20 @@
<li> <li>
<a class="has-arrow" href="javascript:void(0)" aria-expanded="false"><i class="nav-icon ti ti-layout"></i> <span class="nav-title">Layouts</span></a> <a class="has-arrow" href="javascript:void(0)" aria-expanded="false"><i class="nav-icon ti ti-layout"></i> <span class="nav-title">Users/Members</span></a>
<ul aria-expanded="false"> <ul aria-expanded="false">
<li><a href="layout-mini.html">Sidebar Mini</a></li> <li><a href="/dash/pendingusers">Pending Users</a></li>
<li><a href="/dash/pendingusers">Established Users</a></li>
</ul> </ul>
</li> </li>
<li> <li>
<a class="has-arrow" href="javascript:void(0)" aria-expanded="false"><i class="nav-icon ti ti-pie-chart"></i><span class="nav-title">Charts</span></a> <a class="has-arrow" href="javascript:void(0)" aria-expanded="false"><i class="nav-icon ti ti-pie-chart"></i><span class="nav-title">Practice Management</span></a>
<ul aria-expanded="false"> <ul aria-expanded="false">
<li> <a href="chart-apex.html">Apex Chart</a> </li> <li> <a href='/dash/pendingpractice'>Pending Practice</a> </li>
<li> <a href="chart-flot.html">Flot Chart</a> </li> <li> <a href='/dash/practice'>Practice</a> </li>
<li> <a href="chart-morris.html">Morris Chart</a> </li>
<li> <a href="chart-chartist.html">Chartist Charts</a> </li>
<li> <a href="chart-chartjs.html">Chartjs Chart</a> </li> <li> <a href="">........</a> </li>
<li> <a href="chart-c3.html">C3 Chart</a> </li>
<li> <a href="chart-sparkline.html">Sparkline Chart</a> </li>
<li> <a href="chart-knob.html">Knob Chart</a> </li>
</ul> </ul>
</li> </li>
<li> <li>
@@ -286,10 +282,10 @@
</li> </li>
<li class="nav-static-title">Configurations & Tools</li> <li class="nav-static-title">Configurations & Tools</li>
<li> <li>
<a class="has-arrow" href="javascript:void(0)" aria-expanded="false"><i class="nav-icon ti ti-map-alt"></i><span class="nav-title">Pending</span></a> <a class="has-arrow" href="javascript:void(0)" aria-expanded="false"><i class="nav-icon ti ti-map-alt"></i><span class="nav-title">Back Office</span></a>
<ul aria-expanded="false"> <ul aria-expanded="false">
<li> <a href="#">Pending</a> </li> <li> <a href="#">........</a> </li>
<li> <a href="#">Pending </a> </li> <li> <a href="#">........ </a> </li>
<li> <a href="/bkoadmin">Office Users </a> </li> <li> <a href="/bkoadmin">Office Users </a> </li>
</ul> </ul>
</li> </li>