Merge branch 'master' into rdxportjs-refactor

Conflicts:
	www/js/importer.js
	www/js/jingles.js
	www/js/musicpools.js
	www/js/shows.js

1 files changed, 25 insertions, 11 deletions

diff --git a/www/js/shows.js b/www/js/shows.js
index 0379951..8fcba8b 100644
--- a/www/js/shows.js
+++ b/www/js/shows.js
@@ -203,7 +203,12 @@ Rdxport.ShowView.prototype.render = function() {
     if (cart) {
       var cartView = new Rdxport.ShowCartView(cart, self);
       self.cartViews.push(cartView);
-      cartView.render();
+      var upload = null;
+      if ((upload = importer.getUploadByCartNumber(log.cartNumber)) !== null) {
+        cartView.renderUploading(upload);
+      } else {
+        cartView.render();
+      }
 
       $('#app-shows table > tbody').append(cartView.$el);
     } else {
@@ -230,16 +235,7 @@ Rdxport.ShowView.prototype.uploadProgress = function(upload, file) {
     $cart.addClass('uploading');
   }
 
-  if(file.upload.progress < 99) {
-    var bytes_str = Number((file.upload.bytesSent/1024)/1024).toFixed(1) + " von " +
-        Number((file.upload.total/1024)/1024).toFixed(1) + " MB";
-    $cart.find('.file-bytes').text(bytes_str);
-    $cart.find('.progress .progress-bar').css("width", file.upload.progress + "%");
-  } else {
-    $cart.find('.file-bytes').text('importiere...');
-    $cart.find('.progress .progress-bar').css('width', '100%');
-    $cart.find('.progress .progress-bar').addClass('progress-bar-striped').addClass('active');
-  }
+  updateProgressBar($cart, upload);
 };
 
 Rdxport.ShowView.prototype.uploadError = function(upload, file, msg, xhr, acknowledge) {
@@ -313,6 +309,24 @@ Rdxport.ShowCartView.prototype.render = function() {
     .append($('<td>').css('text-align', 'center').append($deleteButton));
 };
 
+Rdxport.ShowCartView.prototype.renderUploading = function(upload) {
+  var $progressBar = $('.progressBarTemplate.shows').clone().removeClass('progressBarTemplate');
+  $('.file-name', $progressBar).text(this.model.title);
+  $('.cart-number', $progressBar).text(this.model.number);
+
+  this.$el.empty()
+    .attr('id', 'show-cart-' + this.model.number)
+    .html($progressBar.html())
+    .attr('id', 'show-cart-' + this.model.number)
+    .addClass('uploading');
+
+  $('button', this.$el).on('click', function() {
+    upload.cancel();
+  });
+
+  updateProgressBar(this.$el, upload);
+};
+
 Rdxport.ShowCartView.renderEmpty = function(group, groupView, cartNumber) {
   var $uploadButton = $('<button class="uploadButton btn btn-primary btn-xs"><span class="glyphicon glyphicon-upload"></span>&nbsp;&nbsp;Importieren</button>');