Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

app/views/quality_analysis/_show.html.erb

@@ -21,7 +21,7 @@
     <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"><%= @ha["function_complexity"].nil? ? 0 : @ha["function_complexity"] %>
+      <p class="fontBlue2 pr"><%= @ha["function_complexity"].to_i == 0 ? 0 : @ha["function_complexity"] %>
         <span class="f10 c_white analysis-genral-icon <%= complexity_status(@ha["function_complexity"].to_i)[1] %> borderRadius">
           <%= @ha["function_complexity"].nil? ? "良好" : complexity_status(@ha["function_complexity"].to_i)[0] %>
         </span>
@@ -32,7 +32,7 @@
     <div class="analysis-genral">
       <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"><%= @ha["duplicated_lines_density"].nil? ? 0 : @ha["duplicated_lines_density"] %>
+      <p class="fontBlue2 pr"><%= @ha["duplicated_lines_density"].to_i == 0 ? 0 : @ha["duplicated_lines_density"] %>
         <span class="f10 c_white analysis-genral-icon <%= duplicated_lines_density_status(@ha["duplicated_lines_density"].to_i)[1] %> borderRadius">
           <%= @ha["duplicated_lines_density"].nil? ? 0 : duplicated_lines_density_status(@ha["duplicated_lines_density"].to_i)[0] %>
         </span>
@@ -41,7 +41,7 @@
     <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"><%= @ha["comment_lines_density"].nil? ? 0 : @ha["comment_lines_density"] %>
+      <p class="fontBlue2 pr"><%= @ha["comment_lines_density"].to_i == 0 ? 0 : @ha["comment_lines_density"] %>
         <span class="f10 c_white analysis-genral-icon <%= comment_lines_density_status(@ha["comment_lines_density"].to_i)[1] %> borderRadius">
           <%= @ha["comment_lines_density"].nil? ? 0 : comment_lines_density_status(@ha["comment_lines_density"].to_i)[0] %>
         </span>
@@ -70,33 +70,33 @@
   <div><span class="fontGrey3 mr30 fl">&nbsp;质量问题</span>
     <span class="fontBlue2 w100 pInline">
       <a class="fontBlue2 w70 pInline" target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false">
-        <%= @ha["violations"].nil? ? 0 : @ha["violations"] %>
+        <%= @ha["violations"].to_i %>
       </a>
     </span><span class="fontGrey2">&nbsp;问题分类如下：</span></div>
   <div class="ml90 mt15">
     <div class="mb10"><span class="analysis-block-icon mr5"></span><span class="fontGrey3 mr45">阻断</span>
       <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=BLOCKER" class="fontBlue2 w70 pInline">
-        <%= @ha["blocker_violations"].nil? ? 0 : @ha["blocker_violations"] %>
+        <%= @ha["blocker_violations"].to_i %>
       </a>
       <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@ha["blocker_violations"].nil? ? 0 : statistics_result_percentage(@ha["blocker_violations"].to_i, 3000) %>%;"></span></span></div>
     <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span>
       <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=CRITICAL" class="fontBlue2 w70 pInline">
-        <%= @ha["critical_violations"].nil? ? 0 : @ha["critical_violations"] %>
+        <%= @ha["critical_violations"].to_i %>
       </a>
       <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["critical_violations"].nil? ? 0 : statistics_result_percentage(@ha["critical_violations"].to_i, 3000) %>%;"></span></span></div>
     <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span>
       <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=MAJOR" class="fontBlue2 w70 pInline">
-        <%= @ha["major_violations"].nil? ? 0 : @ha["major_violations"] %>
+        <%= @ha["major_violations"].to_i %>
       </a>
       <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["major_violations"].nil? ? 0 : statistics_result_percentage(@ha["major_violations"].to_i, 3000) %>%;"></span></span></div>
     <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span>
       <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=MINOR" class="fontBlue2 w70 pInline">
-        <%= @ha["minor_violations"].nil? ? 0 : @ha["minor_violations"] %>
+        <%= @ha["minor_violations"].to_i %>
       </a>
       <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["minor_violations"].nil? ? 0 : statistics_result_percentage(@ha["minor_violations"].to_i, 3000) %>%;"></span></span></div>
     <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span>
       <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=INFO" class="fontBlue2 w70 pInline">
-        <%= @ha["info_violations"].nil? ? 0 : @ha["info_violations"] %>
+        <%= @ha["info_violations"].to_i %>
       </a>
       <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%= @ha["info_violations"].nil? ? 0 : statistics_result_percentage(@ha["info_violations"].to_i, 3000) %>%;"></span></span></div>
   </div>
@@ -107,23 +107,23 @@
 <div class="analysis-block mt10 mb40 flex f14">
   <div class="analysis-genral">
     <p class="fontGrey3">代码行数</p>
-    <p class="fontBlue2"><%= @ha["lines"].nil? ? 0 : @ha["lines"] %></p>
+    <p class="fontBlue2"><%= @ha["lines"].to_i %></p>
   </div>
   <div class="analysis-genral">
     <p class="fontGrey3">文件</p>
-    <p class="fontBlue2"><%= @ha["lines"].nil? ? 0 : @ha["lines"] %></p>
+    <p class="fontBlue2"><%= @ha["files"].to_i %></p>
   </div>
   <div class="analysis-genral">
     <p class="fontGrey3">目录</p>
-    <p class="fontBlue2"><%= @ha["directories"].nil? ? 0 : @ha["directories"] %></p>
+    <p class="fontBlue2"><%= @ha["directories"].to_i %></p>
   </div>
   <div class="analysis-genral">
     <p class="fontGrey3">类</p>
-    <p class="fontBlue2"><%= @ha["classes"].nil? ? 0 : @ha["classes"] %></p>
+    <p class="fontBlue2"><%= @ha["classes"].to_i %></p>
   </div>
   <div class="analysis-genral">
     <p class="fontGrey3">方法</p>
-    <p class="fontBlue2"><%=@ha["functions"].nil? ? 0 : @ha["functions"] %></p>
+    <p class="fontBlue2"><%= @ha["functions"].to_i %></p>
   </div>
 </div>
 <!--<div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl">贡献统计</span></div>-->