diff options
| -rw-r--r-- | app/assets/javascripts/exports/index.js.coffee | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/import_tasks/index.js.coffee | 6 | ||||
| -rw-r--r-- | app/helpers/exports_helper.rb | 27 | ||||
| -rw-r--r-- | app/helpers/imports_helper.rb | 27 | ||||
| -rw-r--r-- | app/views/exports/_export.erb | 4 | ||||
| -rw-r--r-- | app/views/exports/_exports.html.erb | 10 | ||||
| -rw-r--r-- | app/views/exports/index.js.erb | 2 | ||||
| -rw-r--r-- | app/views/import_tasks/_import_task.erb | 4 |
8 files changed, 60 insertions, 26 deletions
diff --git a/app/assets/javascripts/exports/index.js.coffee b/app/assets/javascripts/exports/index.js.coffee index 0f6c524dc..655819507 100644 --- a/app/assets/javascripts/exports/index.js.coffee +++ b/app/assets/javascripts/exports/index.js.coffee @@ -1,5 +1 @@ -$(".exports.index").ready -> - $(".progress-bar.failed").addClass("progress-bar-danger").prepend("100%") - $(".progress-bar.pending").addClass("progress-bar-info").prepend("10%") - $(".progress-bar.processing").addClass("progress-bar-info").prepend("50%") - $(".progress-bar.completed").addClass("progress-bar-success").prepend("100%")
\ No newline at end of file +$(".exports.index").ready ->
\ No newline at end of file diff --git a/app/assets/javascripts/import_tasks/index.js.coffee b/app/assets/javascripts/import_tasks/index.js.coffee index bb3b3c9fb..8966a2960 100644 --- a/app/assets/javascripts/import_tasks/index.js.coffee +++ b/app/assets/javascripts/import_tasks/index.js.coffee @@ -1,5 +1 @@ -$(".import_tasks.index").ready -> - $(".progress-bar.failed").addClass("progress-bar-danger").prepend("100%") - $(".progress-bar.pending").addClass("progress-bar-info").prepend("10%") - $(".progress-bar.processing").addClass("progress-bar-info").prepend("50%") - $(".progress-bar.completed").addClass("progress-bar-success").prepend("100%")
\ No newline at end of file +$(".import_tasks.index").ready ->
\ No newline at end of file diff --git a/app/helpers/exports_helper.rb b/app/helpers/exports_helper.rb index 9be7a5e46..d9b975297 100644 --- a/app/helpers/exports_helper.rb +++ b/app/helpers/exports_helper.rb @@ -16,4 +16,31 @@ module ExportsHelper include TypeIdsModelsHelper + def export_progress_bar_tag(export) + + if export.status == "failed" + div_class = "progress-bar progress-bar-danger" + percentage_progress = "100" + elsif export.status == "pending" + div_class = "progress-bar progress-bar-info" + percentage_progress = "10" + elsif export.status == "processing" + div_class = "progress-bar progress-bar-info" + percentage_progress = "50" + elsif export.status == "completed" + div_class = "progress-bar progress-bar-success" + percentage_progress = "100" + else + div_class = "" + percentage_progress = "" + end + + content_tag :div, :class => "progress" do + content_tag :div, :class => div_class, role: "progressbar", :'aria-valuenow' => percentage_progress, :'aria-valuemin' => "0", :'aria-valuemax' => "100", :style => "width: #{percentage_progress}%;" do + percentage_progress + "% " + I18n.t("exports.statuses.#{export.status}") + end + end + + end + end diff --git a/app/helpers/imports_helper.rb b/app/helpers/imports_helper.rb index 7f58b229e..fbb9c13df 100644 --- a/app/helpers/imports_helper.rb +++ b/app/helpers/imports_helper.rb @@ -26,4 +26,31 @@ module ImportsHelper end end + def import_progress_bar_tag(export) + + if export.status == "failed" + div_class = "progress-bar progress-bar-danger" + percentage_progress = "100" + elsif export.status == "pending" + div_class = "progress-bar progress-bar-info" + percentage_progress = "10" + elsif export.status == "processing" + div_class = "progress-bar progress-bar-info" + percentage_progress = "50" + elsif export.status == "completed" + div_class = "progress-bar progress-bar-success" + percentage_progress = "100" + else + div_class = "" + percentage_progress = "" + end + + content_tag :div, :class => "progress" do + content_tag :div, :class => div_class, role: "progressbar", :'aria-valuenow' => percentage_progress, :'aria-valuemin' => "0", :'aria-valuemax' => "100", :style => "width: #{percentage_progress}%;" do + percentage_progress + "% " + I18n.t("exports.statuses.#{export.status}") + end + end + + end + end diff --git a/app/views/exports/_export.erb b/app/views/exports/_export.erb index 649251b78..a139e3171 100644 --- a/app/views/exports/_export.erb +++ b/app/views/exports/_export.erb @@ -25,9 +25,7 @@ </p> </div> <div class="panel-footer"> - <div class="progress"> - <div class="progress-bar <%= export.status %>" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100"> <%= t("exports.statuses.#{export.status}") %></div> - </div> + <%= export_progress_bar_tag(export) %> <div class="history"> <%= l export.created_at, :format => "%d/%m/%Y %H:%M" %> </div> diff --git a/app/views/exports/_exports.html.erb b/app/views/exports/_exports.html.erb index 58d4d7e70..9417cfed6 100644 --- a/app/views/exports/_exports.html.erb +++ b/app/views/exports/_exports.html.erb @@ -2,15 +2,7 @@ <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @exports %> </div> <div class="exports paginated_content"> - <% @exports.each_slice(3) do |row_exports| %> - <div class="row"> - <% row_exports.each do |export| %> - <div class="col-md-4"> - <%= render :partial => "export", locals: { export: export } %> - </div> - <% end %> - </div> - <% end %> + <%= paginated_content @exports, "export" %> </div> <div class="pagination"> <%= will_paginate @exports, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %> diff --git a/app/views/exports/index.js.erb b/app/views/exports/index.js.erb index 08ddf1dc5..e9f06f09e 100644 --- a/app/views/exports/index.js.erb +++ b/app/views/exports/index.js.erb @@ -1 +1 @@ -$('#compliance_check_tasks').html('<%= escape_javascript(render("compliance_check_tasks")) %>');
\ No newline at end of file +$('#exports').html('<%= escape_javascript(render("exports")) %>');
\ No newline at end of file diff --git a/app/views/import_tasks/_import_task.erb b/app/views/import_tasks/_import_task.erb index 0bb8cad08..7ba2c1058 100644 --- a/app/views/import_tasks/_import_task.erb +++ b/app/views/import_tasks/_import_task.erb @@ -22,9 +22,7 @@ <% end %> </div> <div class="panel-footer"> - <div class="progress"> - <div class="progress-bar <%= import_task.status %>" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100"> <%= t("import_tasks.statuses.#{import_task.status}") %></div> - </div> + <%= import_progress_bar_tag(import_task) %> <div class="history"> <%= l import_task.created_at, :format => "%d/%m/%Y %H:%M" %> | <%= import_task.user_name %> </div> |