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

Conflicts:
	public/stylesheets/courses.css
	public/stylesheets/public.css

app/controllers/account_controller.rb

@@ -239,17 +239,18 @@ class AccountController < ApplicationController
 
   end
   def resendmail
-    status = 1
+    result = {:status=>1, :email=>""}
     user = User.find(params[:user]) if params[:user]
+    result[:email] = user.mail
     token = Token.new(:user => user, :action => "register")
     if token.save
       # Mailer.run.register(token)
       Mailer.register(token).deliver
     else
       yield if block_given?
-      status = 0
+      result[:status] = 0
     end
-    render :json => status
+    render :json => result
   end
 
   def email_activation

app/controllers/attachments_controller.rb

@@ -612,7 +612,7 @@ class AttachmentsController < ApplicationController
         @attachment.container.board.course)
       @course = @attachment.container.board.course
     else
-      unless @attachment.container_type == 'Bid' ||  @attachment.container_type == 'Organization' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion' || @attachment.container_type == 'StudentWorksScore'|| @attachment.container_type == 'StudentWork'
+      unless @attachment.container_type == 'Syllabus' || @attachment.container_type == 'Bid' ||  @attachment.container_type == 'Organization' || @attachment.container_type == 'HomeworkAttach' || @attachment.container_type == 'Memo' || @attachment.container_type == 'Softapplication' || @attachment.container_type == 'PhoneAppVersion' || @attachment.container_type == 'StudentWorksScore'|| @attachment.container_type == 'StudentWork'
         @project = @attachment.project
       end
     end

app/controllers/projects_controller.rb

@@ -653,12 +653,12 @@ class ProjectsController < ApplicationController
   def update
     @project.safe_attributes = params[:project]
     @project.organization_id = params[:organization_id]
-    params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0
-    params[:project][:hidden_repo] ? @project.hidden_repo = 1 : @project.hidden_repo = 0
+    params[:project][:is_public] == "on" ? @project.is_public = 1 : @project.is_public = 0
+    params[:project][:hidden_repo] == "on" ? @project.hidden_repo = 1 : @project.hidden_repo = 0
     # 更新公开私有时同步gitlab公开私有
-    if !@project.gpid.nil? && @project.is_public != (params[:project][:is_public] == "on" ? true : false)
+    if !@project.gpid.nil? && @project.is_public != (params[:project][:is_public] == "on" ? 1 : 0)
       g = Gitlab.client
-      params[:project][:is_public] ? g.edit_project(@project.gpid, 20, params[:branch]) : g.edit_project(@project.gpid, 0, params[:branch])
+      params[:project][:is_public] == "on" ? g.edit_project(@project.gpid, 20, params[:branch]) : g.edit_project(@project.gpid, 0, params[:branch])
     end
     # end
     if validate_parent_id && @project.save

app/controllers/quality_analysis_controller.rb

@@ -1,9 +1,11 @@
 class QualityAnalysisController < ApplicationController
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
+  before_filter :find_quality_analysis, :only => [:edit, :update_jenkins_job]
   before_filter :authorize
-  before_filter :connect_jenkins, :only => [:create]
+  before_filter :connect_jenkins, :only => [:create, :edit, :update_jenkins_job, :index]
   layout "base_projects"
   include ApplicationHelper
+  include QualityAnalysisHelper
   require 'jenkins_api_client'
   require 'nokogiri'
   require 'json'
@@ -13,12 +15,14 @@ class QualityAnalysisController < ApplicationController
 
   end
 
+  # params 说明：{identifier：版本库名}
   def create
     begin
       user_name = User.find(params[:user_id]).try(:login)
       identifier = params[:identifier]
       rep_id = params[:rep_id]
-      # REDO
+
+      # job_name and sonar_name 前者为job名字，后者为jenkins配置名
       job_name = "#{user_name}-#{rep_id}"
       sonar_name = "#{user_name}:#{rep_id}"
 
@@ -38,25 +42,43 @@ class QualityAnalysisController < ApplicationController
         sonar.sourceEncoding=utf-8"
         git_url = @gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
 
-        # modify config.yml
+        # 替换配置文件
         @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
         @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
         @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
         @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
 
-        # return '200' if successed
+        # jenkins job创建
         jenkins_job = @client.job.create("#{job_name}", @doc.to_xml)
+        logger.info("Jenkins status of create ==> #{jenkins_job}")
 
-        # replace gitlab hook
+        # 将地址作为hook值添加到gitlab
         @g.add_project_hook(@project.gpid, @jenkins_address + "/project/#{job_name}")
-        # build job
-        logger.error("Jenkins status of create ==> #{jenkins_job}")
-        # return '201' if build successed
+        # job创建完成后自动运行job,如果运行成功则返回‘200’
         code = @client.job.build("#{job_name}")
         logger.error("build result ==> #{code}")
-        d = @client.delete("#{job_name}") if jenkins_job == '200' && code != '201'
+
+        # 判断调用sonar分析是否成功
+        # 等待启动时间处理, 最长时间为30分钟
+        for i in 0..60 do
+          sleep(60)
+          @current_build_status = @client.job.get_current_build_status("#{job_name}")
+          if (@current_build_status != "not_run" || @current_build_status != "running")
+            break
+            if i == 60
+              @build_console_result = false
+              break
+            end
+          end
+        end
+
+        @console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')
+        logger.info("@current_build_status is ==> #{@current_build_status}")
+        logger.info("@console_build is ==> #{@console_build}")
+
+        d = @client.job.delete("#{job_name}") if jenkins_job == '200' && code != '201'
         logger.error("delete result ==> #{code}")
-        if qa.blank? && code == '201'
+        if qa.blank? && @current_build_status == "success"
           QualityAnalysis.create(:project_id => @project.id, :author_login => user_name, :rep_identifier => identifier,
                                  :sonar_version => version, :path => path, :branch => branch, :language => language, :sonar_name => "#{user_name}:#{rep_id}")
         else
@@ -66,10 +88,10 @@ class QualityAnalysisController < ApplicationController
     rescue => e
       puts e
     end
-    # respond_to do |format|
-    #   #format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
-    #   format.js
-    # end
+    respond_to do |format|
+      format.html{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch, :current_build_status => @current_build_status, :job_name => job_name)}
+      # format.js{redirect_to project_quality_analysis_path(:project_id => @project.id, :resource_id => sonar_name, :branch => branch)}
+    end
   end
 
   # get language type
@@ -85,11 +107,68 @@ class QualityAnalysisController < ApplicationController
     end
   end
 
+  def edit
+    @g = Gitlab.client
+    gitlab_branches = @g.branches(@project.gpid)
+    @branch_names = gitlab_branches.map{|b| b.name}
+    @gitlab_default_branch = @g.project(@project.gpid).default_branch
+  end
+
+  # 更新Jenkins job，主要包括相关配置文件参数的更新，Trustie平台数据的更新
+  def update_jenkins_job
+    begin
+      rep_id = Repository.where(:project_id => @project.id).first.try(:id)
+      logger.error("#############################===>666")
+      sonar_name = @quality_analysis.sonar_name
+      job_name = "#{@quality_analysis.author_login}-#{rep_id}"
+      version = @quality_analysis.sonar_version
+      path = params[:path].blank? ? "./" : params[:path]
+      language = swith_language_type(params[:language])
+      branch = params[:branch]
+      identifier = @quality_analysis.rep_identifier
+      properties = "sonar.projectKey=#{sonar_name}
+        sonar.projectName=#{sonar_name}
+        sonar.projectVersion=#{version}
+        sonar.sources=#{path}
+        sonar.language=#{language.downcase}
+        sonar.sourceEncoding=utf-8"
+      git_url = @gitlab_address.to_s+"/"+@project.owner.to_s+"/"+ identifier + "."+"git"
+
+      # modify config.yml
+      @doc = Nokogiri::XML(File.open(File.join(Rails.root, 'tmp', 'config.xml')))
+      @doc.at_xpath("//hudson.plugins.git.UserRemoteConfig/url").content = git_url
+      @doc.at_xpath("//hudson.plugins.git.BranchSpec/name").content = "*/#{branch}"
+      @doc.at_xpath("//hudson.plugins.sonar.SonarRunnerBuilder/properties").content = properties # sonar-properties
+
+      # update成功则返回 ‘200’
+      jenkins_job = @client.job.update("#{job_name}", @doc.to_xml)
+      get_current_build_status = @client.job.get_current_build_status("Hjqreturn-1280")
+      logger.error("Failed to update job: ==> #{jenkins_job}") unless jenkins_job == '200'
+
+      # 数据更新到Trustie数据库
+      if jenkins_job == '200'
+        logger.info("quality_ananlysis will be updated: ==> #{jenkins_job}")
+        @quality_analysis.path = path
+        @quality_analysis.language = language
+        @quality_analysis.branch = branch
+        @quality_analysis.save
+      end
+    rescue Exception => e
+      logger.error("Update jenkins job: #{e}")
+    end
+    respond_to do |format|
+      format.html{redirect_to project_quality_analysis_path(:project_id => @project.id)}
+      format.js
+    end
+  end
+
   # resource_id: login + @repository.id
   def index
     begin
+      @branch = params[:branch]
       @resource_id = params[:resource_id]
       @sonar_address = Redmine::Configuration['sonar_address']
+      @jenkins_address = Redmine::Configuration['jenkins_address']
       if params[:resource_id].nil?
         @name_flag = true
         projects_date = open(@sonar_address + "/api/projects/index").read
@@ -97,6 +176,10 @@ class QualityAnalysisController < ApplicationController
         @quality_analyses = QualityAnalysis.where(:project_id => @project.id).select{|qa| arr.include?(qa.sonar_name)}
 
       else
+        if params[:current_build_status] == "failure"
+          job_name = params[:job_name]
+          @console_build = @client.job.get_console_output("#{job_name}", build_num = 0, start = 0, mode = 'text')["output"]
+        end
         complexity_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=sqale_rating,function_complexity,duplicated_lines_density,comment_lines_density,sqale_index,lines,file_line,files,functions,classes,directories").read
         @complexity =JSON.parse(complexity_date).first
         issue_date = open(@sonar_address + "/api/resources/index?resource=#{@resource_id}&depth=0&metrics=blocker_violations,critical_violations,major_violations,minor_violations,info_violations,violations").read
@@ -115,6 +198,14 @@ class QualityAnalysisController < ApplicationController
     render_404
   end
 
+  def find_quality_analysis
+    begin
+      @quality_analysis = QualityAnalysis.find(params[:id])
+    rescue
+      render_404
+    end
+  end
+
   # Authorize the user for the requested action
   def authorize(ctrl = params[:controller], action = params[:action], global = false)
     unless @project.archived? && @project.gpid.nil?

app/controllers/repositories_controller.rb

@@ -360,11 +360,6 @@ update
   end
 
   def show
-    # sonar_address = Redmine::Configuration['sonar_address']
-    # projects_date = open(sonar_address + "/api/projects/index").read
-    # arr = JSON.parse(projects_date).map {|m| m["nm"]}
-    # arr.map
-
     ## TODO: the below will move to filter, done.
     if !User.current.member_of?(@project) && @project.hidden_repo
       render_403
@@ -379,7 +374,7 @@ update
       @changesets = g.commits(@project.gpid, :ref_name => @rev)
       g_project = g.project(@project.gpid)
       # 总的提交数
-      @changesets_all_count = @project.gpid.nil? ? 0 : g_project.commit_count
+      @changesets_all_count = @project.gpid.nil? ? 0 : commit_count(@project, @rev)
       @g_default_branch = g_project.default_branch.nil? ?  "master" : g_project.default_branch
       # 访问该页面的是会后则刷新
       if @project.project_score.nil?

app/helpers/application_helper.rb

@@ -803,22 +803,22 @@ module ApplicationHelper
   end
 
   # 获取Gitlab版本库提交总数
-  def commit_count(project)
+  def commit_count(project, branch)
     g = Gitlab.client
     #add by hx
-    if g.commits(project.gpid , :page=>200).count > 0
+    if g.commits(project.gpid, :ref_name => @rev , :page=>200).count > 0
       count = 4020
-    elsif g.commits(project.gpid , :page=>25).count==0
+    elsif g.commits(project.gpid , :page=>25, :ref_name => branch).count==0
       count = count_commits(project.gpid , 0 , 25)
-    elsif g.commits(project.gpid , :page=>50).count ==0
+    elsif g.commits(project.gpid , :page=>50, :ref_name => branch).count ==0
       count = count_commits(project.gpid , 25 , 50)+ 25 * 20
-    elsif g.commits(project.gpid , :page=>75).count ==0
+    elsif g.commits(project.gpid , :page=>75, :ref_name => branch).count ==0
       count = count_commits(project.gpid , 50 , 75)+ 50 * 20
-    elsif g.commits(project.gpid , :page=>100).count== 0
+    elsif g.commits(project.gpid , :page=>100, :ref_name => branch).count== 0
       count = count_commits(project.gpid , 75 , 100) + 75 * 20
-    elsif g.commits(project.gpid , :page=>125).count==0
+    elsif g.commits(project.gpid , :page=>125, :ref_name => branch).count==0
       count = count_commits(project.gpid , 100 , 125) + 100 * 20
-    elsif g.commits(project.gpid , :page=>150).count==0
+    elsif g.commits(project.gpid , :page=>150, :ref_name => branch).count==0
       count = count_commits(project.gpid , 125 , 150) + 125 * 20
     else
       count = count_commits(project.gpid , 150 ,200) + 150 * 20
@@ -832,7 +832,7 @@ module ApplicationHelper
       if $g.commits(project_id,:page => page).count == 0
         break
       else
-        count = count + $g.commits(project_id,:page => page).count
+        count = count + $g.commits(project_id,  :ref_name => @rev, :page => page).count
       end
     end
     return count

app/helpers/organizations_helper.rb

@@ -23,7 +23,7 @@ module OrganizationsHelper
       when 'activity' then
         return '动态'
       when 'course' then
-        return '课程'
+        return '班级'
       when 'project' then
         return '项目'
     end

app/helpers/syllabuses_helper.rb

@@ -48,17 +48,17 @@ module SyllabusesHelper
     option6 = []
 
     option1 << "请选择"
-    option1 << 1
+    option1 << 0
     option2 << "公共必修课"
-    option2 << 2
+    option2 << 1
     option3 << "学科必修课"
-    option3 << 3
+    option3 << 2
     option4 << "专业选修课"
-    option4 << 4
+    option4 << 3
     option5 << "实践必修课"
-    option5 << 5
+    option5 << 4
     option6 << "实践选修课"
-    option6 << 6
+    option6 << 5
 
     type << option1
     type << option2

app/services/courses_service.rb

@@ -324,15 +324,15 @@ class CoursesService
     define_error [
         0, '加入成功',
         1, '密码错误',
-        2, '课程已过期 请联系课程管理员重启课程。',
-        3, '您已经加入了课程',
-        4, '您加入的课程不存在',
+        2, '班级已过期 请联系班级管理员重启班级。',
+        3, '您已经加入了班级',
+        4, '您加入的班级不存在',
         5, '您还未登录',
         6, '申请成功，请等待审核完毕',
         7, '您已经发送过申请了，请耐心等待',
-        8, '您已经是该课程的教师了',
-        9, '您已经是该课程的教辅了',
-        10, '您已经是该课程的管理员了',
+        8, '您已经是该班级的教师了',
+        9, '您已经是该班级的教辅了',
+        10, '您已经是该班级的管理员了',
         '未知错误，请稍后再试'
     ]
   end

app/views/account/email_activation.html.erb

@@ -23,9 +23,15 @@
               url,
               {user: id },
               function (data) {
-                  console.log("1111111111");
-                  console.log(data);
-                  $(".email_verify_btn").replaceWith("<p class='email_verify_p mt30 ml30'>激活邮件已发送至您的注册邮箱，请及时登录邮箱进行验证。</p>");
+                  //邮箱@之前用a**b格式显示
+                  var mail = data.email;
+                  var pos = mail.indexOf("@");
+                  var restr = mail.substring(1,pos-1);
+                  if( mail.split("@")[0].length > 2 ){
+                      mail = mail.replace(restr,"***");
+                  }
+
+                  $(".email_verify_btn").replaceWith("<p class='email_verify_p mt30 ml30'>激活邮件已发送至您的注册邮箱("+mail+")，请及时登录邮箱进行验证。</p>");
               }
       );
   }
@@ -37,16 +43,16 @@
           pop_up_box(htmlvalue,580,30,50);
           return;
       }
-      $.get(
-              url,
-              {user:user,text:$(".email_prompt_mes").val() },
-              function (data) {
-                  console.log("2222222");
-                  console.log(data);
-                  var htmlvalue = "<div class='email_tancon'><h2 class='email_tan_title'>您的留言已发送</h2><p class='email_tan_p'>我们将尽快处理好，并通过邮件通知您。感谢您的反馈！</p></div>"
-                  pop_up_box(htmlvalue,580,30,50);
-                  $(".email_prompt_mes").val("");
-              }
-      );
+
+      $.ajax({
+          url: url,
+          data: {user: user, text: $(".email_prompt_mes").val() },
+          type: "POST",
+          success: function (data) {
+              var htmlvalue = "<div class='email_tancon'><h2 class='email_tan_title'>您的留言已发送</h2><p class='email_tan_p'>我们将尽快处理好，并通过邮件通知您。感谢您的反馈！</p></div>"
+              pop_up_box(htmlvalue, 580, 30, 45);
+              $(".email_prompt_mes").val("");
+          }
+      });
   }
 </script>

app/views/attachments/_form_course.html.erb

@@ -2,31 +2,31 @@
 <% if defined?(container) && container && container.saved_attachments %>
   <% if isReply  %>
   <% container.saved_attachments.each_with_index do |attachment, i| %>
-    <span id="attachments_p<%= i %>" class="sub_btn">
+    <p id="attachments_<%= i+1 %>" class="sub_btn">
 
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly=>'readonly')%>
       <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
       <!--<span class="ispublic-label"><%#= l(:field_is_public)%>:</span>-->
       <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
 
-      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+      <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "#{i+1}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload', :containerid => "2") %>
       <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
-    </span>
+    </p>
   <% end %>
   <% else %>
   <% container.attachments.each_with_index do |attachment, i| %>
-     <span id="attachments_p<%= i %>" class="attachment">
+     <p id="attachments_<%= i+1 %>" class="attachment">
 
       <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly=>'readonly')%>
        <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
        <!--<span class="ispublic-label"><%#= l(:field_is_public)%>:</span>-->
        <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false, :class => 'is_public_checkbox')%>
 
-       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
+       <%= link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "#{i+1}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload', :containerid => "2") %>
        <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
 
        <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
-    </span>
+    </p>
   <% end %>
   <% end %>
 <% end %>

app/views/courses/join.js.erb

@@ -10,12 +10,12 @@ window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/co
 <% elsif @state == 1 %>
 alert("密码错误");
 <% elsif @state == 2 %>
-alert("课程已过期\n请联系课程管理员重启课程。(在配置课程处)");
+alert("班级已过期\n请联系班级管理员重启班级。(在配置班级处)");
 <% elsif @state == 3 %>
-alert("您已经加入了课程");
+alert("您已经加入了班级");
 window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 4 %>
-alert("您加入的课程不存在");
+alert("您加入的班级不存在");
 <% elsif @state == 5 %>
 alert("您还未登录");
 <% elsif @state == 6 %>
@@ -25,15 +25,15 @@ hidden_join_course_form();
   alert("您已经发送过申请了，请耐心等待");
 hidden_join_course_form();
 <% elsif @state == 8%>
-alert("您已经是该课程的教师了");
+alert("您已经是该班级的教师了");
 hidden_join_course_form();
 window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 9%>
-alert("您已经是该课程的教辅了");
+alert("您已经是该班级的教辅了");
 hidden_join_course_form();
 window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% elsif @state == 10%>
-alert("您已经是该课程的管理员了");
+alert("您已经是该班级的管理员了");
 hidden_join_course_form();
 window.location.href= "<%= Setting.protocol%>://"+"<%= Setting.host_name%>"+"/courses/" + "<%= @course.id%>"
 <% else %>

app/views/courses/private_or_public.js.erb

@@ -9,9 +9,9 @@
     }
 <% else %>
     <% if @course.is_public? %>
-        $("#show_course_<%= @course.id %>").attr("title","公开课程：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
+        $("#show_course_<%= @course.id %>").attr("title","公开班级：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
     <% else %>
-        $("#show_course_<%= @course.id %>").attr("title","私有课程：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
+        $("#show_course_<%= @course.id %>").attr("title","私有班级：<%= @course.name %>（<%= @course.time.to_s+ @course.term %>）");
     <% end %>
     $("#set_course_public_<%= @course.id %>").replaceWith('<%= escape_javascript(link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => "courses", :action => "private_or_public", :id => @course,:user_page => true},
                                 :id => "set_course_public_#{@course.id.to_s}",:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗") %>');

app/views/layouts/_syllabus_base_info.html.erb

@@ -4,7 +4,7 @@
   <% end %>
   <div class="cl"></div>
   <li><label >创建教师：</label><span><%=syllabus.user.show_name %></span></li>
-  <% unless syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 %>
+  <% unless syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == '' %>
       <li><label>课程性质：</label><%=syllabus.syllabus_type_str %></li>
   <% end %>
   <% unless syllabus.credit.nil? || syllabus.credit == '' %>
@@ -26,7 +26,7 @@
       <li><label>先修课程：</label><%=syllabus.pre_course %></li>
   <% end %>
 
-  <% if syllabus.syllabus_type.nil? || syllabus.syllabus_type == '' %>
+  <% if syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == '' %>
       <li class="none none_attr"><label>课程性质：</label><span class="fontGrey3">空</span></li>
   <% end %>
   <% if syllabus.credit.nil? || syllabus.credit == '' %>
@@ -48,7 +48,7 @@
       <li class="none none_attr"><label>先修课程：</label><span class="fontGrey3">空</span></li>
   <% end %>
 </ul>
-<% if User.current.logged? && (User.current == syllabus.user || User.current.admin?)&&(syllabus.syllabus_type.nil? || syllabus.syllabus_type == ''||syllabus.credit.nil? || syllabus.credit == ''||syllabus.hours.nil? || syllabus.hours == ''||syllabus.theory_hours.nil? || syllabus.theory_hours == ''||syllabus.practice_hours.nil? || syllabus.practice_hours == ''||syllabus.applicable_major.nil? || syllabus.applicable_major == ''||syllabus.pre_course.nil? || syllabus.pre_course == '')%>
+<% if User.current.logged? && (User.current == syllabus.user || User.current.admin?)&&(syllabus.syllabus_type.nil? || syllabus.syllabus_type == 0 || syllabus.syllabus_type == ''||syllabus.credit.nil? || syllabus.credit == ''||syllabus.hours.nil? || syllabus.hours == ''||syllabus.theory_hours.nil? || syllabus.theory_hours == ''||syllabus.practice_hours.nil? || syllabus.practice_hours == ''||syllabus.applicable_major.nil? || syllabus.applicable_major == ''||syllabus.pre_course.nil? || syllabus.pre_course == '')%>
     <span class="homepageLeftMenuMore"><a href="javascript:void(0);" data-init="0" onclick="toggle_all_syllabus_attr();" class="homepageLeftMenuMoreIcon" id="show_all_syllabus_attr"></a></span>
 <% end %>
 <script>

app/views/organizations/_join_course_menu.html.erb

@@ -24,12 +24,12 @@
 <body>
 <!--<div class="resourceSharePopup">-->
   <div>
-    <div class="relateText">请选择关联到组织的课程</div>
-    <div class="c_red">您的私有课程不能被关联到组织</div>
+    <div class="relateText">请选择关联到组织的班级</div>
+    <div class="c_red">您的私有班级不能被关联到组织</div>
   </div>
   <div class="fl">
     <%=form_tag url_for(:controller => 'organizations', :action => 'join_courses', :organization_id => organization_id),:method => 'post', :id => 'join_courses_form', :remote => true,:class=>"resourcesSearchBox" do %>
-      <input type="text" name="courses" placeholder="搜索您已加入的课程的名称" class="searchCourse" />
+      <input type="text" name="courses" placeholder="搜索您已加入的班级的名称" class="searchCourse" />
       <div id="search_courses_result_list" class="mb8 maxHeight100" style="overflow:auto;"></div>
       <div class="courseSendSubmit">
         <a href="javascript:void(0);" onclick="org_join_courses(<%= organization_id %>);" class="sendSourceText">关联</a>

app/views/organizations/_org_custom_left2.html.erb

@@ -2,7 +2,7 @@
 <% if is_default_field?(field) %>
     <% case field.name %>
     <% when 'course' %>
-        <h2 class="por_h2_index clear">课程动态</h2>
+        <h2 class="por_h2_index clear">班级动态</h2>
         <% if @course_acts.blank? %>
             <p class="fontGrey2 f14 mt10 mb5">该模块暂时没有相关内容</p>
         <% else %>

app/views/organizations/_org_left_subfield_list.html.erb

@@ -63,9 +63,9 @@
         <% when 'course' %>
             <div style="display:<%= field.hide == 0 ? 'block':'none' %>;" id="org_subfield_<%= field.id %>">
               <div class="homepageLeftMenuBlock">
-                <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
+                <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">班级</a>
                 <% if User.current.logged? and User.current.admin_of_org?(organization) %>
-                    <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
+                    <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联班级"%>
                 <% end %>
               </div>
               <div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses" style="display:<%= organization.courses.count == 0 ?'none':'' %>">

app/views/projects/invite_members_by_mail.html.erb

@@ -48,7 +48,7 @@
         var last_name = $.trim($('#last_name').val());
         if(last_name.length > 30)
         {
-            $("#valid_email").text("用户姓氏过长,最长为30个字符");
+            $("#valid_email").text("用户姓名过长,最长为30个字符");
             return false;
         }
         else

app/views/quality_analysis/_console_output.html.erb

@@ -0,0 +1,8 @@
+<%= javascript_include_tag 'highcharts','highcharts-more' %>
+<div class="project_r_h">
+  <h2 class="project_h2" style="width:180px;">质量分析</h2>
+</div>
+<div>
+ <%=h @console_build %>
+</div>
+

app/views/quality_analysis/_edit.html.erb

@@ -0,0 +1,23 @@
+<div class="f16 fb fontBlue mb10">代码质量分析</div>
+<div>
+  <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'update_jenkins_job', :project_id => @project.id), :id => 'quality_analyses_edit_form') do %>
+      <div class="ui form">
+        <div class="mb10" style="margin-right:13px;">
+          <textarea  id="path_description" name="path" rows="8" style="height: 87px; resize:vertical;" class="analysis-option-box"><%= @quality_analysis.path %></textarea>
+        </div>
+        <div class="mb10">
+          <div>
+            <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @quality_analysis.branch), :value => 77, :id => 'branch', :class => "analysis-option-box" %>
+          </div>
+        </div>
+        <div class="mb10">
+          <div>
+            <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#","c"], "#{@quality_analysis.language}"), :id => 'branch', :class => "analysis-option-box" %>
+          </div>
+        </div>
+        <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText" onclick="$('#quality_analyses_edit_form').submit();hideModal()">提交</a></div>
+        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal()">取消</a></div>
+        <div class="cl"></div>
+      </div>
+  <% end %>
+</div>

app/views/quality_analysis/_result_list.html.erb

@@ -1,22 +1,33 @@
+<script type="text/javascript">
+    //        $("#ajax-indicator span").text("载入中...");
+    $("#ajax-indicator").show();
+</script>
 <div class="project_r_h">
   <h2 class="project_h2">分析结果</h2>
 </div>
 <ul class="analysis-result-list">
   <li class="analysis-result-name fl fontBlue2" >名称</li>
-  <li class="analysis-result-version fl fontBlue2" >版本</li>
-  <li class="analysis-result-loc fl fontBlue2" >分支</li>
-  <li class="analysis-result-debt fl fontBlue2" >语言</li>
-  <li class="analysis-result-time fl fontBlue2" >路径</li>
+  <li class="analysis-result-version fl fontBlue2" >分支</li>
+  <li class="analysis-result-loc fl fontBlue2" >语言</li>
+  <li class="analysis-result-debt fl fontBlue2" >路径</li>
+  <li class="analysis-result-time fl fontBlue2" >编辑</li>
+  <!--<li class="analysis-result-time fl fontBlue2" >bianji</li>-->
   <div class="cl"></div>
 </ul>
 <% if @quality_analyses.count >0 %>
     <% @quality_analyses.each do |qa| %>
         <ul class="analysis-result-list">
           <li title="Name" title="名称"><%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.sonar_name, :branch => (qa.branch.nil? ? "master" : qa.branch)), :class => "analysis-result-name fl fontBlue2" %></li>
-          <li class="analysis-result-version fl fontBlue2" title="版本">1.0</li>
-          <li class="analysis-result-loc fl fontBlue2" title="分支名"><%= qa.branch %></li>
-          <li class="analysis-result-debt fl fontBlue2" title="语言"><%= qa.language %></li>
-          <li class="analysis-result-time fl fontBlue2" title="时间"><%= qa.path %></li>
+          <li class="analysis-result-version fl fontBlue2" title="分支名"><%= qa.branch %></li>
+          <li class="analysis-result-loc fl fontBlue2" title="语言"><%= qa.language %></li>
+          <li class="analysis-result-debt fl fontBlue2" title="时间"><%= qa.path %></li>
+            <% if User.current.try(:login) == qa.author_login %>
+              <li class="analysis-result-time fl" title="编辑">
+                <%=link_to "编辑", edit_project_quality_analysi_path(qa, :project_id => @project.id), :remote => true, :class => "fontBlue2" %>
+              </li>
+            <% else %>
+              <li class="analysis-result-time fl" style="color: #888" title="编辑">编辑</li>
+            <% end %>
           <div class="cl"></div>
         </ul>
     <% end %>

app/views/quality_analysis/_show.html.erb

@@ -9,7 +9,7 @@
 <% if @complexity["msr"].count > 3 %>
     <%= render :partial => "hightchars" %>
     <div class="analysis-block mt10 mb40 f14">
-      <div class="flex">
+      <div class="flex mb10">
         <div class="analysis-genral">
           <p id="container_sqale_rating" style="max-width:200px;min-height:200px;width:200px; margin:0 auto;"></p>
           <p class="fontGrey3">质量等级</p>
@@ -43,25 +43,26 @@
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">质量等级</span><span class="mr10 fontGrey2"><span class="c_red f18" style="margin-top:-5px; display:inline-block;"><%=@complexity["msr"][9].nil? ? 0 : score_sqale_rating(@complexity["msr"][9]["val"].to_i) %></span>/5分</span>
     <span class="fontGrey2">可定性评价为：<span class="c_red">质量<%=@complexity["msr"][9].nil? ? "很好" : sqale_rating_status(@complexity["msr"][9]["val"])[0] %></span></span></div>
   <div class="analysis-block mt10 mb40 f14">
-    <div><span class="fontGrey3 mr30">技术债务</span><span class="fontBlue2 w70 pInline"><%=@complexity["msr"][8].nil? ? 0 : @complexity["msr"][8]["frmt_val"] %></span>
-      <span class="fontGrey2"><a target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>
+    <div><span class="fontGrey3 mr30">技术债务</span><span class="w70 pInline"><%=@complexity["msr"][8].nil? ? 0 : @complexity["msr"][8]["frmt_val"] %></span>
+      <span class="fontGrey2"><a class="linkBlue2" target="_blank" href="<%= @sonar_address %>/drilldown/measures/<%= @resource_id %>?metric=sqale_index">查看详情</a></span></div>
     <div><span class="fontGrey3 mr30 fl">质量问题</span>
-      <span class="fontBlue2 w70 pInline"><a class="fontBlue2 w70 pInline" target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false"><%=@sonar_issues["msr"][0].nil? ? 0 : @sonar_issues["msr"][0]["frmt_val"] %></a></span><span class="fontGrey2">问题分类如下：</span></div>
+      <span class="fontBlue2 w70 pInline"><a class="fontBlue2 w70 pInline" target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false"><%=@sonar_issues["msr"][0].nil? ? 0 : @sonar_issues["msr"][0]["frmt_val"] %></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>
-        <span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1].nil? ? 0 : @sonar_issues["msr"][1]["frmt_val"] %></span>
+        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=BLOCKER" class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][1].nil? ? 0 : @sonar_issues["msr"][1]["frmt_val"] %></a>
         <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][1].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][1]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
       <div class="mb10"><span class="analysis-serious-icon mr5"></span><span class="fontGrey3 mr45">严重</span>
-        <span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2].nil? ? 0 : @sonar_issues["msr"][2]["frmt_val"] %></span>
+        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=CRITICAL" class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][2].nil? ? 0 : @sonar_issues["msr"][2]["frmt_val"] %></a>
         <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][2].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][2]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
       <div class="mb10"><span class="analysis-main-icon mr5"></span><span class="fontGrey3 mr45">主要</span>
-        <span class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3].nil? ? 0 : @sonar_issues["msr"][3]["frmt_val"] %></span>
+        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=MAJOR" class="fontBlue2 w70 pInline"><%= @sonar_issues["msr"][3].nil? ? 0 : @sonar_issues["msr"][3]["frmt_val"] %></a>
         <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][3].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][3]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
       <div class="mb10"><span class="analysis-secondary-icon mr5"></span><span class="fontGrey3 mr45">次要</span>
-        <span class="fontBlue2 w70 pInline"><%=@sonar_issues["msr"][4].nil? ? 0 : @sonar_issues["msr"][4]["frmt_val"] %></span>
+        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=MINOR" class="fontBlue2 w70 pInline"><%=@sonar_issues["msr"][4].nil? ? 0 : @sonar_issues["msr"][4]["frmt_val"] %></a>
         <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][4].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][4]["frmt_val"].to_i, 1000) %>%;"></span></span></div>
       <div><span class="analysis-info-icon mr5"></span><span class="fontGrey3 mr45">信息</span>
-        <span class="fontBlue2 w70 pInline"><%=@sonar_issues["msr"][5].nil? ? 0 : @sonar_issues["msr"][5]["frmt_val"] %></span><span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][5].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][5]["frmt_val"].to_i, 200) %>%;"></span></span></div>
+        <a target="_blank" href="<%= @sonar_address %>/component_issues?id=<%= @resource_id %>#resolved=false|severities=INFO" class="fontBlue2 w70 pInline"><%=@sonar_issues["msr"][5].nil? ? 0 : @sonar_issues["msr"][5]["frmt_val"] %></a>
+        <span class="quality-percentage"><span class="quality-percentage-rate" style="width:<%=@sonar_issues["msr"][5].nil? ? 0 : statistics_result_percentage(@sonar_issues["msr"][5]["frmt_val"].to_i, 200) %>%;"></span></span></div>
     </div>
   </div>
   <div class="analysis-tag-wrap f16"> <span class="analysis-tag fl mr15"></span> <span class="fb fl mr10">代码规模</span><span class="fontGrey2">可定性评价为：<span class="c_red"><%=@complexity["msr"][0].nil? ? 0 : lines_scale(@complexity["msr"][0]["frmt_val"].to_i) %></span></span></div>

app/views/quality_analysis/create.html.erb

@@ -0,0 +1,9 @@
+<% if @current_build_status == "success" %>
+    <%= render :partial => "show", :locals => {:branch => params[:branch]} %>
+<% else %>
+    <% if @build_console_result %>
+        运行结果超时
+    <% else %>
+        <%= render :partial => "console_output" %>
+    <% end %>
+<% end %>

app/views/quality_analysis/create.js.erb

@@ -0,0 +1,11 @@
+$("#ajax-indicator").hide();
+<% if @current_build_status == "success" %>
+    <%= escape_javascript( render :partial => 'quality_analysis/show', :locals => {:branch => branch}) %>
+<% elsif @current_build_status == "failure" %>
+    <%=h @console_build.html_safe %>
+<% elsif @current_build_status == "not_run" %>
+    alert('任务启动失败');
+<% else %>
+    alert('你已经创建类一个同名job');
+<% end %>
+

app/views/quality_analysis/edit.js.erb

@@ -0,0 +1,8 @@
+$('#ajax-modal').html('<%= escape_javascript( render :partial => 'quality_analysis/edit', :locals => {}) %>');
+showModal('ajax-modal', '615px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+$('#ajax-modal').parent().css("top","20%").css("left","32%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");
+
+