Luca Parisio преди 1 година
родител
ревизия
0e0d13eec8
променени са 2 файла, в които са добавени 14 реда и са изтрити 8 реда
  1. 4 2
      app/Http/Livewire/Member.php
  2. 10 6
      public/medere.html

+ 4 - 2
app/Http/Livewire/Member.php

@@ -756,7 +756,8 @@ class Member extends Component
 
     public function showDetailF($id)
     {
-        $this->from = 'members';
+        if (!isset($_GET["from"]) && $this->from == '')
+            $this->from = 'members';
         $this->currentMember = \App\Models\Member::findOrFail($id);
         $this->currentStatus = $this->currentMember->getStatus();
         $this->showDetail = true;
@@ -917,7 +918,8 @@ class Member extends Component
 
     public function edit($id){
 
-        $this->from = 'members';
+        if (!isset($_GET["from"]) && $this->from == '')
+            $this->from = 'members';
         $this->showDetail = false;
         $this->emit('setEdit', true);
         $this->emit('setEditCorso', false);

+ 10 - 6
public/medere.html

@@ -32,17 +32,20 @@ var s3 = new AWS.S3({
 
     <progress max=”100” value=”0”></progress>
 
-    <img src="https://medere.s3.de.io.cloud.ovh.net/medere/test/sample.jpg?123">
+    <!--
+    <img src="https://medere.s3.de.io.cloud.ovh.net/medere/sample.jpg?123">
+    -->
 
     <script type="text/javascript">
 
       function s3upload() {  
+            const start = Date.now();
                 var files = document.getElementById('fileUpload').files;
                 if (files) 
                 {
                     var file = files[0];
                     var fileName = file.name;
-                    var filePath = 'test/' + fileName;
+                    var filePath = fileName;
                     var fileUrl = 'https://s3.de.io.cloud.ovh.net/' +  filePath;
             
                     s3.upload({
@@ -52,11 +55,12 @@ var s3 = new AWS.S3({
                     }, function(err, data) {
                         if(err) {
                             console.log('error' + err);
-                        }
-                        
-                        alert('Successfully Uploaded!');
+                        }                       
+                        const end = Date.now(); 
+                        const sec = (end - start) / 1000;
+                        alert(`File caricato in : ${sec} secondi`);
                     }).on('httpUploadProgress', function (progress) {
-                        var uploaded = parseInt((progress.loaded * 100) / progress.total);
+                        var uploaded = progress.loaded / progress.total;
                         $("progress").attr('value', uploaded);
                     });
                 }