Option to delete drug

diff --git a/lib/db.php b/lib/db.php
index 18ad8b56260fdb5ff5ca480f3a3928c4bb7bfb9b..88333d7865294f58f0cbdc509f23170b0e111537 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -175,6 +175,15 @@ class DB extends SQLite3 {
     $stmt->execute();
     $log->log(null, "drug_omitted", $id);
   }
+  function deleteDrug($id){
+    global $log;
+    if(!checkAccess("treatment", "dbSet")) return false;
+    $stmt=$this->prepare("UPDATE treatment SET omit=:omit WHERE rowid=:id;");
+    $stmt->bindValue(":omit", -1);
+    $stmt->bindValue(":id", $id);
+    $stmt->execute();
+    $log->log(null, "drug_deleted", $id);
+  }
   function giveDrug($id, $given){
     global $log;
     if(!checkAccess("nursing", "dbSet")) return false;
@@ -262,8 +271,9 @@ class DB extends SQLite3 {
   function getDrugs($pid){
     global $log;
     if(!checkAccess("treatment", "dbGet")) return false;
-    $stmt=$this->prepare("SELECT rowid,* FROM treatment WHERE pid=:pid ORDER BY omit,start;");
+    $stmt=$this->prepare("SELECT rowid,* FROM treatment WHERE pid=:pid AND omit!=:omit ORDER BY omit,start;");
     $stmt->bindValue(":pid", $pid);
+    $stmt->bindValue(":omit", -1);
     $result=$stmt->execute();
     return($result);
   }

diff --git a/www/res/custom.css b/www/res/custom.css
index 9e5575c0f0d5cee7cbfe7aa630db0aae1c2bb536..f3c0280b194a9273f7b94fbf2d2bd85b7135d46a 100644 (file)
--- a/www/res/custom.css
+++ b/www/res/custom.css
@@ -1,6 +1,9 @@
 .omit{
        text-decoration: line-through;
 }
-.omit>td>button{
+.omit>td>button.nomit{
+       display: none;
+}
+.nomit>td>button.omit{
        display: none;
 }

diff --git a/www/treatment.php b/www/treatment.php
index 6ce66d334f0614ea0efa11bb621cc47230a6952e..1d6b152c1a5d58772a6b626354b25bb93ce796cf 100644 (file)
--- a/www/treatment.php
+++ b/www/treatment.php
@@ -16,6 +16,9 @@ if(!empty($_GET["pid"])){
   elseif(!empty($_POST["omit"])){
     $db->omitDrug($_POST["omit"], $_POST["date"], $_POST["time"]);
   }
+  elseif(!empty($_POST["delete"])){
+    $db->deleteDrug($_POST["delete"]);
+  }
   elseif(!empty($_POST["drug"])){
     $db->addDrug($pid, $_POST["drug"], $_POST["dose"], $_POST["route"], $_POST["frequency"], $_POST["date"], $_POST["time"], $_POST["duration"], $_POST["extra_note"]);
   }
@@ -26,7 +29,7 @@ if(!empty($_GET["pid"])){
       $omit="omit";
     }
     else{
-      $omit="";
+      $omit="nomit";
       //try{
       //  if($drug["start"]+$drug["duration"]*24*3600<time()){
       //    $db->omitDrug($drug["rowid"]);
@@ -47,9 +50,11 @@ if(!empty($_GET["pid"])){
     else{
       $end="";
     }
-    $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"]).$end."</td><td>".$drug["duration"]."</td><td>".$drug["addl"]."</td><td>".$last."</td><td><button type='submit' class='btn btn-success confirm' name='give' value='".$drug["rowid"]."' form='administer' ".$omit." ".checkAccess("nursing", "form").">Give</button></td><td><button type='submit' class='btn btn-warning confirm' name='omit' value='".$drug["rowid"]."' form='omitter' ".$omit." ".checkAccess("treatment", "form").">Omit</button></td></tr>";
+    if(filter_var($drug["duration"], FILTER_VALIDATE_INT)){
+      $drug["duration"]=$drug["duration"]. " days";
+    }
+    $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"]).$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' class='btn btn-warning nomit confirm' name='omit' value='".$drug["rowid"]."' form='omitter' ".$omit." ".checkAccess("treatment", "form").">Omit</button><button type='submit' class='btn btn-secondary omit confirm' name='delete' value='".$drug["rowid"]."' form='delete' ".$omit." ".checkAccess("treatment", "form").">Delete</button></td></tr>";
   }
-  $view=$view."</table>";
   $form=schema2form("forms/drugs.schema.json");
   if(checkAccess("treatment")=="all" && $db->getStatus($pid)->fetchArray()["status"]=="admitted"){
     $hideForm="";
@@ -79,8 +84,12 @@ if(!empty($_GET["pid"])){
             <input type="hidden" name="date">
             <input type="hidden" name="time">
           </form>
+          <form method='post' id='delete'>
+            <input type="hidden" name="date">
+            <input type="hidden" name="time">
+          </form>
           <table class="table">
-            <tr><th>Drug</th><th>Dose</th><th>Route</th><th>Frequency</th><th>Start</th><th>Duration</th><th>Note</th><th>Given</th><th></th><th></th></tr>
+            <tr><th>Drug</th><th>Dose</th><th>Route</th><th>Frequency</th><th>Start</th><th>Duration</th><th>Note</th><th>Given</th><th></th></tr>
             <?php echo $view;?>
           </table>
         </div>