Added transfer records

diff --git a/lib/functions.php b/lib/functions.php
index e9a78a978cdd21da50beb084e93236551d082b69..e3264d03dc23ddf3a809511ad556e92ccd7f6f9b 100644 (file)
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -64,7 +64,7 @@ function schema2form($file, $pid=null, $id=null, $cat=null, $data=null){
     $form=$form."</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."<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;
@@ -112,8 +112,8 @@ 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>";
+        elseif($field=="extra_note"){
+          $view=$view."<tr><td>Extra Notes</td><td><pre>".$value."</pre></td></tr>";
         }
         else{
           $view=$view."<tr><td>".$field."</td><td>".$value."</td></tr>";

diff --git a/www/res/script.js b/www/res/script.js
index bb0ce4dfe89614cda7c577de172197be9f60c72e..38c970f0e3b663eaac33bbf61545aeb575888c03 100644 (file)
--- a/www/res/script.js
+++ b/www/res/script.js
@@ -18,7 +18,7 @@ $(document).ready(function(){
   });
   $("[name='time']").each(function(){
     if($(this).val()==""){
-      $(this).val(moment().format("hh:mm"));
+      $(this).val(moment().format("HH:mm"));
     }
   });
   $("[data-toggle='popover']").popover({"placement": "top", "trigger": "focus"});

diff --git a/www/treatment.php b/www/treatment.php
index 8a8b4fe91c6e0a2d2923d28741d06c78bbc0dbc3..284b61d781d656736cfd8a4d146764eabae9ddbc 100644 (file)
--- a/www/treatment.php
+++ b/www/treatment.php
@@ -16,12 +16,12 @@ if(!empty($_GET["pid"])){
     }
     else{
       $omit="";
-      try{
-        if($drug["start"]+$drug["duration"]*24*3600<time()){
-          $db->omitDrug($drug["rowid"]);
-          $omit="omit";
-        }
-      } catch(TypeError $e){}
+      //try{
+      //  if($drug["start"]+$drug["duration"]*24*3600<time()){
+      //    $db->omitDrug($drug["rowid"]);
+      //    $omit="omit";
+      //  }
+      //} catch(TypeError $e){}
     }
     $view=$view."<tr class='".$omit."'><td>".$drug["drug"]."</td><td>".$drug["dose"]."</td><td>".$drug["route"]."</td><td>".$drug["frequency"]."</td><td>".date("M j", $drug["start"])."</td><td>".$drug["duration"]."</td><td>".$drug["addl"]."</td><td><button type='submit' class='btn btn-warning' name='omit' value='".$drug["rowid"]."' form='omitter' ".$omit." ".checkAccess("treatment", "form").">Omit</button></td></tr>";
   }

diff --git a/www/view.php b/www/view.php
index 60b5f9b611aa1b33f7e2a6a3d0e1c1a1e869e194..e13a6e16cf4c27e6c2737146de8204be5d368a00 100644 (file)
--- a/www/view.php
+++ b/www/view.php
@@ -1,11 +1,26 @@
 <?php
 require(dirname(__DIR__)."/require.php");
+
 $info="";
 $physician=[];
 $nursing=[];
 $reports=[];
 if(isSet($_GET["pid"])){
   $pid=$_GET["pid"];
+
+  if(!empty($_POST["shiftWard"]) && !empty($_POST["ward"]) && !empty($_POST["bed"])){
+    $ward=$_POST["ward"];
+    $bed=$_POST["bed"];
+    $oldward=$db->getWard($pid)->fetchArray()["ward"];
+    $oldbed=$db->getBed($pid)->fetchArray()["bed"];
+    $rec="Transfer: ".$oldward."-".$oldbed." -> ".$ward."-".$bed." @ ".$_POST["date"]." ".$_POST["time"];
+    $data=json_decode($db->getAdmissionData($pid)->fetchArray()["data"]);
+    $data->ward=$ward;
+    $data->bed=$bed;
+    $data->extra_note=$data->extra_note."\n".$rec;
+    $db->admit((array) $data);
+  }
+
   $status=$db->getStatus($pid)->fetchArray()["status"];
   $info=viewData($db->getAdmissionData($pid)->fetchArray()["data"]);
   $history=viewData($db->getHistory($pid)->fetchArray()["history"]);
@@ -107,6 +122,27 @@ if(isSet($_GET["pid"])){
                 </table>
               </div>
             </div>
+            <a href="#" id="showtransfer">Transfer</a>
+            <form method="post" id="transfer" class="d-none">
+              <div class="form-row">
+                <input type="hidden" name="shiftWard" value="true">
+                <div class="col">
+                  <input type="text" name="ward" class="form-control" placeholder="Ward">
+                </div>
+                <div class="col">
+                  <input type="text" name="bed" class="form-control" placeholder="Bed">
+                </div>
+                <div class="col">
+                  <input type="date" name="date" class="form-control" placeholder="Date">
+                </div>
+                <div class="col">
+                  <input type="time" name="time" class="form-control" placeholder="Time">
+                </div>
+                <div class="col">
+                  <button type="submit" class="btn btn-primary">Transfer</button>
+                </div>
+              </div>
+            </form>
           </div>
           <div class="tab-pane fade" id="history" role="tabpanel" aria-labelledby="history-tab">
             <?php echo $history;?>
@@ -132,5 +168,12 @@ if(isSet($_GET["pid"])){
       </form>
     </div>
     <?php include(CONFIG_LIB."foot.php");?>
+<script>
+$(document).ready(function(){
+  $("#showtransfer").click(function(){
+    $("#transfer").removeClass("d-none");
+  });
+});
+</script>
   </body>
 </html>