From 77255bba83e4534abdd804aa071d5b31e4ae677f Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <sess66181@gmail.com>
Date: Sat, 20 Feb 2021 21:16:59 -0500
Subject: [PATCH] fix

---
 .../application/controllers/Patient.php       |  4 +--
 .../components/large_patient_listing.php      | 27 ++++++++++++-------
 .../views/provider/patient/findpatient.php    |  2 +-
 .../views/template/provider_header.php        |  2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/providerwww/application/controllers/Patient.php b/providerwww/application/controllers/Patient.php
index 78a0019..0717447 100644
--- a/providerwww/application/controllers/Patient.php
+++ b/providerwww/application/controllers/Patient.php
@@ -69,8 +69,6 @@ class Patient extends Provider_Controller {
       $out = array();
         $out = $this->getPatientList();
         $data["patient_list"] = $out["patient_list"];
-
-
         $this->renderProviderSecurePage('patient/findpatient', $data); 
 
     }
@@ -97,7 +95,7 @@ private function selectedPatientView($patient_id){
 
     private 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 "
+        $mysql = "SELECT p.practice_id,p.id AS patient_id,p.member_id,p.long_id,m.firstname,m.lastname,m.phone,p.added,m.gender,m.dob::date AS dob "
                 . " FROM patients p LEFT JOIN members m ON m.id=p.member_id ORDER BY p.added DESC";
         $query = $this->db->query($mysql);
         $num = $query->num_rows();
diff --git a/providerwww/application/views/provider/components/large_patient_listing.php b/providerwww/application/views/provider/components/large_patient_listing.php
index 2791206..46fedc2 100644
--- a/providerwww/application/views/provider/components/large_patient_listing.php
+++ b/providerwww/application/views/provider/components/large_patient_listing.php
@@ -13,12 +13,15 @@
             <table id="datatable" class="table table-borderless table-striped">
                 <thead>
                     <tr>
-                        <th>#</th>
+                        <th style="width:10px;">#</th>
+                        <th style="width:40px;">Select</th>
                         <th>Name</th>
+                        <th>Gender</th>
+                        <th>Age</th>
+                        <th  style="width:40px;">DOB</th>
                         <th>Phone</th>
-                        <th>Chart</th>
-                        <th>Status</th>
-                        <th>Action</th>
+                        <th style="width:20px;">Status</th>
+                        <!--th>Action</!--th-->
                     </tr>
                 </thead>
                 <tbody>
@@ -33,11 +36,14 @@
 
                         <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><?= $prow->firstname ?> <?= $prow->lastname ?></td>
+                            <td><?= $prow->gender ?></td>
+                            <td><?= $prow->dob ?></td>
+                            <td><?= $prow->dob ?></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></td -->
                         </tr>
                         <?
                     }
@@ -48,12 +54,15 @@
                 </tbody>
                 <tfoot>
                     <tr>
-                        <th>#</th>
+                      <th style="width:10px;">#</th>
+                        <th style="width:40px;">Select</th>
                         <th>Name</th>
+                        <th>Gender</th>
+                        <th>Age</th>
+                        <th>DOB</th>
                         <th>Phone</th>
-                        <th>Chart</th>
                         <th>Status</th>
-                        <th>Action</th>
+                        <!--th>Action</!--th-->
                     </tr>
                 </tfoot>
             </table>
diff --git a/providerwww/application/views/provider/patient/findpatient.php b/providerwww/application/views/provider/patient/findpatient.php
index 238e84d..06a87d4 100644
--- a/providerwww/application/views/provider/patient/findpatient.php
+++ b/providerwww/application/views/provider/patient/findpatient.php
@@ -44,7 +44,7 @@
                                             <div id="link_result">[]</div>
                                         </div>
                                         <div class="form-group col-md-3">
-                                            <button type="submit" id="link_submit" class="btn btn-primary" onclick="return connectLinkID()">Search</button>
+                                            <button type="submit" id="link_submit" class="btn btn-primary btn-block" onclick="return connectLinkID()">Search</button>
                                         </div>
                                     </div>
                                 </form>
diff --git a/providerwww/application/views/template/provider_header.php b/providerwww/application/views/template/provider_header.php
index 487b24d..554fe03 100644
--- a/providerwww/application/views/template/provider_header.php
+++ b/providerwww/application/views/template/provider_header.php
@@ -69,7 +69,7 @@
                                     </a>
                                     <div class="dropdown-menu animated fadeIn" aria-labelledby="navbarDropdown">
                                         <a class="dropdown-item nav-link" href="/patient/addnew">Add Patient</a>
-                                        <a class="dropdown-item nav-link" href="/patient/report">Find Patient</a>
+                                        <a class="dropdown-item nav-link" href="/patient/findpatient">Find Patient</a>
                                     </div>
                                 </li>
                                 <li class="nav-item full-screen d-none d-lg-block" id="btnFullscreen">