From: Agnibho Mondal <mondal@agnibho.com>
Date: Thu, 20 May 2021 11:04:23 +0000 (+0530)
Subject: Added navigation bar
X-Git-Url: https://code.agnibho.com/repo?a=commitdiff_plain;h=833607fd67377b1323ae04d7a791f5657d6e8a43;p=simpleipd.git

Added navigation bar
---

diff --git a/lib/top.php b/lib/top.php
new file mode 100644
index 0000000..2e4b021
--- /dev/null
+++ b/lib/top.php
@@ -0,0 +1,14 @@
+<nav class="navbar navbar-expand-lg navbar-light bg-light">
+<?php
+if(!empty($_GET["pid"])){
+  echo '<a href="view.php?pid='.$_GET["pid"].'" class="navbar-brand">View Patient</a>';
+}
+else{
+  echo '<a class="navbar-brand" href="#">'.CONFIG_TITLE.'</a>';
+}
+?>
+<div class="ml-auto">
+    <span class="mr-2"><?php echo $_SESSION["user"];?></span>
+    <a href="login?action=logout" class="btn btn-sm btn-secondary">Logout</a>
+  </div>
+</nav>
diff --git a/www/admission.php b/www/admission.php
index 07a97c7..e6ffb76 100644
--- a/www/admission.php
+++ b/www/admission.php
@@ -28,6 +28,7 @@ else{
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <div class="card">
         <div class="card-body">
           <h4 class="card-title">Patient Information</h4>
diff --git a/www/antibiogram.php b/www/antibiogram.php
index deaeaff..09c84f6 100644
--- a/www/antibiogram.php
+++ b/www/antibiogram.php
@@ -102,6 +102,7 @@ if(!empty($_GET["pid"]) && !empty($_GET["form"])){
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <div class="card">
         <div class="card-body">
           <h4 class="card-title">Add New Report</h4>
diff --git a/www/attachments.php b/www/attachments.php
index c65a449..581e549 100644
--- a/www/attachments.php
+++ b/www/attachments.php
@@ -46,6 +46,7 @@ $error=$error."</p>";
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <?php echo getInfo($pid);?>
       <form class="mt-3 mb-3" method="post" enctype="multipart/form-data" <?php echo checkAccess("attachments", "form");?>>
         <label for="upload">Select file to upload. JPG, PNG, GIF and PDF files are supported. Size limit: <span id="size-limit"><?php echo str_replace("M", "MB", ini_get("upload_max_filesize"));?></span><span id="upload-error"></span></label>
diff --git a/www/death.php b/www/death.php
index 7ad9fc7..9d785d0 100644
--- a/www/death.php
+++ b/www/death.php
@@ -22,6 +22,7 @@ if(!empty($_GET["pid"])){
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <?php echo getInfo($pid);?>
       <?php echo str_replace("Save", "Declare Death", $form);?>
     </div>
diff --git a/www/discharge.php b/www/discharge.php
index ed03ca3..580b0d0 100644
--- a/www/discharge.php
+++ b/www/discharge.php
@@ -27,6 +27,7 @@ if(!empty($_GET["pid"])){
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <div class="card mb-4">
         <div class="card-body">
           <h4 class="card-title">Medicine List</h4>
diff --git a/www/forms/nursing.schema.json b/www/forms/nursing.schema.json
index 83ea585..5f6fe1b 100644
--- a/www/forms/nursing.schema.json
+++ b/www/forms/nursing.schema.json
@@ -31,21 +31,9 @@
             "description": "Body Weight",
             "type": "string"
         },
-        "bp": {
-            "description": "Blood Pressure",
+        "temperature": {
+            "description": "Temperature",
             "type": "string"
-        },
-        "pr": {
-            "description": "Pulse",
-            "type": "integer"
-        },
-        "rr": {
-            "description": "Respiratory Rate",
-            "type": "integer"
-        },
-        "spo2": {
-            "description": "SpO2",
-            "type": "integer"
         }
     },
     "required": ["date","time"]
diff --git a/www/history.php b/www/history.php
index 7dc5f62..be3cd08 100644
--- a/www/history.php
+++ b/www/history.php
@@ -23,6 +23,7 @@ else{
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <?php echo getInfo($pid);?>
       <div <?php echo checkAccess("history", "form");?>>
         <?php echo $form;?>
diff --git a/www/index.php b/www/index.php
index 9238ff9..fdbe484 100644
--- a/www/index.php
+++ b/www/index.php
@@ -32,7 +32,7 @@ while($arr=$reqs->fetchArray()){
   </head>
   <body>
     <div class="container">
-      <h1><?php echo CONFIG_TITLE;?></h1>
+      <?php include(CONFIG_LIB."top.php");?>
       <div class="card">
         <div class="card-body">
           <h4 class="card-title">Patient List</h4>
diff --git a/www/laboratory.php b/www/laboratory.php
index a3e5d58..75e27d6 100644
--- a/www/laboratory.php
+++ b/www/laboratory.php
@@ -22,6 +22,7 @@ if(isSet($_GET["pid"])){
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <div class="card">
         <div class="card-body">
           <h4 class="card-title">List of Tests</h4>
diff --git a/www/login.php b/www/login.php
index d159b3b..72da152 100644
--- a/www/login.php
+++ b/www/login.php
@@ -28,6 +28,7 @@ if(!empty($_POST["username"]) && !empty($_POST["password"])){
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <?php echo $error;?>
       <form method="post">
         <input class="m-2 form-control" type="text" name="username" placeholder="Username" required>
@@ -35,7 +36,6 @@ if(!empty($_POST["username"]) && !empty($_POST["password"])){
         <button class="m-2 btn btn-primary" type="submit">Login</button>
       </form>
     </div>
-
     <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/www/nursing.php b/www/nursing.php
index 56d3b1c..5008024 100644
--- a/www/nursing.php
+++ b/www/nursing.php
@@ -28,12 +28,12 @@ if(!empty($_GET["pid"])){
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <?php echo getInfo($pid);?>
       <div <?php echo checkAccess("nursing", "form");?>>
         <?php echo $form;?>
       </div>
     </div>
-
     <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/www/physician.php b/www/physician.php
index b84645a..87c1306 100644
--- a/www/physician.php
+++ b/www/physician.php
@@ -28,12 +28,12 @@ if(!empty($_GET["pid"])){
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <?php echo getInfo($pid);?>
       <div <?php echo checkAccess("physician", "form");?>>
         <?php echo $form;?>
       </div>
     </div>
-
     <?php include(CONFIG_LIB."foot.php");?>
   </body>
 </html>
diff --git a/www/report.php b/www/report.php
index 803d7d5..d13e52f 100644
--- a/www/report.php
+++ b/www/report.php
@@ -41,6 +41,7 @@ if(!empty($_GET["pid"]) && !empty($_GET["form"])){
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <div class="card">
         <div class="card-body">
           <h4 class="card-title">Add New Report</h4>
diff --git a/www/requisition.php b/www/requisition.php
index 6cc10d4..f45faa2 100644
--- a/www/requisition.php
+++ b/www/requisition.php
@@ -46,6 +46,7 @@ if(isSet($_GET["pid"])){
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <div class="card">
         <div class="card-body">
           <h4 class="card-title">List of Requisitions</h4>
diff --git a/www/treatment.php b/www/treatment.php
index 284b61d..39da3fa 100644
--- a/www/treatment.php
+++ b/www/treatment.php
@@ -37,6 +37,7 @@ if(!empty($_GET["pid"])){
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <div class="card mb-4">
         <div class="card-body">
           <h4 class="card-title">Medicine List</h4>
diff --git a/www/view.php b/www/view.php
index e13a6e1..572c62c 100644
--- a/www/view.php
+++ b/www/view.php
@@ -51,6 +51,7 @@ if(isSet($_GET["pid"])){
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <h1>Patient Data</h1>
       <div class="card">
         <div class="card-body">
@@ -127,10 +128,10 @@ if(isSet($_GET["pid"])){
               <div class="form-row">
                 <input type="hidden" name="shiftWard" value="true">
                 <div class="col">
-                  <input type="text" name="ward" class="form-control" placeholder="Ward">
+                  <input type="text" name="ward" class="form-control" placeholder="Ward" required>
                 </div>
                 <div class="col">
-                  <input type="text" name="bed" class="form-control" placeholder="Bed">
+                  <input type="text" name="bed" class="form-control" placeholder="Bed" required>
                 </div>
                 <div class="col">
                   <input type="date" name="date" class="form-control" placeholder="Date">
diff --git a/www/vitek.php b/www/vitek.php
index 61d23fe..f1993ed 100644
--- a/www/vitek.php
+++ b/www/vitek.php
@@ -28,6 +28,7 @@ else{
   </head>
   <body>
     <div class="container">
+      <?php include(CONFIG_LIB."top.php");?>
       <div class="card">
         <div class="card-body">
           <h4 class="card-title">Type of Organism</h4>