New report forms

diff --git a/www/forms/report-chik.schema.json b/www/forms/report-chik.schema.json
new file mode 100644 (file)
index 0000000..b930f37
--- /dev/null
+++ b/www/forms/report-chik.schema.json
@@ -0,0 +1,28 @@
+{
+    "$schema": "http://json-schema.org/draft/2020-12/schema",
+    "title": "chickungunya",
+    "description": "Chikungunya",
+    "type": "object",
+
+    "properties": {
+        "date": {
+            "description": "Date",
+            "type": "string",
+            "format": "date"
+        },
+        "time": {
+            "description": "Time",
+            "type": "string",
+            "format": "time"
+        },
+        "sample": {
+            "description": "Sample",
+            "type": "string"
+        },
+        "chik_igm": {
+            "description": "Chikungunya IgM",
+            "type": "string"
+        }
+    },
+    "required": ["date"]
+}

diff --git a/www/forms/report-cs.schema.json b/www/forms/report-cs.schema.json
index 296f09cecbc381c2b8bd716e10974b076012b79d..735539d321fbba15224ffc749ff0ae40858d2198 100644 (file)
--- a/www/forms/report-cs.schema.json
+++ b/www/forms/report-cs.schema.json
@@ -15,6 +15,10 @@
             "type": "string",
             "format": "time"
         },
+        "labid": {
+            "description": "Lab ID",
+            "type": "string"
+        },
         "sample": {
             "description": "Sample",
             "type": "string"

diff --git a/www/forms/report-dd.schema.json b/www/forms/report-dd.schema.json
index 945fd64ac32c86ec7d5bc57254aa295c20b4b839..d37ac67a539e7becced3815b7148bddcb58cb987 100644 (file)
--- a/www/forms/report-dd.schema.json
+++ b/www/forms/report-dd.schema.json
@@ -15,6 +15,10 @@
             "type": "string",
             "format": "time"
         },
+        "labid": {
+            "description": "Lab ID",
+            "type": "string"
+        },
         "sample": {
             "description": "Sample",
             "type": "string"

diff --git a/www/forms/report-dengue.schema.json b/www/forms/report-dengue.schema.json
new file mode 100644 (file)
index 0000000..619569e
--- /dev/null
+++ b/www/forms/report-dengue.schema.json
@@ -0,0 +1,32 @@
+{
+    "$schema": "http://json-schema.org/draft/2020-12/schema",
+    "title": "dengue",
+    "description": "Dengue",
+    "type": "object",
+
+    "properties": {
+        "date": {
+            "description": "Date",
+            "type": "string",
+            "format": "date"
+        },
+        "time": {
+            "description": "Time",
+            "type": "string",
+            "format": "time"
+        },
+        "sample": {
+            "description": "Sample",
+            "type": "string"
+        },
+        "dengue_ns1": {
+            "description": "Dengue NS1",
+            "type": "string"
+        },
+        "dengue_igm": {
+            "description": "Dengue IgM",
+            "type": "string"
+        }
+    },
+    "required": ["date"]
+}

diff --git a/www/forms/report-hepatitis.schema.json b/www/forms/report-hepatitis.schema.json
new file mode 100644 (file)
index 0000000..56278b1
--- /dev/null
+++ b/www/forms/report-hepatitis.schema.json
@@ -0,0 +1,60 @@
+{
+    "$schema": "http://json-schema.org/draft/2020-12/schema",
+    "title": "hepatitis",
+    "description": "Viral Hepatitis",
+    "type": "object",
+
+    "properties": {
+        "date": {
+            "description": "Date",
+            "type": "string",
+            "format": "date"
+        },
+        "time": {
+            "description": "Time",
+            "type": "string",
+            "format": "time"
+        },
+        "sample": {
+            "description": "Sample",
+            "type": "string"
+        },
+        "hbsag": {
+            "description": "HBsAg",
+            "type": "string"
+        },
+        "hbeag": {
+            "description": "HBeAg",
+            "type": "string"
+        },
+        "antihcv": {
+            "description": "Anti-HCV",
+            "type": "string"
+        },
+        "antihav": {
+            "description": "Anti-HAV",
+            "type": "string"
+        },
+        "antihev": {
+            "description": "Anti-HEV",
+            "type": "string"
+        },
+        "antihbs": {
+            "description": "Anti-HBs",
+            "type": "string"
+        },
+        "antihbc": {
+            "description": "Anti-HBc",
+            "type": "string"
+        },
+        "hbvdna": {
+            "description": "HBV DNA",
+            "type": "string"
+        },
+        "hcvrna": {
+            "description": "HCV RNA",
+            "type": "string"
+        }
+    },
+    "required": ["date"]
+}

diff --git a/www/forms/report-je.schema.json b/www/forms/report-je.schema.json
new file mode 100644 (file)
index 0000000..8466753
--- /dev/null
+++ b/www/forms/report-je.schema.json
@@ -0,0 +1,28 @@
+{
+    "$schema": "http://json-schema.org/draft/2020-12/schema",
+    "title": "japanese_encephalitis",
+    "description": "Japanese Encephalitis",
+    "type": "object",
+
+    "properties": {
+        "date": {
+            "description": "Date",
+            "type": "string",
+            "format": "date"
+        },
+        "time": {
+            "description": "Time",
+            "type": "string",
+            "format": "time"
+        },
+        "sample": {
+            "description": "Sample",
+            "type": "string"
+        },
+        "jap_e_igm": {
+            "description": "Japanese Encephalitis IgM",
+            "type": "string"
+        }
+    },
+    "required": ["date"]
+}

diff --git a/www/forms/report-lepto.schema.json b/www/forms/report-lepto.schema.json
new file mode 100644 (file)
index 0000000..f7c0b7e
--- /dev/null
+++ b/www/forms/report-lepto.schema.json
@@ -0,0 +1,28 @@
+{
+    "$schema": "http://json-schema.org/draft/2020-12/schema",
+    "title": "leptospira",
+    "description": "Leptospira",
+    "type": "object",
+
+    "properties": {
+        "date": {
+            "description": "Date",
+            "type": "string",
+            "format": "date"
+        },
+        "time": {
+            "description": "Time",
+            "type": "string",
+            "format": "time"
+        },
+        "sample": {
+            "description": "Sample",
+            "type": "string"
+        },
+        "lepto_igm": {
+            "description": "Leptospira IgM",
+            "type": "string"
+        }
+    },
+    "required": ["date"]
+}

diff --git a/www/forms/report-malaria.schema.json b/www/forms/report-malaria.schema.json
new file mode 100644 (file)
index 0000000..c5dd9dd
--- /dev/null
+++ b/www/forms/report-malaria.schema.json
@@ -0,0 +1,32 @@
+{
+    "$schema": "http://json-schema.org/draft/2020-12/schema",
+    "title": "malaria",
+    "description": "Malaria",
+    "type": "object",
+
+    "properties": {
+        "date": {
+            "description": "Date",
+            "type": "string",
+            "format": "date"
+        },
+        "time": {
+            "description": "Time",
+            "type": "string",
+            "format": "time"
+        },
+        "sample": {
+            "description": "Sample",
+            "type": "string"
+        },
+        "mp": {
+            "description": "Malaria Parasite",
+            "type": "string"
+        },
+        "mpda": {
+            "description": "MPDA",
+            "type": "string"
+        }
+    },
+    "required": ["date"]
+}

diff --git a/www/forms/report-scrub.schema.json b/www/forms/report-scrub.schema.json
new file mode 100644 (file)
index 0000000..daba841
--- /dev/null
+++ b/www/forms/report-scrub.schema.json
@@ -0,0 +1,28 @@
+{
+    "$schema": "http://json-schema.org/draft/2020-12/schema",
+    "title": "scrub",
+    "description": "Scrub Typhus",
+    "type": "object",
+
+    "properties": {
+        "date": {
+            "description": "Date",
+            "type": "string",
+            "format": "date"
+        },
+        "time": {
+            "description": "Time",
+            "type": "string",
+            "format": "time"
+        },
+        "sample": {
+            "description": "Sample",
+            "type": "string"
+        },
+        "scrub_igm": {
+            "description": "Scrub Typhus IgM",
+            "type": "string"
+        }
+    },
+    "required": ["date"]
+}

diff --git a/www/requisition.php b/www/requisition.php
index f4f3e1eecf45386c93a116ade4238fdf28589bf5..097adb3228ed29b9925cfc48878001655b4d590f 100644 (file)
--- a/www/requisition.php
+++ b/www/requisition.php
@@ -20,7 +20,9 @@ if(isSet($_GET["pid"])){
   $testList="";
   foreach(glob("forms/report-*.json") as $file){
     $form=json_decode(file_get_contents($file));
-    $testList=$testList."<option value='".$file."'>".$form->description."</option>";
+    if(!in_array($form->title, ["disk_diffusion","serology"])){
+      $testList=$testList."<option value='".$file."'>".$form->description."</option>";
+    }
   }
   foreach($inv->tests as $t){
     $testList=$testList."<option>".$t."</option>";