3 files changed, 43 insertions, 12 deletions
diff --git a/app/helpers/history_helper.rb b/app/helpers/history_helper.rb
index 1c23c6c81..02a39a3d3 100644
--- a/app/helpers/history_helper.rb
+++ b/app/helpers/history_helper.rb
@@ -33,12 +33,12 @@ module HistoryHelper
     field_set_tag t("layouts.history_tag.title"), :class => "history_tag" do
       content_tag :ul do
         [(content_tag :li do
-          if object.created_at?
+          if object.created_at
             t('layouts.history_tag.created_at') + ' : ' + l(object.created_at, :format => :short)
           end
         end),
         (content_tag :li do
-          if object.updated_at?
+          if object.updated_at
             t('layouts.history_tag.updated_at') + ' : ' + l(object.updated_at, :format => :short)
           end
         end),  
diff --git a/app/helpers/imports_helper.rb b/app/helpers/imports_helper.rb
index 2df2de93f..5f771f77f 100644
--- a/app/helpers/imports_helper.rb
+++ b/app/helpers/imports_helper.rb
@@ -22,15 +22,6 @@ module ImportsHelper
         return 'icons/link_page.png'
       end
     end
-  end
-  
-  def import_progress_bar_tag(import)
-    div_class = ""
-    content_tag :div, :class => "progress" do
-      content_tag :div, :class => div_class, role: "progressbar", :'aria-valuenow' => "#{import.percentage_progress}", :'aria-valuemin' => "0", :'aria-valuemax' => "100", :style => "width: #{import.percentage_progress}%;" do
-        "#{import.percentage_progress}% " + I18n.t("import_tasks.statuses.#{import.status}")
-      end
-    end
-  end
+  end    
 
 end
diff --git a/app/helpers/progress_bar_helper.rb b/app/helpers/progress_bar_helper.rb
new file mode 100644
index 000000000..9a4bbfc9c
--- /dev/null
+++ b/app/helpers/progress_bar_helper.rb
@@ -0,0 +1,40 @@
+module ProgressBarHelper
+
+  def percentage_progress(object_model, report)
+    if %w{ aborted canceled terminated }.include? object_model.status
+      percentage_progress = "100"
+    elsif object_model.status == "started" && report.total_steps != 0
+      percentage_progress = "#{report.current_step / report.total_steps}"
+    else # %w{ scheduled nil }.include? object_model.status
+      percentage_progress = "0"
+    end      
+  end
+  
+  def progress_bar_tag(object_model)
+    report = object_model.report
+    percentage_progress = percentage_progress(object_model, report)
+    
+    percentage_info = ""
+    if %w{ aborted canceled scheduled terminated }.include? object_model.status
+      percentage_info = "#{percentage_progress}% " + I18n.t("#{object_model.class.to_s.downcase.pluralize}.statuses.#{object_model.status}")
+    elsif object_model.status == "started"
+      percentage_info = "Niv #{report.current_level} : #{report.current_step_name.downcase}  #{report.current_step} / #{report.total_steps}"
+    end
+    
+    if  %w{ aborted canceled }.include? object_model.status
+      div_class = "progress-bar progress-bar-danger"
+    elsif %w{ started scheduled }.include? object_model.status
+      div_class = "progress-bar progress-bar-info"
+    elsif object_model.status == "terminated"
+      div_class = "progress-bar progress-bar-success"
+    else
+      div_class = "progress-bar"
+    end      
+    
+    content_tag :div, :class => "progress", :title => percentage_info 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}%"
+      end
+    end
+  end
+end