]> Softwares of Agnibho - simpleipd.git/commitdiff
Deletable attachments
authorAgnibho Mondal <mondal@agnibho.com>
Thu, 10 Jun 2021 22:29:16 +0000 (03:59 +0530)
committerAgnibho Mondal <mondal@agnibho.com>
Thu, 10 Jun 2021 22:29:16 +0000 (03:59 +0530)
www/attachments.php
www/treatment.php

index 581e549312fae1105fa3058e00d03334108143fa..4df1e588c38bee6bf62fa44f14219fb839aa885a 100644 (file)
@@ -14,7 +14,7 @@ if(!empty($_GET["pid"])){
         $name="";
       }
       $fname=str_replace("/", "", $pid)."-".$name.time()."-".rand(1000,9999).".".pathinfo($_FILES["upload"]["name"], PATHINFO_EXTENSION);
-      move_uploaded_file($_FILES["upload"]["tmp_name"], "data/attachments/".$fname);
+      move_uploaded_file($_FILES["upload"]["tmp_name"], CONFIG_WWW."data/attachments/".$fname);
       if(!empty($_GET["req"])){
         $db->omitRequisition($_GET["req"]);
       }
@@ -23,14 +23,25 @@ if(!empty($_GET["pid"])){
       $error=$error."Only jpg, png, gif, pdf files are supported.";
     }
   }
+  elseif(!empty($_POST["delete"])){
+    $file=str_replace("/","",$_POST["delete"]);
+    rename(CONFIG_WWW."data/attachments/".$file, CONFIG_WWW."data/attachments/.trash/".$file);
+  }
+
+  if(checkAccess("attachments")=="all" && $db->getStatus($pid)->fetchArray()["status"]=="admitted"){
+    $hideEdit="";
+  }
+  else{
+    $hideEdit="style='display:none'";
+  }
 
   foreach(glob("data/attachments/".str_replace("/", "", $pid)."-*") as $attach){
     if(pathinfo($attach, PATHINFO_EXTENSION)=="pdf"){
-      $pdfs=$pdfs."<a href='".$attach."'>".pathinfo($attach, PATHINFO_BASENAME)."</a>";
+      $pdfs=$pdfs."<p><a href='".$attach."'>".pathinfo($attach, PATHINFO_BASENAME)."</a> <button type='submit' ".$hideEdit." form='delete' name='delete' value='".pathinfo($attach, PATHINFO_BASENAME)."' class='float-right btn btn-sm btn-outline-danger confirm'>Delete</button></p><hr>";
     }
     else{
       preg_match("/-([0-9]+)-/", pathinfo($attach, PATHINFO_FILENAME), $orig);
-      $imgs=$imgs."<div class='col-md-6'><figure><a href='".$attach."'><img class='w-100' src='".$attach."'></a><figcaption>Uploaded on: ".date("M d, Y h:i a", $orig[1])."</figcaption></figure></div>";
+      $imgs=$imgs."<div class='col-md-6'><figure><a href='".$attach."'><img class='w-100 mb-2' src='".$attach."'></a><figcaption>Uploaded on: ".date("M d, Y h:i a", $orig[1])." <button type='submit' ".$hideEdit." form='delete' name='delete' value='".pathinfo($attach, PATHINFO_BASENAME)."' class='float-right btn btn-sm btn-outline-danger confirm'>Delete</button></figcaption></figure></div>";
     }
   }
 }
@@ -46,9 +57,10 @@ $error=$error."</p>";
   </head>
   <body>
     <div class="container">
+      <form method="post" id="delete"></form>
       <?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");?>>
+      <form class="mt-3 mb-3" method="post" enctype="multipart/form-data" <?php echo $hideEdit; ?>>
         <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>
         <input type="file" name="upload" id="upload" class="form-control">
         <input type="submit" value="Upload" class="mt-2 btn btn-primary">
index 20b6489557bf2393ad31bcfc22fa94d593f0308c..46820a35324c4bd59a92b69fc34cc77721e5465a 100644 (file)
@@ -31,6 +31,12 @@ if(!empty($_GET["pid"])){
   }
   $list=$db->getDrugs($pid);
   $view="";
+  if(checkAccess("treatment")=="all" && $db->getStatus($pid)->fetchArray()["status"]=="admitted"){
+    $hideEdit="";
+  }
+  else{
+    $hideEdit="style='display:none'";
+  }
   while($drug=$list->fetchArray()){
     if($drug["omit"]){
       $omit="omit";
@@ -60,16 +66,10 @@ 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' 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><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' ".$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>";
   }
   $form=schema2form("forms/drugs.schema.json");
   $form2=schema2form("forms/advice.schema.json", null, null, null, json_decode($advice));
-  if(checkAccess("treatment")=="all" && $db->getStatus($pid)->fetchArray()["status"]=="admitted"){
-    $hideForm="";
-  }
-  else{
-    $hideForm="style='display:none'";
-  }
 }
 ?>
 <!DOCTYPE html>
@@ -86,13 +86,13 @@ if(!empty($_GET["pid"])){
         <div class="card-body">
           <h4 class="card-title">Advice</h4>
           <?php echo viewData($advice);?>
-          <a id="to-form-advice" href="#forms" class="btn btn-primary float-right mb-2">Edit General Measures</a>
+          <a id="to-form-advice" href="#forms" class="btn btn-primary float-right mb-2" <?php echo $hideEdit; ?>>Edit General Measures</a>
         </div>
       </div>
       <div class="card mb-4">
         <div class="card-body">
           <h4 class="card-title">Medicine List</h4>
-          <a id="to-form-drug" href="#forms" class="btn btn-primary float-right mb-2">Add New Drug</a>
+          <a id="to-form-drug" href="#forms" class="btn btn-primary float-right mb-2" <?php echo $hideEdit; ?>>Add New Drug</a>
           <form method='post' id='omitter'>
             <input type="hidden" name="date">
             <input type="hidden" name="time">
@@ -111,7 +111,7 @@ if(!empty($_GET["pid"])){
           </table>
         </div>
       </div>
-      <div <?php echo $hideForm;?>>
+      <div <?php echo $hideEdit;?>>
         <ul class="nav nav-tabs" id="form-navs" rold="tablist">
           <li class="nav-item" role="presentation">
             <a class="nav-link active" id="nav-drug" data-toggle="tab" href="#form-drug" role="tab" aria-controls="form-drug" aria-selected="true">Add Drug</a>