Merge branch 'master' of agnibho.com:~/repo/public/simpleipd

[simpleipd.git] / www / treatment.php

diff --git a/www/treatment.php b/www/treatment.php
index 46820a35324c4bd59a92b69fc34cc77721e5465a..baa26aaa902d9b816ec4abaacd46f5eacfbf7a20 100644 (file)
--- a/www/treatment.php
+++ b/www/treatment.php
@@ -66,7 +66,7 @@ if(!empty($_GET["pid"])){
     if(filter_var($drug["duration"], FILTER_VALIDATE_INT)){
       $drug["duration"]=$drug["duration"]. " days";
     }
-    $view=$view."<tr class='".$omit." drug-entry' data-drug='".$drug["drug"]."' data-dose='".$drug["dose"]."' data-route='".$drug["route"]."' data-frequency='".$drug["frequency"]."' data-duration='".$drug["duration"]."' data-addl='".$drug["addl"]."'><td>".$drug["drug"]."</td><td>".$drug["dose"]."</td><td>".$drug["route"]."</td><td>".$drug["frequency"]."</td><td>".date("M j", $drug["start"]).$end."</td><td>".$drug["duration"]."</td><td>".$drug["addl"]."</td><td>".$last."</td><td><button type='submit' ".$hideEdit." class='btn btn-success nomit confirm' name='give' value='".$drug["rowid"]."' form='administer' ".$omit." ".checkAccess("nursing", "form").">Give</button><button type='submit' ".$hideEdit." class='btn btn-warning nomit confirm' name='omit' value='".$drug["rowid"]."' form='omitter' ".$omit." ".checkAccess("treatment", "form").">Omit</button><button type='submit' ".$hideEdit." class='btn btn-secondary omit confirm' name='delete' value='".$drug["rowid"]."' form='delete' ".$omit." ".checkAccess("treatment", "form").">Delete</button></td><td class='copier'></td></tr>";
+    $view=$view."<tr class='".$omit." drug-entry' data-drug='".$drug["drug"]."' data-dose='".$drug["dose"]."' data-route='".$drug["route"]."' data-frequency='".$drug["frequency"]."' data-duration='".$drug["duration"]."' data-addl='".$drug["addl"]."'><td>".$drug["drug"]."</td><td>".$drug["dose"]."</td><td>".$drug["route"]."</td><td>".$drug["frequency"]."</td><td>".date("M j", $drug["start"]).$end."</td><td>".$drug["duration"]."</td><td>".$drug["addl"]."</td><td>".$last."</td><td><button type='submit' class='btn btn-success nomit confirm' name='give' value='".$drug["rowid"]."' form='administer' ".$omit." ".checkAccess("nursing", "form").">Give</button><button type='submit' ".$hideEdit." class='btn btn-warning nomit confirm' name='omit' value='".$drug["rowid"]."' form='omitter' ".$omit." ".checkAccess("treatment", "form").">Omit</button><button type='submit' ".$hideEdit." class='btn btn-secondary omit confirm' name='delete' value='".$drug["rowid"]."' form='delete' ".$omit." ".checkAccess("treatment", "form").">Delete</button></td><td class='copier'></td></tr>";
   }
   $form=schema2form("forms/drugs.schema.json");
   $form2=schema2form("forms/advice.schema.json", null, null, null, json_decode($advice));
@@ -150,7 +150,8 @@ $(document).ready(function(){
         $("#frequency").val(drugEntry.data("frequency"));
         $("#duration").val(drugEntry.data("duration"));
         $("#addl").val(drugEntry.data("addl"));
-        window.location.hash="drug-form";
+        $("#nav-drug").tab("show");
+        window.location.hash="form-drug";
       });
     }
   });