From 5e4746ec2301a085f99aee14344ae872889023ac Mon Sep 17 00:00:00 2001
From: Agnibho Mondal <mondal@agnibho.com>
Date: Mon, 17 May 2021 12:38:27 +0530
Subject: [PATCH] Updated input field formats

---
 forms/admission.schema.json    | 12 +++++++++++-
 forms/history.schema.json      |  9 ++++++---
 forms/nursing.schema.json      |  6 +++++-
 forms/report-other.schema.json |  3 ++-
 lib/functions.php              | 12 +++++++++---
 report.php                     |  2 +-
 6 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/forms/admission.schema.json b/forms/admission.schema.json
index 24a5bc0..f2d76f5 100644
--- a/forms/admission.schema.json
+++ b/forms/admission.schema.json
@@ -35,6 +35,15 @@
             "type": "string",
             "format": "date"
         },
+        "time": {
+            "description": "Time of Admission",
+            "type": "string",
+            "format": "time"
+        },
+        "vp": {
+            "description": "Visiting Physician",
+            "type": "string"
+        },
         "ward": {
             "description": "Ward",
             "type": "string"
@@ -49,7 +58,8 @@
         },
         "summary": {
             "description": "Summary",
-            "type": "string"
+            "type": "string",
+            "format": "textarea"
         }
     },
     "required": ["pid", "name", "age", "sex", "date"]
diff --git a/forms/history.schema.json b/forms/history.schema.json
index 1349c66..5985145 100644
--- a/forms/history.schema.json
+++ b/forms/history.schema.json
@@ -17,11 +17,13 @@
         },
         "cc": {
             "description": "Chief complaint",
-            "type": "string"
+            "type": "string",
+            "format": "textarea"
         },
         "history": {
             "description": "History",
-            "type": "string"
+            "type": "string",
+            "format": "textarea"
         },
         "comorb": {
             "description": "Comorbidities",
@@ -29,7 +31,8 @@
         },
         "oe": {
             "description": "General Examination",
-            "type": "string"
+            "type": "string",
+            "format": "textarea"
         },
         "bp": {
             "description": "Blood Pressure",
diff --git a/forms/nursing.schema.json b/forms/nursing.schema.json
index 03ddc37..83ea585 100644
--- a/forms/nursing.schema.json
+++ b/forms/nursing.schema.json
@@ -21,10 +21,14 @@
         },
         "intake": {
             "description": "Intake",
-            "type": "string"
+            "type": "integer"
         },
         "output": {
             "description": "Output",
+            "type": "integer"
+        },
+        "bw": {
+            "description": "Body Weight",
             "type": "string"
         },
         "bp": {
diff --git a/forms/report-other.schema.json b/forms/report-other.schema.json
index 57749cb..c790698 100644
--- a/forms/report-other.schema.json
+++ b/forms/report-other.schema.json
@@ -17,7 +17,8 @@
         },
         "report": {
             "description": "Report",
-            "type": "string"
+            "type": "string",
+            "format": "textarea"
         }
     },
     "required": ["date"]
diff --git a/lib/functions.php b/lib/functions.php
index 3b8f715..51c3cb3 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -50,16 +50,19 @@ function schema2form($file, $pid=null, $id=null, $cat=null, $data=null){
       }
       $form=$form."</select>";
     }
+    elseif(isSet($prop->format) && $prop->format=="textarea"){
+      $form=$form."<textarea class='form-control' name='".$field."' id='".$field."'>".$value."</textarea>";
+    }
     elseif($field=="pid"){
-      $form=$form."<input class='form-control' ".$lockpid." ".$req." type='".$type."' name='".$field."' id='".$field."' ".$value.">";
+      $form=$form."<input class='form-control' ".$lockpid." ".$req." type='".$type."' step='any' name='".$field."' id='".$field."' ".$value.">";
     }
     else{
-      $form=$form."<input class='form-control' ".$req." type='".$type."' name='".$field."' id='".$field."' ".$value.">";
+      $form=$form."<input class='form-control' ".$req." type='".$type."' step='any' name='".$field."' id='".$field."' ".$value.">";
     }
     $form=$form."</div>";
 
   }
-  $form=$form."<div><label class='form-label' for='extra-note'>Notes</label><textarea class='form-control' name='extra-note' id='extra-note'></textarea></div>";
+  $form=$form."<div><label class='form-label' for='extra-note'>Extra Notes</label><textarea class='form-control' name='extra-note' id='extra-note'></textarea></div>";
   $form=$form."<button class='btn btn-primary mt-3' type='submit'>Save</button>";
   $form=$form."</form>";
   return $form;
@@ -91,6 +94,9 @@ function viewData($data, $edit=null){
         if(!empty($schema->properties->$field)){
           $view=$view."<tr><td>".$schema->properties->$field->description."</td><td>".$value."</td></tr>";
         }
+        elseif($field=="extra-note"){
+          $view=$view."<tr><td>Extra Notes</td><td>".$value."</td></tr>";
+        }
         else{
           $view=$view."<tr><td>".$field."</td><td>".$value."</td></tr>";
         }
diff --git a/report.php b/report.php
index 004019c..571edab 100644
--- a/report.php
+++ b/report.php
@@ -41,7 +41,7 @@ if(!empty($_GET["pid"]) && !empty($_GET["form"])){
         <div class="card-body">
           <h4 class="card-title">Add New Report</h4>
           <?php echo $form;?>
-          <p class="text-right"><a href="attachments.php?pid=<?php echo $pid;?>&req=<?php echo $_GET["req"];?>">Upload PDF instead</p>
+          <?php if(!empty($_GET["req"])){echo "<p class='text-right'><a href='attachments.php?pid=".$pid."&req=".$_GET["req"]."'>Upload PDF instead</a></p>";}?>
         </div>
       </div>
     </div>
-- 
2.39.5