Report date of vitek

diff --git a/lib/functions.php b/lib/functions.php
index 5ce0dc017d35c666022002e7815dd6e94f4eef5f..795eba6c878983ac58ed05965e34e188177554e7 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -220,6 +220,9 @@ function viewAntibiogram($data, $edit=null){
   $data=json_decode($data);
   $view="<table class='table table-striped'>";
   $view=$view."<tr><th>Vitek Report</th><th colspan='2'>".$data->date."</th></tr>";
+  if(!empty($data->rdate)){
+    $view=$view."<tr><td>Reported on</td><td colspan='2'>".$data->rdate."</td></tr>";
+  }
   $view=$view."<tr><td>Sample</td><td colspan='2'>".$data->sample."</td></tr>";
   $view=$view."<tr><td>Lab ID</td><td colspan='2'>".$data->labid."</td></tr>";
   $view=$view."<tr><td>Organism</td><td colspan='2'>".$data->organism."</td></tr>";

diff --git a/www/antibiogram.php b/www/antibiogram.php
index 5782e9b457afe3b58233d98426ea6be570e02381..9f74b06055eec17a39aeacab21bd3091859cf7dd 100644 (file)
--- a/www/antibiogram.php
+++ b/www/antibiogram.php
@@ -54,6 +54,7 @@ if(!empty($_GET["pid"]) && !empty($_GET["form"])){
     if(!empty($_GET["sample"])){
       $sample="value='".$_GET["sample"]."'";
     }
+    $labid="";
     $organism="";
   }
   else{
@@ -62,7 +63,8 @@ if(!empty($_GET["pid"]) && !empty($_GET["form"])){
     $labid="";
     $organism="";
   }
-  $form=$form."<tr><td>Date</td><td colspan='3'><input type='date' class='form-control' name='date' ".$date." form='antibiogram'></td></tr>";
+  $form=$form."<tr><td>Sample Date</td><td colspan='3'><input type='date' class='form-control' name='date' ".$date." form='antibiogram'></td></tr>";
+  $form=$form."<tr><td>Report Date</td><td colspan='3'><input type='date' class='form-control' name='rdate' form='antibiogram'></td></tr>";
   $form=$form."<tr><td>Sample</td><td colspan='3'><input type='text' class='form-control' name='sample' ".$sample." form='antibiogram' required></td></tr>";
   $form=$form."<tr><td>Lab ID</td><td colspan='3'><input type='text' class='form-control' name='labid' ".$labid." form='antibiogram'></td></tr>";
   $form=$form."<tr><td>Organism</td><td colspan='3'><input type='text' class='form-control' name='organism' ".$organism." form='antibiogram' required></td></tr>";