Confirm before omit

diff --git a/lib/db.php b/lib/db.php
index 0f245dc22e1cede68ab7394826e85f5e440aa860..fd399dc03019c6c2867d6e804738d489fbc62551 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -163,11 +163,11 @@ class DB extends SQLite3 {
     $stmt->execute();
     $log->log($pid, "drug_added", json_encode([$drug,$dose,$route,$frequency,$date,$time,$duration,$addl]));
   }
-  function omitDrug($id){
+  function omitDrug($id, $date, $time){
     global $log;
     if(!checkAccess("treatment", "dbSet")) return false;
     $stmt=$this->prepare("UPDATE treatment SET end=:end,omit=:omit WHERE rowid=:id;");
-    $stmt->bindValue(":end", time());
+    $stmt->bindValue(":end", strtotime($date." ".$time));
     $stmt->bindValue(":omit", true);
     $stmt->bindValue(":id", $id);
     $stmt->execute();

diff --git a/www/res/script.js b/www/res/script.js
index 38c970f0e3b663eaac33bbf61545aeb575888c03..99052230b226cb5f595593bd95aa572a7414e025 100644 (file)
--- a/www/res/script.js
+++ b/www/res/script.js
@@ -1,4 +1,11 @@
 $(document).ready(function(){
+  $(".confirm").each(function(){
+    $(this).click(function(event){
+      if(!confirm("Continue?")){
+        event.preventDefault();
+      }
+    });
+  });
   $("#upload").change(function(){
     lim=$("#size-limit").text().split("MB")[0]*1000*1000;
     if(this.files[0]["size"]>lim){

diff --git a/www/treatment.php b/www/treatment.php
index b4b9bc49914a32bdb47b7d66497926370d28ed45..62e31c143e1165b67ae3ce05bb0faabe9cff34fc 100644 (file)
--- a/www/treatment.php
+++ b/www/treatment.php
@@ -10,11 +10,11 @@ if(!empty($_GET["pid"])){
     else{
       $given=[];
     }
-    array_push($given, time());
+    array_push($given, strtotime($_POST["date"]." ".$_POST["time"]));
     $db->giveDrug($_POST["give"], json_encode($given));
   }
   elseif(!empty($_POST["omit"])){
-    $db->omitDrug($_POST["omit"]);
+    $db->omitDrug($_POST["omit"], $_POST["date"], $_POST["time"]);
   }
   elseif(!empty($_POST["drug"])){
     $db->addDrug($pid, $_POST["drug"], $_POST["dose"], $_POST["route"], $_POST["frequency"], $_POST["date"], $_POST["time"], $_POST["duration"], $_POST["extra_note"]);
@@ -41,7 +41,7 @@ if(!empty($_GET["pid"])){
     else{
       $last="";
     }
-    $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>".$last."</td><td><button type='submit' class='btn btn-success' name='give' value='".$drug["rowid"]."' form='administer' ".$omit." ".checkAccess("nursing", "form").">Give</button></td><td><button type='submit' class='btn btn-warning' name='omit' value='".$drug["rowid"]."' form='omitter' ".$omit." ".checkAccess("treatment", "form").">Omit</button></td></tr>";
+    $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>".$last."</td><td><button type='submit' class='btn btn-success' 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>";
   }
   $view=$view."</table>";
   $form=schema2form("forms/drugs.schema.json");
@@ -59,8 +59,14 @@ if(!empty($_GET["pid"])){
       <div class="card mb-4">
         <div class="card-body">
           <h4 class="card-title">Medicine List</h4>
-          <form method='post' id='omitter'></form>
-          <form method='post' id='administer'></form>
+          <form method='post' id='omitter'>
+            <input type="hidden" name="date">
+            <input type="hidden" name="time">
+          </form>
+          <form method='post' id='administer'>
+            <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>
             <?php echo $view;?>