From cb7e0d5cd3b2d42ee3f68e4a2cd502b06aec8304 Mon Sep 17 00:00:00 2001
From: Luc Donnet
Date: Mon, 24 Nov 2014 14:05:45 +0100
Subject: Fix progress-bar color when ajax reload for compliance check tasks
 Refs #0029712

---
 .../compliance_check_tasks/index.js.coffee         |  6 +----
 app/helpers/compliance_check_tasks_helper.rb       | 27 ++++++++++++++++++++++
 .../_compliance_check_task.html.erb                |  4 +---
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/compliance_check_tasks/index.js.coffee b/app/assets/javascripts/compliance_check_tasks/index.js.coffee
index 01ca11e12..aefafbf7f 100644
--- a/app/assets/javascripts/compliance_check_tasks/index.js.coffee
+++ b/app/assets/javascripts/compliance_check_tasks/index.js.coffee
@@ -1,5 +1 @@
-$(".compliance_check_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
+$(".compliance_check_tasks.index").ready ->
\ No newline at end of file
diff --git a/app/helpers/compliance_check_tasks_helper.rb b/app/helpers/compliance_check_tasks_helper.rb
index dd61a4fbe..22a0608e0 100644
--- a/app/helpers/compliance_check_tasks_helper.rb
+++ b/app/helpers/compliance_check_tasks_helper.rb
@@ -9,4 +9,31 @@ module ComplianceCheckTasksHelper
       "btn-default"
     end
   end
+
+  def compliance_check_task_progress_bar_tag(compliance_check_task)
+      
+    if compliance_check_task.status == "failed"
+      div_class = "progress-bar progress-bar-danger"
+      percentage_progress = "100"
+    elsif compliance_check_task.status == "pending"
+      div_class = "progress-bar progress-bar-info"
+      percentage_progress = "10"
+    elsif compliance_check_task.status == "processing"
+      div_class = "progress-bar progress-bar-info"
+      percentage_progress = "50"
+    elsif compliance_check_task.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("compliance_check_tasks.statuses.#{compliance_check_task.status}")
+      end
+    end
+    
+  end
 end
diff --git a/app/views/compliance_check_tasks/_compliance_check_task.html.erb b/app/views/compliance_check_tasks/_compliance_check_task.html.erb
index ac652c470..40a265731 100644
--- a/app/views/compliance_check_tasks/_compliance_check_task.html.erb
+++ b/app/views/compliance_check_tasks/_compliance_check_task.html.erb
@@ -24,9 +24,7 @@
       <% end %>
   </div>
   <div class="panel-footer">
-    <div class="progress">
-      <div class="progress-bar <%= compliance_check_task.status %>" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100"> <%= t("compliance_check_tasks.statuses.#{compliance_check_task.status}") %></div>
-    </div>
+    <%= compliance_check_task_progress_bar_tag(compliance_check_task) %>    
     <div class="history">
       <%= l compliance_check_task.created_at, :format => "%d/%m/%Y %H:%M" %> | <%= compliance_check_task.user_name %>
     </div>
-- 
cgit v1.2.3