From 67f744c1f2f3d11080688091cf9c005235c2ad3b Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <sess66181@gmail.com>
Date: Sat, 20 Feb 2021 22:09:42 -0500
Subject: [PATCH] fix

---
 .../application/controllers/Patient.php       |  8 ++---
 .../application/models/Patient_model.php      |  2 +-
 .../provider/components/patient_listing.php   | 24 ++++++++------
 .../patientActions/view_chart_action.php      |  0
 .../patientActions/view_reminder_action.php   |  0
 .../patientActions/view_tracking_action.php   |  0
 .../views/provider/patient/thispatient.php    | 31 +++++++++++++++++--
 7 files changed, 47 insertions(+), 18 deletions(-)
 create mode 100644 providerwww/application/views/provider/patient/patientActions/view_chart_action.php
 create mode 100644 providerwww/application/views/provider/patient/patientActions/view_reminder_action.php
 create mode 100644 providerwww/application/views/provider/patient/patientActions/view_tracking_action.php

diff --git a/providerwww/application/controllers/Patient.php b/providerwww/application/controllers/Patient.php
index 0717447..1a0f2c9 100644
--- a/providerwww/application/controllers/Patient.php
+++ b/providerwww/application/controllers/Patient.php
@@ -61,8 +61,8 @@ class Patient extends Provider_Controller {
             $patient_id = $this->uri->segment(3);
         }
 
-       // echo   $patient_id;
-        $this->selectedPatientView($patient_id);
+      //  echo   $patient_id;
+       $this->selectedPatientView($patient_id);
     }
     
     public function findpatient(){
@@ -79,10 +79,10 @@ class Patient extends Provider_Controller {
     }
 
 private function selectedPatientView($patient_id){
-
+$data=[];
     $data['patient_id'] =$patient_id;
     $this->load->model('patient_model');
-    $out = $this->patient_model->LoadPatient(0, $data['patient_id']);
+    $out = $this->patient_model->LoadPatient($_SESSION['practice_id'], $data['patient_id']);
 
     // print_r($out);
     $data['firstname'] = $out["patient_return"][0]->firstname;
diff --git a/providerwww/application/models/Patient_model.php b/providerwww/application/models/Patient_model.php
index b229190..934e8bd 100644
--- a/providerwww/application/models/Patient_model.php
+++ b/providerwww/application/models/Patient_model.php
@@ -8,7 +8,7 @@ class Patient_model extends CI_Model {
 
     public function getPatientList() {
 
-        $mysql = "SELECT p.practice_id,p.id AS patient_id,p.member_id,p.long_id,m.firstname,m.lastname,m.phone,p.added::date "
+        $mysql = "SELECT p.practice_id,p.id AS patient_id,p.member_id,p.long_id,m.firstname,m.lastname,m.phone,p.added::date ,m.gender,m.dob::date AS dob"
                 . " FROM patients p LEFT JOIN members m ON m.id=p.member_id WHERE p.practice_id=" . $_SESSION['practice_id'] . " ORDER BY p.added DESC";
         $query = $this->db->query($mysql);
         $num = $query->num_rows();
diff --git a/providerwww/application/views/provider/components/patient_listing.php b/providerwww/application/views/provider/components/patient_listing.php
index 9e144c4..2162b1c 100644
--- a/providerwww/application/views/provider/components/patient_listing.php
+++ b/providerwww/application/views/provider/components/patient_listing.php
@@ -16,18 +16,19 @@
                 <thead>
                     <tr>
                         <th  style="width:20px;">#</th>
+                        <th style="width:40px;">Select</th>
                         <th>Name</th>
+                        <th style="width:20px;">DOB</th>
+                        <th style="width:20px;">Gender</th>
                         <th style="width:80px;">Phone</th>
-                        <th style="width:50px;">Chart</th>
                         <th style="width:50px;">Status</th>
-                        <th style="width:20px;">Action</th>
+                      
                     </tr>
                 </thead>
                 <tbody>
                     <?php
                     $darr = array();
                     $patient_list = isset($patient_list) ? $patient_list : $darr;
-//print_r($patient_list);
                     $icc = 0;
                     foreach ($patient_list as $prow) {
                         $icc++;
@@ -35,11 +36,13 @@
 
                         <tr>
                             <td><?= $icc ?></td>
+                            <td><a href="/patient/selectPatient/<?= $prow->patient_id ?>"><button type="button" class="btn btn-info btn-sm">Select</button></a></td>
                             <td><a href="/patient/selectPatient/<?=$prow->patient_id ?>"><?= $prow->firstname ?> <?= $prow->lastname ?></a></td>
+                            <td><?=$prow->dob ?></td>
+                            <td><?=$prow->gender ?></td>
                             <td><?= $prow->phone ?></td>
-                            <td><a href="/patient/chart/<?= $prow->patient_id ?>"><button type="button" class="btn btn-info btn-sm">Chart</button></a></td>
                             <td><span class="badge badge-success-inverse">Active</span></td>
-                            <td> <a class="mr-3" href="javascript:void(0);" onclick="selectPatient(<?= $prow->patient_id ?>)" ><i class="fe fe-edit"></i></a><a href="javascript:void(0);" onclick="calendarPatient(<?= $prow->patient_id ?>)"><i class="fe fe-calendar"></i></a></td>
+                            <!-- td> <a class="mr-3" href="javascript:void(0);" onclick="selectPatient(<?= $prow->patient_id ?>)" ><i class="fe fe-edit"></i></a><a href="javascript:void(0);" onclick="calendarPatient(<?= $prow->patient_id ?>)"><i class="fe fe-calendar"></i></a></!-->
                         </tr>
                         <?
                     }
@@ -50,12 +53,13 @@
                 </tbody>
                 <tfoot>
                     <tr>
-                        <th>#</th>
+                    <th  style="width:20px;">#</th>
+                        <th style="width:40px;">Select</th>
                         <th>Name</th>
-                        <th>Phone</th>
-                        <th>Chart</th>
-                        <th>Status</th>
-                        <th>Action</th>
+                        <th style="width:20px;">DOB</th>
+                        <th style="width:20px;">Gender</th>
+                        <th style="width:80px;">Phone</th>
+                        <th style="width:50px;">Status</th>
                     </tr>
                 </tfoot>
             </table>
diff --git a/providerwww/application/views/provider/patient/patientActions/view_chart_action.php b/providerwww/application/views/provider/patient/patientActions/view_chart_action.php
new file mode 100644
index 0000000..e69de29
diff --git a/providerwww/application/views/provider/patient/patientActions/view_reminder_action.php b/providerwww/application/views/provider/patient/patientActions/view_reminder_action.php
new file mode 100644
index 0000000..e69de29
diff --git a/providerwww/application/views/provider/patient/patientActions/view_tracking_action.php b/providerwww/application/views/provider/patient/patientActions/view_tracking_action.php
new file mode 100644
index 0000000..e69de29
diff --git a/providerwww/application/views/provider/patient/thispatient.php b/providerwww/application/views/provider/patient/thispatient.php
index a1fee1f..4249bc7 100644
--- a/providerwww/application/views/provider/patient/thispatient.php
+++ b/providerwww/application/views/provider/patient/thispatient.php
@@ -36,9 +36,9 @@
                             </div>
                             <div class="dropdown">
                                 <!-- a class="btn btn-round btn-inverse-primary btn-xs" href="#">View all </a -->
-                                <button type="button" class="btn btn-primary btn-sm">Reminders</button>
-                                <button type="button" class="btn btn-outline-primary btn-sm">Tracking</button>
-                                <button type="button" class="btn btn-info btn-sm">Charts</button>
+                                <button type="button" onclick="selectPatienFetures(<?=$patient_id?>,'REMIDERS');"  class="btn btn-primary btn-sm">Reminders</button>
+                                <button type="button"  onclick="selectPatienFetures(<?=$patient_id?>,'TRACKING');"  class="btn btn-outline-primary btn-sm">Tracking</button>
+                                <button type="button"  onclick="selectPatienFetures(<?=$patient_id?>,'CHARTS');"  class="btn btn-info btn-sm">Charts</button>
                             </div>
                         </div>
                         <div class="card-body">
@@ -148,6 +148,9 @@
                 
                 <div class="col-lg-6 col-xxl-4 m-b-30">
                    
+                   <div id="action_detail">
+                   
+                   </div>
                     
                     <div class="card card-statistics h-100 mb-0">
                         <div class="card-header d-flex justify-content-between">
@@ -393,3 +396,25 @@
 <!-- end app-container -->
 <!-- begin footer -->
 
+
+
+
+<script type="text/javascript">
+<!--
+    function selectPatienFetures(patient_id,patient_action) {
+     //  alert(pending_practice_id);
+        
+        $('#action_detail').html('Processing...');
+    //    $('#acc' + pending_practice_id).prop('disabled', true);
+        $.ajax({
+         url: "/practice/selectPatienFetures?proc=PROCESS&patient_id=" + patient_id + "&patient_action=" +patient_action
+        }).done(function (data) {
+            $('#action_detail').html(data);
+      //      $('#acc' + pending_practice_id).prop('disabled', false);
+        });
+        return false;
+    }
+// -->
+</script>
+
+