X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.ImageUpload.js;h=24bd262527d468ce76be395a32302aa473183dc3;hb=cfb029307ecd356f377952f3190df655cbd447c6;hp=ca5d3886b8254ea08af513aa734b49818579741c;hpb=9129b021dfac0fa3df3c446b23deb71299171f03;p=kivitendo-erp.git

diff --git a/js/kivi.ImageUpload.js b/js/kivi.ImageUpload.js
index ca5d3886b..24bd26252 100644
--- a/js/kivi.ImageUpload.js
+++ b/js/kivi.ImageUpload.js
@@ -1,7 +1,11 @@
 namespace("kivi.ImageUpload", function(ns) {
   "use strict";
 
-  const MAXSIZE = 5*1024*1024; // 5MB size limit
+  const MAXSIZE = 15*1024*1024; // 5MB size limit
+  const M = kivi.Materialize;
+
+  let num_images = 0;
+  ns.upload_in_progress = undefined;
 
   ns.add_files = function(target) {
     let files = [];
@@ -18,7 +22,10 @@ namespace("kivi.ImageUpload", function(ns) {
   ns.reload_images = function() {
     kivi.FileDB.retrieve_all((data) => {
       $('#stored-images').empty();
+      num_images = data.length;
+
       data.forEach(ns.create_thumb_row);
+      ns.set_image_button_enabled();
     });
   };
 
@@ -43,9 +50,16 @@ namespace("kivi.ImageUpload", function(ns) {
     let $row = $(event.target).closest(".image-upload-row");
     kivi.FileDB.delete_key(key, () => {
       $row.remove();
+      num_images--;
+      ns.set_image_button_enabled();
     });
   };
 
+  ns.set_image_button_enabled = function() {
+    $('#upload_images_submit').attr("disabled", num_images == 0 || !$('#object_id').val());
+  };
+
+
   ns.upload_files = function() {
     let id = $('#object_id').val();
     let type = $('#object_type').val();
@@ -54,58 +68,64 @@ namespace("kivi.ImageUpload", function(ns) {
   };
 
   ns.upload_selected_files = function(id, type, maxsize) {
+    $("#upload_modal").modal({ dismissible: false });
     $("#upload_modal").modal("open");
 
     kivi.FileDB.retrieve_all((myfiles) => {
       let filesize  = 0;
-      myfiles.forEach(file => {
-        filesize  += file.size;
-        if (filesize > maxsize) {
-          $("#upload_result").html(kivi.t8("filesize too big: ") + filesize+ kivi.t8(" bytes, max=") + maxsize );
-          return;
-        }
+      myfiles.forEach(file => filesize  += file.size);
+
+      if (filesize > maxsize) {
+        M.flash(kivi.t8("filesize too big: ") + ns.format_si(filesize) + " > " + ns.format_si(maxsize));
+        $("#upload_modal").modal("close");
+        return;
+      }
 
-        let data = new FormData();
-        data.append("uploadfiles[]", file);
-        data.append("action", "File/ajax_files_uploaded");
-        data.append("json", "1");
-        data.append("object_type", type);
-        data.append("object_id", id);
-        data.append("file_type", "attachment");
-
-        $("#upload_result").html(kivi.t8("start upload"));
-
-        let xhr = new XMLHttpRequest;
-        xhr.open('POST', 'controller.pl', true);
-        xhr.success = ns.attSuccess;
-        xhr.progress = ns.attProgress;
-        xhr.error = ns.attFailed;
-        xhr.abort = ns.attCanceled;
-        xhr.send(data);
-      });
+      let data = new FormData();
+      myfiles.forEach(file => data.append("uploadfiles[]", file));
+      data.append("action", "File/ajax_files_uploaded");
+      data.append("json", "1");
+      data.append("object_type", type);
+      data.append("object_id", id);
+      data.append("file_type", "attachment");
+
+      $("#upload_result").html(kivi.t8("start upload"));
+
+      let xhr = new XMLHttpRequest;
+      xhr.open('POST', 'controller.pl', true);
+      xhr.onload = ns.upload_complete;
+      xhr.upload.onprogress = ns.progress;
+      xhr.upload.onerror = ns.failed;
+      xhr.upload.onabort = ns.abort;
+      xhr.send(data);
+
+      ns.upload_in_progress = xhr;
     });
   };
 
-  ns.attProgress = function(event) {
+  ns.progress = function(event) {
     if (event.lengthComputable) {
-      var percentComplete = (event.loaded / event.total) * 100;
-      $("#upload_result").html(percentComplete+" % "+ kivi.t8("uploaded"));
+      var percent_complete = (event.loaded / event.total) * 100;
+      $("#upload_progress div").removeClass("indeterminate").addClass("determinate").attr("style", "width: " + percent_complete + "%");
     }
   };
 
-  ns.attFailed = function() {
+  ns.failed = function() {
     $('#upload_modal').modal('close');
-    $("#upload_result").html(kivi.t8("An error occurred while transferring the file."));
+    M.flash(kivi.t8("An error occurred while transferring the file."));
   };
 
-  ns.attCanceled = function() {
+  ns.abort = function() {
     $('#upload_modal').modal('close');
-    $("#upload_result").html(kivi.t8("The transfer has been canceled by the user."));
+    M.flash(kivi.t8("The transfer has been canceled by the user."));
+
+    ns.upload_in_progress = undefined;
   };
 
-  ns.attSuccess = function() {
+  ns.upload_complete = function() {
     $('#upload_modal').modal('close');
-    $("#upload_result").html(kivi.t8("Files have been uploaded successfully."));
+    M.flash(kivi.t8("Files have been uploaded successfully."));
+    kivi.FileDB.delete_all(ns.reload_images);
   };
 
   ns.resolve_object = function(event) {
@@ -128,19 +148,31 @@ namespace("kivi.ImageUpload", function(ns) {
           $("#object_description").html(json.description);
           $("#object_id").val(json.id);
         }
+        ns.set_image_button_enabled();
       },
       error: () => {
         $("#object_description").html("");
         $("#object_id").val("");
+        ns.set_image_button_enabled();
       }
     });
   };
 
+  /* this tries to format the number human readable. 3 significant digits, si suffix, */
+  ns.format_si = function(n) {
+    const prefixes = ["", "K" , "M", "G", "T", "P"];
+    let i = 0;
+    while (n >= 1024) {
+      n /= 1024;
+      i++;
+    }
+
+    return kivi.format_amount(n, 3 - (n|0).toString().length) + prefixes[i] + "B";
+  };
+
   ns.init = function() {
     ns.reload_images();
   };
-
-
 });
 
 $(kivi.ImageUpload.init);