Added reporting time

diff --git a/lib/functions.php b/lib/functions.php
index 5ab12aca02977bab2053351548659742ab1551ac..5ce0dc017d35c666022002e7815dd6e94f4eef5f 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -159,9 +159,25 @@ function viewData($data, $edit=null){
     else{
       $date="";
     }
+    if(!empty($data->rdate)){
+      if(!empty($data->rtime)){
+        $rdate=date("M d, Y h:i a", strtotime($data->rdate." ".$data->rtime));
+      }
+      else{
+        $rdate=$data->rdate;
+      }
+    }
+    else{
+      $rdate="";
+    }
     $view=$view."<tr><th class='w-25'>".$description."</th><th>".$date."</th>";
     $view=$view."<th></th>";
     $view=$view."</tr>";
+    if(!empty($rdate)){
+      $view=$view."<tr><td class='w-25'>Reported</td><td>".$rdate."</td>";
+      $view=$view."<td></td>";
+      $view=$view."</tr>";
+    }
     foreach($data as $field=>$value){
       $warn="";
       if(!empty($schema->properties->$field->range)){
@@ -170,7 +186,7 @@ function viewData($data, $edit=null){
       else{
         $warn="";
       }
-      if(!empty($value) && $field!="form" && $field!="date" && $field!="time"){
+      if(!empty($value) && $field!="form" && $field!="date" && $field!="time" && $field!="rdate" && $field!="rtime"){
         if(!empty($schema->properties->$field)){
           $view=$view."<tr><td>".$schema->properties->$field->description."</td><td class='".$warn."'>".$value."</td>";
           if(!empty($schema->properties->$field->range)){

diff --git a/www/forms/report-abg.schema.json b/www/forms/report-abg.schema.json
index 6eb97311576cfcad9dd5f8e877f92c37292934fa..b100d10b0fe8fcb8b231ee55ba032f3aac975945 100644 (file)
--- a/www/forms/report-abg.schema.json
+++ b/www/forms/report-abg.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-cd4.schema.json b/www/forms/report-cd4.schema.json
index bf7e314a9cb12dfebcc56aa9b0d6708ec6aaa6a0..f8a62bd701f48b7558b67b93e3aab402ffee8621 100644 (file)
--- a/www/forms/report-cd4.schema.json
+++ b/www/forms/report-cd4.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-ch.schema.json b/www/forms/report-ch.schema.json
index 98ab96af2cd1efdde6c7e3fe0cfb61d58553c207..c8e908ee902d6108d4c1f2fa15b54289f8cfb8f0 100644 (file)
--- a/www/forms/report-ch.schema.json
+++ b/www/forms/report-ch.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-chik.schema.json b/www/forms/report-chik.schema.json
index b930f3714e27b61b8977800edda7ebfc1c068dc3..0a65a7e50ab0948d9ee54e620577b1a8005ab0f3 100644 (file)
--- a/www/forms/report-chik.schema.json
+++ b/www/forms/report-chik.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-coagulation.schema.json b/www/forms/report-coagulation.schema.json
index 3764a9320987df446f48eb4d71cdb5756c61a87f..f9515874542ffbac0a4cccfa3b7e0f6a18105703 100644 (file)
--- a/www/forms/report-coagulation.schema.json
+++ b/www/forms/report-coagulation.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-covid.schema.json b/www/forms/report-covid.schema.json
index fba710496c9bdb36bce30a10d3572cac7ccb6f7e..3ad493cd9346b43782d4038a548773442b609047 100644 (file)
--- a/www/forms/report-covid.schema.json
+++ b/www/forms/report-covid.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-crag.schema.json b/www/forms/report-crag.schema.json
index de68169db94e2bebc285e5b7ff896b01f455cc5d..4b5abd2b9154d524f5345d2e1fc1585d46843131 100644 (file)
--- a/www/forms/report-crag.schema.json
+++ b/www/forms/report-crag.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-crp.schema.json b/www/forms/report-crp.schema.json
index d1e975d0525b1c441ea5ac49ddf2b7b0fec3a4a0..3bcbea14d20bd0eb90806ecc224a3d5fe696cc10 100644 (file)
--- a/www/forms/report-crp.schema.json
+++ b/www/forms/report-crp.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-cs.schema.json b/www/forms/report-cs.schema.json
index 735539d321fbba15224ffc749ff0ae40858d2198..26129c3ebfd5e58221f16550b567c4da71f8f791 100644 (file)
--- a/www/forms/report-cs.schema.json
+++ b/www/forms/report-cs.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-dd.schema.json b/www/forms/report-dd.schema.json
index d37ac67a539e7becced3815b7148bddcb58cb987..04e1de012bf52137d0ad8e3add9e19d879def586 100644 (file)
--- a/www/forms/report-dd.schema.json
+++ b/www/forms/report-dd.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-ddimer.schema.json b/www/forms/report-ddimer.schema.json
index 792393c3b76d7f53ef1a0dc8d8b3173634f4c6b8..5d03358159023076689941e75116cde2040fff34 100644 (file)
--- a/www/forms/report-ddimer.schema.json
+++ b/www/forms/report-ddimer.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-dengue.schema.json b/www/forms/report-dengue.schema.json
index 619569ebdf5a9a311947cf3277d1f5862bb710d5..5ccdb5eda77a2ce6416875f26fe3827e617c945e 100644 (file)
--- a/www/forms/report-dengue.schema.json
+++ b/www/forms/report-dengue.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-elctrolyte.schema.json b/www/forms/report-elctrolyte.schema.json
index 4e2af129d8c28d0c05bda8bf1fece6dd43d34998..a06ee1edfbb59e9059486787aaf9ae1712bda1eb 100644 (file)
--- a/www/forms/report-elctrolyte.schema.json
+++ b/www/forms/report-elctrolyte.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-fluid.schema.json b/www/forms/report-fluid.schema.json
index d296c22d37b5c03323e271b9e9716d32c7045f8a..3071c2297e9070953e5f4db64530c44e901434c9 100644 (file)
--- a/www/forms/report-fluid.schema.json
+++ b/www/forms/report-fluid.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-glycemic.schema.json b/www/forms/report-glycemic.schema.json
index ec86bde1444e53e9cb0acb2facf18e259c7e9a29..b7254e253c9f37f50d82cc907448b28e9c98f76f 100644 (file)
--- a/www/forms/report-glycemic.schema.json
+++ b/www/forms/report-glycemic.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-hepatitis.schema.json b/www/forms/report-hepatitis.schema.json
index 56278b15204948848c679db50787b2c204835b35..bc29b23f822711e64a5d5fafee0180abe22de3f3 100644 (file)
--- a/www/forms/report-hepatitis.schema.json
+++ b/www/forms/report-hepatitis.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-ictc.schema.json b/www/forms/report-ictc.schema.json
index 669540716562a837cc0d3c4f012dabd701e2c878..1bae07e4b24f2b72a5d30a7cd53b3a8f789ae1c8 100644 (file)
--- a/www/forms/report-ictc.schema.json
+++ b/www/forms/report-ictc.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-je.schema.json b/www/forms/report-je.schema.json
index 84667533c91167ae9012f1d63dcbdb4bf6c63d3e..78f934667ea496d8fe5a8bf0062d7337a6d76946 100644 (file)
--- a/www/forms/report-je.schema.json
+++ b/www/forms/report-je.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-ldh.schema.json b/www/forms/report-ldh.schema.json
index c295cf40a529cf843f9423e5814f898152e8fc32..aea19dcc726cc5f3b388fab9c072070731d1b93c 100644 (file)
--- a/www/forms/report-ldh.schema.json
+++ b/www/forms/report-ldh.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-lepto.schema.json b/www/forms/report-lepto.schema.json
index f7c0b7eb83e4bb22b70086c74126614debdd3993..695ecbc6475547e3c5ecf6c35148bae195e2c7db 100644 (file)
--- a/www/forms/report-lepto.schema.json
+++ b/www/forms/report-lepto.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-lft.schema.json b/www/forms/report-lft.schema.json
index 79bcb4779eb1114bc081499c339cb95a3e50c1fe..b7a8ea574c3f44bd3ebfb3ef070ad86f30630d3e 100644 (file)
--- a/www/forms/report-lft.schema.json
+++ b/www/forms/report-lft.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-lipid.schema.json b/www/forms/report-lipid.schema.json
index 31535f90bd7ff2ef64cdaf5cbdf5ece79dc3ff3c..56f1672d426ec3b4bef7fba32ae367ac9febb1b2 100644 (file)
--- a/www/forms/report-lipid.schema.json
+++ b/www/forms/report-lipid.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-malaria.schema.json b/www/forms/report-malaria.schema.json
index c5dd9dd126e9a8803c40edccf0e9334e6fdf31c8..9ab7a392ca72a006089a495bdfcb7bcab205e49c 100644 (file)
--- a/www/forms/report-malaria.schema.json
+++ b/www/forms/report-malaria.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-other.schema.json b/www/forms/report-other.schema.json
index b642a0be005482fdbd331a656e7509c6bcf5324f..009d77cd6adbd5c26ab9262cf5ecb9782f936ac3 100644 (file)
--- a/www/forms/report-other.schema.json
+++ b/www/forms/report-other.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-pancreatitis.schema.json b/www/forms/report-pancreatitis.schema.json
index 65942fc0834639556ccdfc480549d8624c8dcc64..4d845c77345e4642071758ef50f5d4e907d53c8f 100644 (file)
--- a/www/forms/report-pancreatitis.schema.json
+++ b/www/forms/report-pancreatitis.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-pct.schema.json b/www/forms/report-pct.schema.json
index 4127f267ac610d83079deccd70db8d059a3337ce..3ffdc78da28b4e5045c8a1ddfc0c88d04b5632ad 100644 (file)
--- a/www/forms/report-pct.schema.json
+++ b/www/forms/report-pct.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-pvl.schema.json b/www/forms/report-pvl.schema.json
index 2af8e52f6025cb59837967848b944cdb2ea64cae..fe667227d7433475fb67d38e16601c9b795f6955 100644 (file)
--- a/www/forms/report-pvl.schema.json
+++ b/www/forms/report-pvl.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-rft.schema.json b/www/forms/report-rft.schema.json
index 8c2e35bd4f2735b2779039643cbab25e7c5849b3..356e20f729e36684442c22b254faff03704f4e96 100644 (file)
--- a/www/forms/report-rft.schema.json
+++ b/www/forms/report-rft.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-scrub.schema.json b/www/forms/report-scrub.schema.json
index daba841f1cbe0fd4fa66455645965efb8a53861e..1759508f9bec2509f307f1dc9383807aaf64f9d9 100644 (file)
--- a/www/forms/report-scrub.schema.json
+++ b/www/forms/report-scrub.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-serology.schema.json b/www/forms/report-serology.schema.json
index 52ca12b15f164f70eec389f62db9f33adf69311a..47afe4407e9f7eb8fa844fe5e1d561e7456aceb4 100644 (file)
--- a/www/forms/report-serology.schema.json
+++ b/www/forms/report-serology.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-sputum-me.schema.json b/www/forms/report-sputum-me.schema.json
index 462a7462d6f9fb285f45c307761aa5b0addb72b2..e5b78d059f4bfd109190939dbceedf4a90412149 100644 (file)
--- a/www/forms/report-sputum-me.schema.json
+++ b/www/forms/report-sputum-me.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-stool-ova.schema.json b/www/forms/report-stool-ova.schema.json
index 35ef4dc33e367cf4cf74a4649e2fb6a27bc6cf54..ba1b681a2023fdba69fd248e1d97f2b56994e290 100644 (file)
--- a/www/forms/report-stool-ova.schema.json
+++ b/www/forms/report-stool-ova.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-stool-re.schema.json b/www/forms/report-stool-re.schema.json
index c773452e4fdb9691540320045bd12f6af7673936..c8402f221bb15861de99ec1eacb7d714bfc76598 100644 (file)
--- a/www/forms/report-stool-re.schema.json
+++ b/www/forms/report-stool-re.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-thyroid.schema.json b/www/forms/report-thyroid.schema.json
index 4a3bd2975fa45b42229f5a881767fa68d07d429c..e6eaef4be610f4901e4516c844343e672cd55857 100644 (file)
--- a/www/forms/report-thyroid.schema.json
+++ b/www/forms/report-thyroid.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-ua.schema.json b/www/forms/report-ua.schema.json
index a81252c482b494f9bd547db46ed54376efa18534..40a2c356fd66fdb2ce4c43105240de86d2772b30 100644 (file)
--- a/www/forms/report-ua.schema.json
+++ b/www/forms/report-ua.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-urine-re.schema.json b/www/forms/report-urine-re.schema.json
index e5a76ce7c654f60a6e01600f88c52ae078510a34..1b6219cc7a38754cdac96236eacda01fc87ed6a2 100644 (file)
--- a/www/forms/report-urine-re.schema.json
+++ b/www/forms/report-urine-re.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },

diff --git a/www/forms/report-vdrl.schema.json b/www/forms/report-vdrl.schema.json
index ea057ca04d946bab67651e7e1cf22a1895b3e705..2809b757396ae351861d8fd32c2c4b726718a698 100644 (file)
--- a/www/forms/report-vdrl.schema.json
+++ b/www/forms/report-vdrl.schema.json
@@ -6,12 +6,22 @@
 
     "properties": {
         "date": {
-            "description": "Date",
+            "description": "Sample Date",
             "type": "string",
             "format": "date"
         },
         "time": {
-            "description": "Time",
+            "description": "Sample Time",
+            "type": "string",
+            "format": "time"
+        },
+        "rdate": {
+            "description": "Report Date",
+            "type": "string",
+            "format": "date"
+        },
+        "rtime": {
+            "description": "Report Time",
             "type": "string",
             "format": "time"
         },