diff --git a/app/controllers/quality_analysis_controller.rb b/app/controllers/quality_analysis_controller.rb index bcfb74241..9fbe5bc3c 100644 --- a/app/controllers/quality_analysis_controller.rb +++ b/app/controllers/quality_analysis_controller.rb @@ -248,12 +248,10 @@ class QualityAnalysisController < ApplicationController author_infos.each do |author_info| email = author_info.email changes = author_info.changes.to_i - unresolved_issues = open(@sonar_address + "/api/issues/search?projectKeys=#{@resource_id}&authors=#{email}&resolved=false").read - unresolved_issue_count = JSON.parse(unresolved_issues)["total"].to_i - all_issues = open(@sonar_address + "/api/issues/search?projectKeys=#{@resource_id}&authors=#{email}").read - all_issue_count = JSON.parse(all_issues)["total"].to_i + user_issues = open(@sonar_address + "/api/issues/search?projectKeys=#{@resource_id}&authors=#{email}&resolved=false").read + issue_count = JSON.parse(user_issues)["total"].to_i ratio = (changes == 0 ? 0 : format("%0.4f",issue_count.to_f/changes.to_f)) - @user_quality_infos << {:email => email, :changes => changes, :unresolved_issue_count => unresolved_issue_count, :ratio => ratio, :all_issue_count => all_issue_count} + @user_quality_infos << {:email => email, :changes => changes, :issue_count => issue_count, :ratio => ratio} end # 按名称转换成hash键值对 diff --git a/app/views/quality_analysis/_show.html.erb b/app/views/quality_analysis/_show.html.erb index a21428f2f..0ec0873ce 100644 --- a/app/views/quality_analysis/_show.html.erb +++ b/app/views/quality_analysis/_show.html.erb @@ -133,8 +133,7 @@ @@ -150,8 +149,7 @@
  • <%= author_info[:changes] %>
  • -
  • <%= author_info[:all_issue_count] %>
  • -
  • <%= author_info[:unresolved_issue_count] %>
  • +
  • <%= author_info[:issue_count] %>
  • <%= author_info[:ratio] %>
  • diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css index 454fce294..854b34f10 100644 --- a/public/stylesheets/css/project.css +++ b/public/stylesheets/css/project.css @@ -498,9 +498,9 @@ a:hover.upload_btn_grey{background:#8a8a8a;} .image-cir {border-radius:50%;} .analysis-genral-icon {position:absolute; padding:1px 5px; display:inline-block; top:5px;} .contribute-list-avatar {width:80px; vertical-align:middle; text-align:center;} -.contribute-list-code {width:130px; vertical-align:middle; text-align:center;} -.contribute-list-problem {width:130px; vertical-align:middle; text-align:center;} -.contribute-list-rate {width:168px; vertical-align:middle; text-align:center;} +.contribute-list-code {width:160px; vertical-align:middle; text-align:center;} +.contribute-list-problem {width:170px; vertical-align:middle; text-align:center;} +.contribute-list-rate {width:228px; vertical-align:middle; text-align:center;} .contribute-list-height {height:80px;} .contribute-list-line-height {line-height:80px;}