Bugfix

diff --git a/www/index.php b/www/index.php
index 16844b2ad6243d7bdf2f325b4fe3bbf69e9e70bf..a41f5c2f82ae74ef07c538ae389eea0d49d69877 100644 (file)
--- a/www/index.php
+++ b/www/index.php
@@ -5,55 +5,59 @@ if(!empty($_POST["req"])){
 }
 $list=$db->getAdmittedPatientList();
 $showList="";
 }
 $list=$db->getAdmittedPatientList();
 $showList="";

-while($arr=$list->fetchArray()){
-  $pid=$arr["pid"];
-  $showList=$showList."<tr><td><a href='view.php?pid=".$pid."'>".$pid."</a></td><td>".$arr["ward"]."-".$arr["bed"]."</td><td>".$arr["name"]."</td><td>".$arr["diagnosis"]."</td></tr>";
+if($list){
+  while($arr=$list->fetchArray()){
+    $pid=$arr["pid"];
+    $showList=$showList."<tr><td><a href='view.php?pid=".$pid."'>".$pid."</a></td><td>".$arr["ward"]."-".$arr["bed"]."</td><td>".$arr["name"]."</td><td>".$arr["diagnosis"]."</td></tr>";
+  }

 }
 $reqs=$db->getRequisitionList();
 $showReqs="";
 }
 $reqs=$db->getRequisitionList();
 $showReqs="";

-while($arr=$reqs->fetchArray()){
-  $pid=$arr["pid"];
-  if(!empty($arr["form"])){
-    if($arr["form"]=="report-cs"){
-      $test="<a href='vitek.php?pid=".$pid."&form=".$arr["form"]."&req=".$arr["rowid"]."&sample=".$arr["sample"]."&time=".$arr["time"]."&src=index'>".$arr["test"]."</a>";
-      if(checkAccess("report")=="all"){
-        $toReport="<a class='btn btn-sm btn-primary' href='vitek.php?pid=".$pid."&form=".$arr["form"]."&req=".$arr["rowid"]."&sample=".$arr["sample"]."&time=".$arr["time"]."&src=index'>Add Report</a>";
+if($reqs){
+  while($arr=$reqs->fetchArray()){
+    $pid=$arr["pid"];
+    if(!empty($arr["form"])){
+      if($arr["form"]=="report-cs"){
+        $test="<a href='vitek.php?pid=".$pid."&form=".$arr["form"]."&req=".$arr["rowid"]."&sample=".$arr["sample"]."&time=".$arr["time"]."&src=index'>".$arr["test"]."</a>";
+        if(checkAccess("report")=="all"){
+          $toReport="<a class='btn btn-sm btn-primary' href='vitek.php?pid=".$pid."&form=".$arr["form"]."&req=".$arr["rowid"]."&sample=".$arr["sample"]."&time=".$arr["time"]."&src=index'>Add Report</a>";
+        }
+        else{
+          $toReport="";
+        }

       }
       else{
       }
       else{

-        $toReport="";
+        $test="<a href='report.php?pid=".$pid."&form=".$arr["form"]."&req=".$arr["rowid"]."&sample=".$arr["sample"]."&time=".$arr["time"]."&src=index'>".$arr["test"]."</a>";
+        if(checkAccess("report")=="all"){
+          $toReport="<a class='btn btn-sm btn-primary' href='vitek.php?pid=".$pid."&form=".$arr["form"]."&req=".$arr["rowid"]."&sample=".$arr["sample"]."&time=".$arr["time"]."&src=index'>Add Report</a>";
+          $toReport="<a class='btn btn-sm btn-primary' href='report.php?pid=".$pid."&form=".$arr["form"]."&req=".$arr["rowid"]."&sample=".$arr["sample"]."&time=".$arr["time"]."&src=index'>Add Report</a>";
+        }
+        else{
+          $toReport="";
+        }

       }
     }
     else{
       }
     }
     else{

-      $test="<a href='report.php?pid=".$pid."&form=".$arr["form"]."&req=".$arr["rowid"]."&sample=".$arr["sample"]."&time=".$arr["time"]."&src=index'>".$arr["test"]."</a>";
+      $test="<a href='report.php?pid=".$pid."&form=report-other&req=".$arr["rowid"]."&src=index'>".$arr["test"]."</a>";

       if(checkAccess("report")=="all"){
       if(checkAccess("report")=="all"){

-        $toReport="<a class='btn btn-sm btn-primary' href='vitek.php?pid=".$pid."&form=".$arr["form"]."&req=".$arr["rowid"]."&sample=".$arr["sample"]."&time=".$arr["time"]."&src=index'>Add Report</a>";
-        $toReport="<a class='btn btn-sm btn-primary' href='report.php?pid=".$pid."&form=".$arr["form"]."&req=".$arr["rowid"]."&sample=".$arr["sample"]."&time=".$arr["time"]."&src=index'>Add Report</a>";
+        $toReport="<a class='btn btn-sm btn-primary' href='report.php?pid=".$pid."&form=report-other&req=".$arr["rowid"]."&src=index'>Add Report</a>";

       }
       else{
         $toReport="";
       }
     }
       }
       else{
         $toReport="";
       }
     }

-  }
-  else{
-    $test="<a href='report.php?pid=".$pid."&form=report-other&req=".$arr["rowid"]."&src=index'>".$arr["test"]."</a>";
-    if(checkAccess("report")=="all"){
-      $toReport="<a class='btn btn-sm btn-primary' href='report.php?pid=".$pid."&form=report-other&req=".$arr["rowid"]."&src=index'>Add Report</a>";
+    if($arr["status"]=="received"){
+      $received="<span class='badge badge-success'>Sample Received</span>";
+    }
+    elseif(checkAccess("report")=="all"){
+      $received="<button class='btn btn-sm btn-outline-danger confirm' form='sample' name='req' value='".$arr["rowid"]."'>Receive Sample</button>";

     }
     else{
     }
     else{

-      $toReport="";
+      $received="<span class='badge badge-warning'>Sample Not Received</span>";

     }
     }

+
+    $showReqs=$showReqs."<tr class='room1' data-room='".$arr["room"]."'><td>".$test."</td><td>".$arr["sample"]."</td><td>".$arr["room"]."</td><td>".date("M j", $arr["time"])."</td><td><a href='view.php?pid=".$pid."' target='_blank'>".$pid." (".$db->getWard($pid)->fetchArray()["ward"]."-".$db->getBed($pid)->fetchArray()["bed"].")</a></td></tr><tr class='room2' data-room='".$arr["room"]."'><td></td><td colspan='2'>".$arr["addl"]."</td><td>".$received."</td><td>".$toReport."</td></tr>";

   }
   }

-  if($arr["status"]=="received"){
-    $received="<span class='badge badge-success'>Sample Received</span>";
-  }
-  elseif(checkAccess("report")=="all"){
-    $received="<button class='btn btn-sm btn-outline-danger confirm' form='sample' name='req' value='".$arr["rowid"]."'>Receive Sample</button>";
-  }
-  else{
-    $received="<span class='badge badge-warning'>Sample Not Received</span>";
-  }
-  
-  $showReqs=$showReqs."<tr class='room1' data-room='".$arr["room"]."'><td>".$test."</td><td>".$arr["sample"]."</td><td>".$arr["room"]."</td><td>".date("M j", $arr["time"])."</td><td><a href='view.php?pid=".$pid."' target='_blank'>".$pid." (".$db->getWard($pid)->fetchArray()["ward"]."-".$db->getBed($pid)->fetchArray()["bed"].")</a></td></tr><tr class='room2' data-room='".$arr["room"]."'><td></td><td colspan='2'>".$arr["addl"]."</td><td>".$received."</td><td>".$toReport."</td></tr>";

 }
 ?>
 <!DOCTYPE html>
 }
 ?>
 <!DOCTYPE html>