Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved max show imported count.

Browse source
This commit is contained in:
Martin Edenhofer 2016-01-21 23:41:25 +01:00
parent 6d6779caf7
commit 3587051827
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/import_otrs.coffee
View file

@ -126,6 +126,8 @@ class Index extends App.ControllerContent
if data.result is 'in_progress' if data.result is 'in_progress'
for key, item of data.data for key, item of data.data
if item.done > item.total
item.done = item.total
element = @$('.js-' + key.toLowerCase() ) element = @$('.js-' + key.toLowerCase() )
element.find('.js-done').text(item.done) element.find('.js-done').text(item.done)
element.find('.js-total').text(item.total) element.find('.js-total').text(item.total)

29
app/assets/javascripts/app/controllers/import_zendesk.coffee
View file

@ -154,16 +154,25 @@ class Index extends App.ControllerContent
window.location.reload() window.location.reload()
return return
for key, item of data.data if data.result is 'error'
element = @$('.js-' + key.toLowerCase() ) @$('.js-error').removeClass('hide')
element.find('.js-done').text(item.done) @$('.js-error').html(App.i18n.translateContent(data.message))
element.find('.js-total').text(item.total) else
element.find('progress').attr('max', item.total ) @$('.js-error').addClass('hide')
element.find('progress').attr('value', item.done )
if item.total <= item.done if data.result is 'in_progress'
element.addClass('is-done') for key, item of data.data
else if item.done > item.total
element.removeClass('is-done') item.done = item.total
element = @$('.js-' + key.toLowerCase() )
element.find('.js-done').text(item.done)
element.find('.js-total').text(item.total)
element.find('progress').attr('max', item.total )
element.find('progress').attr('value', item.done )
if item.total <= item.done
element.addClass('is-done')
else
element.removeClass('is-done')
@delay( @updateMigration, 5000 ) @delay( @updateMigration, 5000 )
) )