diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index d9f93b7da..7a4aface5 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -13,7 +13,18 @@ class HomeworkCommonController < ApplicationController end def new - + @homework = HomeworkCommon.new + @homework.safe_attributes = params[:homework_common] + @homework.late_penalty = 2 + @homework.end_time = (Time.now + 3600 * 24).strftime('%Y-%m-%d') + @homework.publish_time = Time.now.strftime('%Y-%m-%d') + @homework_detail_manual = HomeworkDetailManual.new + @homework_detail_manual.ta_proportion = 0.6 + @homework_detail_manual.absence_penalty = 2 + @homework_detail_manual.evaluation_num = 3 + @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.homework_detail_manual = @homework_detail_manual respond_to do |format| format.html end diff --git a/app/helpers/homework_common_helper.rb b/app/helpers/homework_common_helper.rb index 39de45bbd..aa4645d0e 100644 --- a/app/helpers/homework_common_helper.rb +++ b/app/helpers/homework_common_helper.rb @@ -55,4 +55,44 @@ module HomeworkCommonHelper def cur_user_works_for_homework homework homework.student_works.where("user_id = ?",User.current).first end + + #迟交扣分下拉框 + def late_penalty_option + type = [] + for i in (1..5) + option = [] + option << i + option << i + type << option + end + type + end + + #教辅评分比例下拉框 + def ta_proportion_option + type = [] + i = 10 + while i <= 100 + option = [] + option << i.to_s + "%" + option << i.to_f / 100 + type << option + i += 10 + end + type + end + + #缺评扣分 + def absence_penalty_option + type = [] + i = 1 + while i <= 5 + option = [] + option << i + option << i + type << option + i += 1 + end + type + end end \ No newline at end of file diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb index ce11fedb1..9593fa324 100644 --- a/app/models/homework_common.rb +++ b/app/models/homework_common.rb @@ -1,7 +1,8 @@ #老师布置的作业表 #homework_type: 1:普通作业;2:匿评作业;3:编程作业 class HomeworkCommon < ActiveRecord::Base - attr_accessible :name, :user_id, :description, :publish_time, :end_time, :homework_type, :late_penalty, :course_id + # attr_accessible :name, :user_id, :description, :publish_time, :end_time, :homework_type, :late_penalty, :course_id + include Redmine::SafeAttributes belongs_to :course belongs_to :user diff --git a/app/views/homework_common/_homework_common_form.html.erb b/app/views/homework_common/_homework_common_form.html.erb new file mode 100644 index 000000000..7b11ce712 --- /dev/null +++ b/app/views/homework_common/_homework_common_form.html.erb @@ -0,0 +1,110 @@ + +
+

基本规则设置（总分为100分）

+
+
+ +
+
+ +
+

学生互评设置

+
+ +
\ No newline at end of file diff --git a/app/views/homework_common/new.html.erb b/app/views/homework_common/new.html.erb index b6968151a..ad9d17d24 100644 --- a/app/views/homework_common/new.html.erb +++ b/app/views/homework_common/new.html.erb @@ -1,143 +1,16 @@ +<%= javascript_include_tag "/assets/kindeditor/kindeditor" %> +<%= error_messages_for 'homework_common' %> +
-

发布作业

+

+ <%= l(:label_course_homework_new)%> +

- -
-

基本规则设置（总分为100分）

-
-
-
    -
  • - - -  分 -
    -
    • -
  • - - -
    -
    • -
  • - - - × 教辅评分 -   +   - - × 匿评得分 - = 学生得分 -
    -
    • -
  • - - 如果教师对学生作品进行了评分，则教师评分为学生最终得分。 -
    -
    • -
-
-
- -
-

学生互评设置

-
- -
- 提交取消 - - + <%= labelled_form_for @homework,:url => {:controller => 'homework_common',:action => 'create'} do |f| %> + <%= render :partial => 'homework_common/homework_common_form', :locals => { :homework => @homework,:f => f,:edit_mode => false } %> + 提交 + 取消 + <% end%>
\ No newline at end of file diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 99084de3f..bd56629ca 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -17,7 +17,7 @@ <%= javascript_heads %> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> - <%= stylesheet_link_tag 'public', 'leftside', 'courses'%> + <%= stylesheet_link_tag 'public', 'leftside', 'courses', 'jquery/jquery-ui-1.9.2'%> <%= javascript_include_tag "course","header" %> <%= yield :header_tags -%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 5fcb1fb5c..027601423 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1218,7 +1218,7 @@ zh: no_attachmens_allowed: 提交作业不能为空 button_bidding_homework: 参加竞标 #huang - field_homework_type: 提交形式 #bai + field_homework_type: "" #bai label_homework_respond: 作业情况 label_bid_me: 我要应标 diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 227048ef6..3a8d82776 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -379,18 +379,18 @@ function show_bid_dead_line(year,month,day,divname) + "

作品提交还剩：

"); } //验证新建作业的名字 -function regex_bid_name() +function regex_homework_name() { - var name = $.trim($("#bid_name").val()); + var name = $.trim($("#homework_name").val()); if(name=="") { - $("#bid_name_span").text("名称不能为空"); + $("#homework_name_span").text("名称不能为空"); return false; } else { - $("#bid_name_span").text(""); + $("#homework_name_span").text(""); return true; } }