Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/attachments_controller.rb

@@ -514,7 +514,7 @@ private
   end
 
   def has_login
-    unless @attachment.container_type == "PhoneAppVersion"
+    unless @attachment && @attachment.container_type == "PhoneAppVersion"
       render_403 unless User.current.logged?
     end
   end

app/controllers/homework_common_controller.rb

@@ -18,28 +18,28 @@ class HomeworkCommonController < ApplicationController
   end
 
   def new
-    @homework_type = "1"
+    # @homework_type = "1"
-
+    #
-    @homework = HomeworkCommon.new
+    # @homework = HomeworkCommon.new
-    @homework.safe_attributes = params[:homework_common]
+    # @homework.safe_attributes = params[:homework_common]
-    @homework.late_penalty = 0
+    # @homework.late_penalty = 0
-    @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    # @homework.end_time = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-    @homework.publish_time = Time.now.strftime('%Y-%m-%d')
+    # @homework.publish_time = Time.now.strftime('%Y-%m-%d')
-
+    #
-    if @homework_type == "1"
+    # if @homework_type == "1"
-      #匿评作业相关属性
+    #   #匿评作业相关属性
-      @homework_detail_manual = HomeworkDetailManual.new
+    #   @homework_detail_manual = HomeworkDetailManual.new
-      @homework_detail_manual.ta_proportion = 0.6
+    #   @homework_detail_manual.ta_proportion = 0.6
-      @homework_detail_manual.absence_penalty = 0
+    #   @homework_detail_manual.absence_penalty = 0
-      @homework_detail_manual.evaluation_num = 3
+    #   @homework_detail_manual.evaluation_num = 3
-      @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
+    #   @homework_detail_manual.evaluation_start = Time.now.strftime('%Y-%m-%d')
-      @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
+    #   @homework_detail_manual.evaluation_end = (Time.now  + 3600 * 24).strftime('%Y-%m-%d')
-      @homework.homework_detail_manual = @homework_detail_manual
+    #   @homework.homework_detail_manual = @homework_detail_manual
-    elsif @homework_type == "2"
+    # elsif @homework_type == "2"
-      #编程作业相关属性
+    #   #编程作业相关属性
-      @homework_detail_programing = HomeworkDetailPrograming.new
+    #   @homework_detail_programing = HomeworkDetailPrograming.new
-      @homework.homework_detail_programing = @homework_detail_programing
+    #   @homework.homework_detail_programing = @homework_detail_programing
-    end
+    # end
     respond_to do |format|
       format.html
     end
@@ -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}

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

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 = []

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
 

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" >
+      <%= select_tag :language,options_for_select(programing_languages_options,homework.homework_detail_programing.language), {:class => "fl mb10 h26 w70"}  %>
-        <option>C</option>
-      </select>
       <div class="cl"></div>
     </li>
 

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">
+<div class="hwork_new" id="hwork_new">
-  <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %>
+  <%= form_for("new_homework_common",:url => next_step_homework_common_index_path) do |f|%>
-      <%= hidden_field_tag "course",@course.id%>
+      <input type="hidden" name="course" value="<%= @course.id%>">
-      <%= render :partial => 'homework_common/homework_detail_manual_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %>
+      <h3 class="c_blue f16 mb10">
-      <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"%>
+      </h3>
-      <%= link_to '取消',homework_common_index_path(:course => @course.id),:class => 'grey_btn fl'%>
+      <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>

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%>