From fcf32474b604915d2e1f7313bd42026f326260d9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 8 Jul 2016 13:53:54 +0800
Subject: [PATCH 1/2] modified days and hours for nil data

---
 app/views/quality_analysis/_show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 0b16a1adb..3adea5c72 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -45,11 +45,11 @@
   <div class="analysis-block mt10 mb40 f14">
     <div><span class="fontGrey3 mr30">技术债务</span>
       <span class="w70 pInline">
-        <% if @complexity["msr"][8].nil? %>
+        <% if @complexity["msr"][8].nil? || @complexity["msr"][8]["frmt_val"] == "0" %>
             0
         <% else %>
             <%= /[0-9]*/.match(@complexity["msr"][8]["frmt_val"])[0] %>天
-            <%= / [0-9]*/.match(@complexity["msr"][8]["frmt_val"]) %>小时
+            <%= / [0-9]*/.match(@complexity["msr"][8]["frmt_val"]).nil? ? 0 : / [0-9]*/.match(@complexity["msr"][8]["frmt_val"]) %>小时
         <% end %>
       </span>
       <span class="fontGrey2"><a class="linkBlue2" target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>

From b22882aead320717750ef296cedfbcfd79333171 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 8 Jul 2016 14:22:20 +0800
Subject: [PATCH 2/2] some data for css

---
 app/controllers/quality_analysis_controller.rb | 2 +-
 app/views/quality_analysis/_show.html.erb      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb
index c53e1939a..79bb733e8 100644
--- a/app/controllers/quality_analysis_controller.rb
+++ b/app/controllers/quality_analysis_controller.rb
@@ -74,7 +74,7 @@ class QualityAnalysisController < ApplicationController
         for i in 0..60 do
           sleep(30)
           @current_build_status = @client.job.get_current_build_status("#{job_name}")
-          if (@current_build_status != "not_run" || @current_build_status != "running")
+          if (@current_build_status == "success" || @current_build_status == "failure")
             break
             if i == 60
               @build_console_result = false
diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb
index 3adea5c72..2442299bd 100644
--- a/app/views/quality_analysis/_show.html.erb
+++ b/app/views/quality_analysis/_show.html.erb
@@ -14,13 +14,13 @@
           <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
           <p class="fontGrey3">质量等级</p>
           <p class="fontBlue2 pr"><%= @complexity["msr"][9].nil? ? "A" : @complexity["msr"][9]["frmt_val"] %>
-            <span class="f10 c_white analysis-genral-icon <%=@complexity["msr"][9].nil? ? "" :  sqale_rating_status(@complexity["msr"][9]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][9].blank? ? "很好" : sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %></span></p>
+            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][9].nil? ? sqale_rating_status(@complexity["msr"][9].to_i)[1] :  sqale_rating_status(@complexity["msr"][9]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][9].blank? ? "很好" : sqale_rating_status(@complexity["msr"][9]["val"].to_i)[0] %></span></p>
         </div>
         <div class="analysis-genral" >
           <p id="container_function_complexity" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
           <p class="fontGrey3">复杂度</p>
           <p class="fontBlue2 pr"><%= @complexity["msr"][6].nil? ? 0 : @complexity["msr"][6]["val"] %>
-            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][6].nil? ? "" : complexity_status(@complexity["msr"][6]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][6].nil? ? 0 : complexity_status(@complexity["msr"][6]["val"].to_i)[0] %></span></p>
+            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][6].nil? ? complexity_status(@complexity["msr"][6].to_i)[1] : complexity_status(@complexity["msr"][6]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][6].nil? ? 0 : complexity_status(@complexity["msr"][6]["val"].to_i)[0] %></span></p>
         </div>
       </div>
       <div class="flex">
@@ -28,13 +28,13 @@
           <p id="container_duplicated_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
           <p class="fontGrey3">代码重复度</p>
           <p class="fontBlue2 pr"><%= @complexity["msr"][7].nil? ? 0 : @complexity["msr"][7]["frmt_val"] %>
-            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][7].nil? ? "" : duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][7].nil? ? 0 : duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[0] %></span></p>
+            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][7].nil? ? duplicated_lines_density_status(@complexity["msr"][7].to_i)[1] : duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][7].nil? ? 0 : duplicated_lines_density_status(@complexity["msr"][7]["val"].to_i)[0] %></span></p>
         </div>
         <div class="analysis-genral">
           <p id="container_comment_lines_density" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
           <p class="fontGrey3">注释率</p>
           <p class="fontBlue2 pr"><%= @complexity["msr"][5].nil? ? 0 : @complexity["msr"][5]["frmt_val"] %>
-            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][5].nil? ? "" : comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][5].nil? ? 0 : comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[0] %></span></p>
+            <span class="f10 c_white analysis-genral-icon <%= @complexity["msr"][5].nil? ? comment_lines_density_status(@complexity["msr"][5].to_i)[1] : comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[1] %> borderRadius"><%= @complexity["msr"][5].nil? ? 0 : comment_lines_density_status(@complexity["msr"][5]["val"].to_i)[0] %></span></p>
         </div>
       </div>
     </div>