Merge remote-tracking branch 'origin/szzh' into szzh

2015-07-22 10:22:59 +08:00 · 2015-07-22 10:22:59 +08:00 · b8670449c6
parent b148f75dc9 5c9871d20e
commit b8670449c6
17 changed files with 108 additions and 102 deletions
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@ -93,7 +93,7 @@ class HomeworkCommonController < ApplicationController

      if homework.homework_type == 2
        homework_detail_programing = HomeworkDetailPrograming.new
-        homework_detail_programing.language = "C++"
+        homework_detail_programing.language = params[:language]
        homework_detail_programing.standard_code = params[:standard_code]
        homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
        question = {title:homework.name,content:homework.description}
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@ -128,7 +128,7 @@ class StudentWorkController < ApplicationController
          solutions = {
              student_work_id:stundet_work.id,
              src:Base64.encode64(stundet_work.description),
-              language:1
+              language:@homework.homework_detail_programing.language
          }
          uri = URI(url)
          body = solutions.to_json
@ -157,7 +157,7 @@ class StudentWorkController < ApplicationController
  end

  def edit
-    if @homework.homework_type == 2   #编程作业不能修改作业
+    if !User.current.admin? && @homework.homework_type == 2   #编程作业不能修改作业
      render_403
    else
      respond_to do |format|
@ -396,6 +396,7 @@ class StudentWorkController < ApplicationController
          if student_work_test.result == 0
            student_score_count += 1
          end
+          student_work_test.error_msg = params[:compile_error_msg]
          student_work_test.save!
        end
      end
@ -444,7 +445,7 @@ class StudentWorkController < ApplicationController
  #判断是不是当前作品的提交者
  #提交者 && (非匿评作业 || 未开启匿评) 可以编辑作品
  def author_of_work
-    render_403 unless (User.current.id == @work.user_id || User.current.admin?) && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1 )
+    render_403 unless User.current.admin? || (User.current.id == @work.user_id && @homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1 )
  end

  def teacher_of_course
--- a/app/helpers/homework_common_helper.rb
+++ b/app/helpers/homework_common_helper.rb
@ -27,6 +27,19 @@ module HomeworkCommonHelper
    type
  end

+  def programing_languages_options
+    type = []
+    option = []
+    option << "C"
+    option << 1
+    type << option
+    option_1 = []
+    option_1 << "C++"
+    option_1 << 2
+    type << option_1
+    type
+  end
+
  #缺评扣分
  def absence_penalty_option
    type = []
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@ -7,7 +7,7 @@ class StudentWork < ActiveRecord::Base
  has_many :student_works_evaluation_distributions, :dependent => :destroy
  has_many :student_works_scores, :dependent => :destroy
  belongs_to :project
-  has_one :student_work_test
+  has_many :student_work_test

  before_destroy :delete_praise

--- a/app/models/student_work_test.rb
+++ b/app/models/student_work_test.rb
@ -1,6 +1,6 @@
 # encoding: utf-8
 class StudentWorkTest < ActiveRecord::Base
-  attr_accessible :student_work_id, :homework_test_id, :result
+  attr_accessible :student_work_id, :homework_test_id, :result, :error_msg

  belongs_to :homework_test
  belongs_to :student_work
--- a/app/views/homework_common/_homework_detail_programing_form.html.erb
+++ b/app/views/homework_common/_homework_detail_programing_form.html.erb
@ -56,9 +56,7 @@
  <ul>
    <li >
      <label class="label02">&nbsp;开发语言：&nbsp;</label>
-      <select class="fl mb10 h26 w150" >
-        <option>C</option>
-      </select>
+      <%= select_tag :language,options_for_select(programing_languages_options,homework.homework_detail_programing.language), {:class => "fl mb10 h26 w70"}  %>
      <div class="cl"></div>
    </li>

--- a/app/views/homework_common/new.html.erb
+++ b/app/views/homework_common/new.html.erb
@ -1,17 +1,27 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
-<%= error_messages_for 'homework_common' %>
 <div class="project_r_h">
  <h2 class="project_h2">
    <%= l(:label_course_homework_new)%>
  </h2>
 </div>
-<div class="hwork_new">
-  <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
-      <%= hidden_field_tag "course",@course.id%>
-      <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
-      <a href="javascript:void(0)" class="blue_btn fl mr10" onClick="submit_homework('new_homework_common');" >提交</a>
-      <%#= link_to "上一步", new_homework_common_path(:course => @course.id), :class => "orange_btn_homework fl"%>
-      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
+<div class="hwork_new" id="hwork_new">
+  <%= form_for("new_homework_common",:url => next_step_homework_common_index_path) do |f|%>
+      <input type="hidden" name="course" value="<%= @course.id%>">
+      <h3 class="c_blue f16 mb10">
+        请选择将要发布的作业类型
+      </h3>
+      <input type="radio" class="mb10 fl" name="homework_common_type" value="1" id="homework_detail_manual_radio" checked/>
+      <span class="ml5 fl">
+          人工评分的作业（支持匿名互评、灵活设置评分比例）
+      </span>
+      <div class="cl"></div>
+      <input type="radio" class="mb20 fl" name="homework_common_type" value="2" id="homework_detail_programing_radio"/>
+      <span class="ml5 fl">
+          自动评测的编程作业（支持C/C++程序的自动评分）
+      </span>
+      <div class="cl"></div>
+      <a href="javascript:void(0);" class=" orange_btn" onclick="$(this).parent().submit();">
+        下一步
+      </a>
  <% end%>
 </div><!--hwork_new end-->
 <div class="cl"></div>
--- a/app/views/projects/_tools_expand.html.erb
+++ b/app/views/projects/_tools_expand.html.erb
@ -43,97 +43,69 @@
 </li>
 <li>
  <% if User.current.admin? %>
-      <a href="http://tsr.sei.pku.edu.cn/KnowledgeBaseDC/semantic-search.jsp?projectName=jena
-" target="_Blank">软件知识库</a>
-      <%#= link_to l(:label_project_soft_knowledge) ,soft_knowledge_project_path(@project) %>
-  <% end %>
-</li>
-<li>
-  <% if User.current.admin? %>
-      <a href="http://tsr.sei.pku.edu.cn/home.action" target="_Blank">软件资源库</a>
-      <%#= link_to l(:label_project_soft_file) ,soft_file_project_path(@project) %>
-  <% end %>
-</li>
-
-<li>
-  <% if User.current.admin? %>
-      <%= link_to l(:label_project_dts_new) ,dts_dep_project_path(@project), data: { confirm:'你确定要对本项目进行代码缺陷测试分析吗？' } %>
-  <% end %>
-</li>
-
-<li>
-  <% if User.current.admin? %>
-      <a href="http://www.seforge.org/pop-php/" target="_Blank">在线开发平台</a>
-      <%#= link_to l(:label_project_online_dev) ,online_dev_project_path(@project) %>
-  <% end %>
-</li>
-<li>
-  <% if User.current.admin? %>
-      <a href="http://www.seforge.org/sase/" target="_Blank">软工服务平台</a>
+      <a href="http://202.197.34.33:3005/wsManagement/" target="_Blank">QoS评估工具</a>
      <%#= link_to l(:label_project_soft_service) ,soft_service_project_path(@project) %>
  <% end %>
 </li>
-
 <li>
  <% if User.current.admin? %>
-      <a href="http://segdev.nju.edu.cn:8080/internetware/main.jsp" target="_Blank">形式验证工具</a>
+      <a href="http://202.197.34.33:3005/wsManagement/" target="_Blank">QoS证据采集工具</a>
      <%#= link_to l(:label_project_soft_service) ,soft_service_project_path(@project) %>
  <% end %>
 </li>
-
 <li>
  <% if User.current.admin? %>
-      <a href="http://202.197.34.33:3005/wsManagement/" target="_Blank">QoS 评估工具</a>
+      <a href="http://202.197.34.33:3005/wsManagement/" target="_Blank">QoS证据评估统计分析工具</a>
      <%#= link_to l(:label_project_soft_service) ,soft_service_project_path(@project) %>
  <% end %>
 </li>
-
 <li>
  <% if User.current.admin? %>
-      <a href="http://202.197.34.33:3005/wsManagement/" target="_Blank">QoS 证据采集工具</a>
-      <%#= link_to l(:label_project_soft_service) ,soft_service_project_path(@project) %>
+      <%= link_to "代码缺陷测试工具(DTS)" ,dts_dep_project_path(@project), data: { confirm:'你确定要对本项目进行代码缺陷测试分析吗？' } %>
+  <% end %>
+</li>
+<li>
+  <% if User.current.admin? %>
+      <a href="http://www.seforge.org/sase/" target="_Blank">软工服务平台(SASSP)</a>
+  <% end %>
+</li>
+<li>
+  <% if User.current.admin? %>
+      <a href="http://tsr.sei.pku.edu.cn/home.action" target="_Blank">软件知识库(KnowledgeBase)</a>
+  <% end %>
+</li>
+<li>
+  <% if User.current.admin? %>
+      <a href="http://segdev.nju.edu.cn:8080/internetware/main.jsp" target="_Blank">可信评估工具(Evaluator)</a>
+  <% end %>
+</li>
+<li>
+  <% if User.current.admin? %>
+      <a href="http://segdev.nju.edu.cn:8080/internetware/main.jsp" target="_Blank">在线验证工具(BACH-Online)</a>
+  <% end %>
+</li>
+<li>
+  <% if User.current.admin? %>
+      <a href="http://segdev.nju.edu.cn:8080/internetware/main.jsp" target="_Blank">软件测试工具(SSCC-Web)</a>
+  <% end %>
+</li>
+<li>
+  <% if User.current.admin? %>
+      <a href="http://www.service4all.org.cn/servicexchange/" target="_Blank">服务资源共享平台(ServiceXchange)</a>
+  <% end %>
+</li>
+<li>
+  <% if User.current.admin? %>
+      <a href="http://www.service4all.org.cn/repository/ServiceCloud/MyServiceContainer.jsp" target="_Blank">在线服务开发平台(ServiceFoundry)</a>
+  <% end %>
+</li>
+<li>
+  <% if User.current.admin? %>
+      <a href="http://www.service4all.org.cn" target="_Blank">组合开发和运行演化平台(Service4All)</a>
  <% end %>
 </li>

-<li>
-  <% if User.current.admin? %>
-      <a href="http://segdev.nju.edu.cn:8080/internetware/main.jsp" target="_Blank">可信度评估工具 SAS
-      </a>
-      <%#= link_to l(:label_project_soft_service) ,soft_service_project_path(@project) %>
-  <% end %>
-</li>

-<li>
-  <% if User.current.admin? %>
-      <a href="http://segdev.nju.edu.cn:8080/internetware/main.jsp" target="_Blank">可信评估工具 Evaluator</a>
-      <%#= link_to l(:label_project_soft_service) ,soft_service_project_path(@project) %>
-  <% end %>
-</li>

-<li>
-  <% if User.current.admin? %>
-      <a href="http://segdev.nju.edu.cn:8080/internetware/main.jsp" target="_Blank">软件测试工具 SSCC-Web</a>
-      <%#= link_to l(:label_project_soft_service) ,soft_service_project_path(@project) %>
-  <% end %>
-</li>

-<!--<li>-->
-  <!--<%# unless @project.enabled_modules.where("name = 'dts'").empty? %>-->
-	<!--<%#= link_to l(:project_module_dts) ,share_show_path(@project) %>-->
-  <!--<%# end %>-->
-<!--</li>-->
-
-<li>
-  <% if User.current.admin? %>
-      <a href="http://202.197.34.33:3005/wsManagement/" target="_Blank">QoS 证据评估统计分析工具</a>
-      <%#= link_to l(:label_project_soft_service) ,soft_service_project_path(@project) %>
-  <% end %>
-</li>
-
-<li>
-  <% if User.current.admin? %>
-      <a href="http://segdev.nju.edu.cn:8080/internetware/main.jsp" target="_Blank">在线验证工具 BACH-Online</a>
-      <%#= link_to l(:label_project_soft_service) ,soft_service_project_path(@project) %>
-  <% end %>
-</li>

--- a/app/views/projects/dts_dep.html.erb
+++ b/app/views/projects/dts_dep.html.erb
@ -45,11 +45,11 @@
 </div>

 <div id="show_content_div" style="display: none;padding-top: 0px;">
-  <p class="fr f14 "  style="padding-right: 32px;">语言：<span style="color: red">Java</span>  总文件数：<span style="color: red">361</span>  代码行数：<span style="color: red">48662</span></p>
-  <div style="padding-left: 35px;padding-top: 30px;">
-    <% @dts.each do |dt| %>
+  <p class="fr f14 "  style="padding-right: 32px;padding-bottom: 10px;">语言：<span style="color: red">Java</span>  总文件数：<span style="color: red">361</span>  代码行数：<span style="color: red">48662</span></p>

-        <table width="600" border="0" style="padding-left: 30px; border-spacing:0; border-collapse:collapse; border: 1px solid #b0b0b0;">
+    <% @dts.each do |dt| %>
+      <div style="padding-left: 35px;padding-top: 10px;">
+        <table width="600" border="0" style="padding-left: 30px;padding-top: 100px; border-spacing:0; border-collapse:collapse; border: 1px solid #b0b0b0;">
          <tr>
            <td align="center" class="redBox">错误变量</td>
            <td class="redBox2"> &nbsp;<%= dt.Variable %></td>
@ -71,6 +71,7 @@
            <td colspan="5" class="redBox2"> &nbsp;<%= dt.File %></td>
          </tr>
        </table>
+      </div>
    <% end %>
-  </div>
+
 </div>
--- a/app/views/projects/yun_dep.html.erb
+++ b/app/views/projects/yun_dep.html.erb
@ -43,5 +43,5 @@

 <div id="show_content_div" style="display: none;padding-top: 0px; ">
  <p class="pl10 f14 "><span style="color: #7f7f7f;font-size: 14px; ">所部署服务的网址：</span>
-    <span><a href="http://publify.forge.trustie.net" target="_Blank" style="color: #15BCCF;font-size: 14px;">http://publify.forge.trustie.net</a></span></p>
+    <span><a href="http://rubyblog.forge.trustie.net/accounts/login" target="_Blank" style="color: #15BCCF;font-size: 14px;">http://rubyblog.forge.trustie.net/accounts/login</a></span></p>
 </div>
--- a/app/views/student_work/_evaluation_student_work.html.erb
+++ b/app/views/student_work/_evaluation_student_work.html.erb
@ -9,7 +9,8 @@
    <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02"%>
  </li>
  <li class=" hwork_tit">
-    <%= link_to student_work.name, student_work_path(student_work.id),:remote => true,:title => student_work.name, :class => "c_blue02"%>
+    <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+    <%= link_to student_work_name, student_work_path(student_work.id),:remote => true,:title => student_work.name, :class => "c_blue02"%>
  </li>
  <li class=" hwork_time_c">
    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@ -18,7 +18,8 @@
    <% end%>
  </li>
  <li class=" hwork_tit_e" style="width: 410px">
-    <%= link_to student_work.name, student_work_path(student_work),:remote => true, :title => student_work.name, :class => "c_blue02"%>
+    <% student_work_name = student_work.name.nil? || student_work.name.empty? ? '匿名的作品' : student_work.name%>
+    <%= link_to student_work_name, student_work_path(student_work),:remote => true, :title => student_work.name, :class => "c_blue02"%>
  </li>
  <% my_score = student_work_score(student_work,User.current) %>
  <li class=" hwork_code <%= my_score.nil? ? 'c_grey' : 'c_red'%>">
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@ -48,7 +48,6 @@
                <%= test.output%>
              </td>
              <td class="td_50 c_red"><%= test.student_work_test.nil? ? "正在编译" : test.student_work_test.status_to_s%></td>
-              <td class="td_50 "><%= test.student_work_test.nil? ? "0" : test.student_work_test.test_score%></td>
              <input type="hidden" value="<%= test.student_work_test.result if test.student_work_test%>">
            </tr>
        <% end%>
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@ -36,7 +36,7 @@
  <li >
    <span class="tit_fb ">内容：</span>
    <div class="show_hwork_p break_word">
-      <%= text_format @work.description%>
+      <%= text_format(@work.description) if @work.description%>
    </div>
    <div class="cl"></div>
  </li>
--- a/app/views/student_work/_student_work.html.erb
+++ b/app/views/student_work/_student_work.html.erb
@ -9,7 +9,8 @@
    <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02"%>
  </li>
  <li class=" hwork_tit_une">
-    <%= link_to student_work.name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
+    <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
+    <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work.name, :class => "c_blue02"%>
  </li>
  <li class=" hwork_time_c">
    <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %>
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@ -92,7 +92,7 @@ zh:

  label_project_dts_new: DTS缺陷测试
  label_project_dts_statics: DTS缺陷报告
-  label_project_dts_yun: 云化部署
+  label_project_dts_yun: 云化部署工具
  label_project_soft_knowledge: 软件知识库
  label_project_soft_file: 软件资源库
  label_project_online_dev: 在线开发平台
--- a/db/migrate/20150722015428_add_errormsg_to_studen_work_test.rb
+++ b/db/migrate/20150722015428_add_errormsg_to_studen_work_test.rb
@ -0,0 +1,9 @@
+class AddErrormsgToStudenWorkTest < ActiveRecord::Migration
+  def up
+    add_column :student_work_tests,:error_msg,:text
+  end
+
+  def down
+    remove_column :student_work_tests,:error_msg,
+  end
+end