fix error render, update cart-number and name on progress

1 files changed, 25 insertions, 16 deletions

diff --git a/www/js/shows.js b/www/js/shows.js
index 82e38b5..7dc94d3 100644
--- a/www/js/shows.js
+++ b/www/js/shows.js
@@ -251,7 +251,7 @@ Rdxport.ShowView.prototype.render = function() {
     var cart = self.model.getCartByNumber(log.cartNumber);
     var upload = importer.getUploadByCartNumber(log.cartNumber);
     if (upload) {
-      $('#app-shows table > tbody').append(Rdxport.ShowCartView.renderUploading(upload, log.cartNumber));
+      $('#app-shows table > tbody').append(Rdxport.ShowCartView.renderUploading(upload));
     } else if (cart) {
       var cartView = new Rdxport.ShowCartView(cart, self);
       self.cartViews.push(cartView);
@@ -263,12 +263,10 @@ Rdxport.ShowView.prototype.render = function() {
   });
 };
 
-Rdxport.ShowView.prototype.uploadProgress = function(upload, file) {
+Rdxport.ShowView.prototype.uploadProgress = function(upload) {
   var $cart = $('tr[data-upload-id="' + upload.uploadId + '"]').first();
   if (!$cart.hasClass('uploading')) {
     var $progressBar = $('.progressBarTemplate.shows').clone().removeClass('progressBarTemplate');
-    $('.file-name', $progressBar).text(file.name);
-    $('.cart-number', $progressBar).text(file.cartNumber);
     $cart.html($progressBar.html());
 
     $('button', $cart).off('click').on('click', function() {
@@ -277,32 +275,43 @@ Rdxport.ShowView.prototype.uploadProgress = function(upload, file) {
 
     $cart.addClass('uploading');
   }
+  if (upload.title) {
+    $('.file-name', $cart).text(upload.title);
+  }
+  if (upload.cartNumber) {
+    $('.cart-number', $cart).text(upload.cartNumber);
+  }
 
   updateProgressBar($cart, upload);
 };
 
-Rdxport.ShowView.prototype.uploadError = function(upload, file, status, errorString, acknowledge) {
-  if (!file.cartNumber) {
-    return;
-  }
+Rdxport.ShowView.prototype.uploadError = function(upload, status, errorString, acknowledge) {
   var reason = $('<span>').addClass('label').addClass('label-danger').text(status).after($('<b>').text(' ' + errorString));
 
   var dismiss_button = '<button class="btn btn-info btn-xs">' +
     '<span class="glyphicon glyphicon-remove"></span>&nbsp;&nbsp;Ok</button>';
 
   var $errorRow = $('<tr>')
-      .attr("id", "show-cart-" + file.cartNumber)
-      .append($('<td>').text(file.cartNumber))
-      .append($('<td>').addClass('file-name').text(upload.filename))
+      .attr('data-upload-id', upload.uploadId)
+      .append($('<td>').addClass('.cart-number').text('...'))
+      .append($('<td>').addClass('file-name'))
       .append($('<td>').append($('<b>').text('Import Fehler')))
       .append($('<td colspan="3">').append(reason))
       .append($('<td>').css('text-align', 'center').append(dismiss_button));
 
+  if (upload.cartNumber) {
+    $('.cart-number', $errorRow).text(upload.cartNumber);
+  }
+  if (upload.title) {
+    $('.file-name', $errorRow).text(upload.title);
+  }
+
   $('button', $errorRow).off('click').on('click', function() {
     acknowledge();
   });
 
-  $('#show-cart-' + file.cartNumber).replaceWith($errorRow);
+  var $cart = $('tr[data-upload-id="' + upload.uploadId + '"]').first();
+  $cart.replaceWith($errorRow);
 };
 
 Rdxport.ShowCartView = function(model, groupView) {
@@ -345,14 +354,14 @@ Rdxport.ShowCartView.prototype.render = function() {
     .append($('<td>').css('text-align', 'center').append($deleteButton));
 };
 
-Rdxport.ShowCartView.renderUploading = function(upload, cartNumber) {
+Rdxport.ShowCartView.renderUploading = function(upload) {
   var $progressBar = $('.progressBarTemplate.shows').clone().removeClass('progressBarTemplate');
-  $('.file-name', $progressBar).text(upload.filename);
-  $('.cart-number', $progressBar).text(cartNumber);
+  $('.file-name', $progressBar).text(upload.title);
+  $('.cart-number', $progressBar).text(upload.cartNumber);
 
   var $el = $('<tr>')
     .html($progressBar.html())
-    .attr('id', 'show-cart-' + cartNumber)
+    .attr('id', 'show-cart-' + upload.cartNumber)
     .addClass('uploading')
     .attr('data-upload-id', upload.uploadId);