From 7b8b5ebbf4d6ac904d73d8d38f41478d0e3933dc Mon Sep 17 00:00:00 2001
From: Agnibho Mondal <mondal@agnibho.com>
Date: Wed, 19 May 2021 06:28:13 +0530
Subject: [PATCH] Bugfix

---
 www/autocomplete/investigation.json         |  4 +-
 www/forms/report-fluid-ascitic.schema.json  |  4 +-
 www/forms/report-fluid-csf.schema.json      |  4 +-
 www/forms/report-fluid-pleural.schema.json  |  4 +-
 www/forms/report-fluid-synovial.schema.json |  4 +-
 www/forms/report-fluid.schema.json          | 60 ---------------------
 www/requisition.php                         |  2 +-
 7 files changed, 11 insertions(+), 71 deletions(-)
 delete mode 100644 www/forms/report-fluid.schema.json

diff --git a/www/autocomplete/investigation.json b/www/autocomplete/investigation.json
index 737de8a..30e9bec 100644
--- a/www/autocomplete/investigation.json
+++ b/www/autocomplete/investigation.json
@@ -10,7 +10,7 @@
         "virology",
         "protozoology",
         "mycology",
-        "pathology",
-        "other"
+        "parasitology",
+        "pathology"
     ]
 }
diff --git a/www/forms/report-fluid-ascitic.schema.json b/www/forms/report-fluid-ascitic.schema.json
index 24fff7c..5f8f798 100644
--- a/www/forms/report-fluid-ascitic.schema.json
+++ b/www/forms/report-fluid-ascitic.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "fluid_study",
-    "description": "Fluid Study",
+    "title": "ascitic_fluid_study",
+    "description": "Ascitic Fluid Study",
     "type": "object",
 
     "properties": {
diff --git a/www/forms/report-fluid-csf.schema.json b/www/forms/report-fluid-csf.schema.json
index 24fff7c..794ab86 100644
--- a/www/forms/report-fluid-csf.schema.json
+++ b/www/forms/report-fluid-csf.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "fluid_study",
-    "description": "Fluid Study",
+    "title": "csf_fluid_study",
+    "description": "CSF Fluid Study",
     "type": "object",
 
     "properties": {
diff --git a/www/forms/report-fluid-pleural.schema.json b/www/forms/report-fluid-pleural.schema.json
index 24fff7c..b82821f 100644
--- a/www/forms/report-fluid-pleural.schema.json
+++ b/www/forms/report-fluid-pleural.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "fluid_study",
-    "description": "Fluid Study",
+    "title": "pleural_fluid_study",
+    "description": "Pleural Fluid Study",
     "type": "object",
 
     "properties": {
diff --git a/www/forms/report-fluid-synovial.schema.json b/www/forms/report-fluid-synovial.schema.json
index 24fff7c..f4f1b6c 100644
--- a/www/forms/report-fluid-synovial.schema.json
+++ b/www/forms/report-fluid-synovial.schema.json
@@ -1,7 +1,7 @@
 {
     "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "fluid_study",
-    "description": "Fluid Study",
+    "title": "synovial_fluid_study",
+    "description": "Synovial Fluid Study",
     "type": "object",
 
     "properties": {
diff --git a/www/forms/report-fluid.schema.json b/www/forms/report-fluid.schema.json
deleted file mode 100644
index 24fff7c..0000000
--- a/www/forms/report-fluid.schema.json
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-    "$schema": "http://json-schema.org/draft/2020-12/schema",
-    "title": "fluid_study",
-    "description": "Fluid Study",
-    "type": "object",
-
-    "properties": {
-        "date": {
-            "description": "Date",
-            "type": "string",
-            "format": "date"
-        },
-        "time": {
-            "description": "Time",
-            "type": "string",
-            "format": "time"
-        },
-        "cellCount": {
-            "description": "Cell Count",
-            "type": "integer"
-        },
-        "cellType": {
-            "description": "Cell Type",
-            "type": "string"
-        },
-        "protein": {
-            "description": "Protein",
-            "type": "integer"
-        },
-        "sugar": {
-            "description": "Sugar",
-            "type": "integer"
-        },
-        "ldh": {
-            "description": "LDH",
-            "type": "integer"
-        },
-        "gram": {
-            "description": "Gram Stain",
-            "type": "string"
-        },
-        "afb": {
-            "description": "AFB Stain",
-            "type": "string"
-        },
-        "fungal": {
-            "description": "Fungal Stain",
-            "type": "string"
-        },
-        "cs": {
-            "description": "Culture/Sensitivity",
-            "type": "string"
-        },
-        "cbnaat": {
-            "description": "CBNAAT",
-            "type": "string"
-        }
-    },
-    "required": ["date"]
-}
diff --git a/www/requisition.php b/www/requisition.php
index 2f51b15..247df45 100644
--- a/www/requisition.php
+++ b/www/requisition.php
@@ -29,7 +29,7 @@ if(isSet($_GET["pid"])){
   foreach($inv->rooms as $r){
     $roomList=$roomList."<option>".$r."</option>";
   }
-  $roomList=$roomList."<option selected='selected'>Other</option>";
+  $roomList=$roomList."<option selected='selected'>other</option>";
 
   $reqList=$db->getRequisitions($pid);
   $list="";
-- 
2.39.2