Compliance Check : remove tab and add filter by severity

3 files changed, 44 insertions, 53 deletions

diff --git a/app/assets/javascripts/compliance_checks/report.js.coffee b/app/assets/javascripts/compliance_checks/report.js.coffee
index f9cce87a6..2e0dfea67 100644
--- a/app/assets/javascripts/compliance_checks/report.js.coffee
+++ b/app/assets/javascripts/compliance_checks/report.js.coffee
@@ -1,37 +1,4 @@
 $(".compliance_checks.report, .imports.compliance_check, #sidebar.compliance_checks_sidebar").ready ->
-
-  showSeverityDonut = (severity) ->
-    $("##{severity}").empty()
-    console.log $("##{severity}").val()
-    Morris.Donut({
-      element: severity,
-      data: [
-        { label: $(".table").data('title-nok'), value: $("tr.nok_#{severity}").size() },
-        { label: $(".table").data('title-uncheck'), value: $("tr.uncheck_#{severity}").size() },
-        { label: $(".table").data('title-ok'), value: $("tr.ok_#{severity}").size() }
-      ],
-      colors: [ "#e22b1b", "#898e7f", "#8fc861" ]
-    }).on('click', update = (i, row) ->
-      switch i
-        when 0 then $('.table').trigger 'footable_filter', filter: "nok_#{severity}"
-        when 1 then $('.table').trigger 'footable_filter', filter: "uncheck_#{severity}"
-        when 2 then $('.table').trigger 'footable_filter', filter: "ok_#{severity}"
-    )
-
-  $('table').footable().trigger 'footable_filter', filter: 'severity-error'
-  $('a.severities_warning').on 'click', (e) ->
-    $('table').footable().trigger 'footable_filter', filter: 'severity-warning'
-
-  $('a.severities_error').on 'click', (e) ->
-    $('table').footable().trigger 'footable_filter', filter: 'severity-error'
-
-  $(".notice").popover({ container: "body", html: false, trigger: "focus", placement: "bottom" })
-  # Hide and show error details
-  $(".title_error").each ->
-    $( this ).click ->
-      $(this).next(".details_error").toggle()
-      $(this).children("i").toggleClass("fa-plus-square fa-minus-square")
-
   refreshInterval = $(".report").data("refresh-interval")
   if refreshInterval > 0
     reloadPage = () -> window.location.reload()
@@ -49,5 +16,39 @@ $(".compliance_checks.report, .imports.compliance_check, #sidebar.compliance_che
       $(parent).trigger 'footable_filter', filter: $("select#{el} option:selected").val()
       return
 
+  insertSeverityDonut = (type) ->
+    Morris.Donut({
+      element: type,
+      data: [
+        { label: $(".table").data('title-nok'), value: $("tr.nok_#{type}").size() },
+        { label: $(".table").data('title-uncheck'), value: $("tr.uncheck_#{type}").size() },
+        { label: $(".table").data('title-ok'), value: $("tr.ok_#{type}").size() }
+      ],
+      colors: [ "#e22b1b", "#898e7f", "#8fc861" ]
+    }).on('click', update = (i, row) ->
+      switch i
+        when 0 then $('.table').trigger 'footable_filter', filter: "nok_#{type}"
+        when 1 then $('.table').trigger 'footable_filter', filter: "uncheck_#{type}"
+        when 2 then $('.table').trigger 'footable_filter', filter: "ok_#{type}"
+    )
+    $("##{type}").hide()
+
+  insertSeverityDonut('error')
+  insertSeverityDonut('warning')
+
+  $(".notice").popover({ container: "body", html: false, trigger: "focus", placement: "bottom" })
+  # Hide and show error details
+  $(".title_error").each ->
+    $( this ).click ->
+      $(this).next(".details_error").toggle()
+      $(this).children("i").toggleClass("fa-plus-square fa-minus-square")
+
   footableFilter('table', '.filter-status')
   footableFilter('table', '.filter-severity')
+
+  $('select.filter-severity').change (e)->
+    $('.graph').hide()
+    if $('select.filter-severity option:selected').val() == 'severity-warning'
+      $('#warning').show()
+    if $('select.filter-severity option:selected').val() == 'severity-error'
+      $('#error').show()
diff --git a/app/views/compliance_checks/_compliance_check_results.erb b/app/views/compliance_checks/_compliance_check_results.erb
index 62986a75b..d0c1bcbc3 100644
--- a/app/views/compliance_checks/_compliance_check_results.erb
+++ b/app/views/compliance_checks/_compliance_check_results.erb
@@ -5,6 +5,14 @@
     <input id="filter" type="text" class="form-control">
   </div>
   <div class="form-group">
+    <label><%=ComplianceCheckResult.human_attribute_name(:severity)%></label>
+    <select class="filter-severity form-control">
+      <option></option>
+      <option value="severity-error"><%= t("compliance_check_result.severities.error") %></option>
+      <option value="severity-warning"><%= t("compliance_check_result.severities.warning") %></option>
+    </select>
+  </div>
+  <div class="form-group">
     <label><%=ComplianceCheckResult.human_attribute_name(:status)%></label>
     <select class="filter-status form-control">
       <option></option>
diff --git a/app/views/compliance_checks/report.html.erb b/app/views/compliance_checks/report.html.erb
index 70a1f4d69..e4d91e57c 100644
--- a/app/views/compliance_checks/report.html.erb
+++ b/app/views/compliance_checks/report.html.erb
@@ -23,19 +23,6 @@
        </ul>
      </div>
    </div>
-
-   <ul class="nav nav-tabs" role="tablist">
-     <li role="presentation" class="active">
-       <a href="#severities_error" class="severities_error"  aria-controls="severities_error" role="tab" data-toggle="tab">
-         <%=t("compliance_check_result.severities.error")%>
-       </a>
-     </li>
-     <li role="presentation">
-       <a href="#severities_warning" class="severities_warning" aria-controls="severities_warning" role="tab" data-toggle="tab">
-         <%=t("compliance_check_result.severities.warning")%>
-       </a>
-     </li>
-   </ul>
    <div class="report" data-refresh-interval="<%= job_refresh_interval(@compliance_check) %>">
      <%= render :partial => "compliance_checks/compliance_check_results", :locals => { :compliance_check_validation_report => @compliance_check.compliance_check_validation_report } %>
    </div>
@@ -50,13 +37,8 @@
     </li>
   </ul>
   <%= history_tag(@compliance_check) %>
-  <div class="tab-content compliance_checks_sidebar">
-    <div role="tabpanel" class="tab-pane active" id="severities_error">
-      <div class="graph" id="error"></div>
-    </div>
-    <div role="tabpanel" class="tab-pane" id="severities_warning">
-      <div class="graph" id="warning"></div>
-    </div>
+  <div id="error" class="graph"></div>
+  <div id="warning" class="graph"></div>
   </div>
 
 <% end %>