diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index 8da054d71..5fd42a97e 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -806,6 +806,7 @@ class BidsController < ApplicationController @bid.description = params[:bid][:description] @bid.is_evaluation = params[:bid][:is_evaluation] @bid.proportion = params[:bid][:proportion] + @bid.evaluation_num = params[:bid][:evaluation_num] @bid.reward_type = 3 # @bid.budget = params[:bid][:budget] @bid.deadline = params[:bid][:deadline] @@ -861,6 +862,7 @@ class BidsController < ApplicationController @bid.description = params[:bid][:description] @bid.is_evaluation = params[:bid][:is_evaluation] @bid.proportion = params[:bid][:proportion] + @bid.evaluation_num = params[:bid][:evaluation_num] @bid.reward_type = 3 @bid.deadline = params[:bid][:deadline] @bid.budget = 0 @@ -1009,7 +1011,7 @@ class BidsController < ApplicationController if(homeworks && homeworks.size >= 2) homeworks.each_with_index do |homework, index| user = homework.user - n = 3 # TODO: this value should get from params, (老师设置) + n = @bid.evaluation_num n = n < homeworks.size ? n : homeworks.size - 1 assigned_homeworks = get_assigned_homeworks(homeworks, n, index) assigned_homeworks.each do |h| diff --git a/app/views/bids/_homework_form.html.erb b/app/views/bids/_homework_form.html.erb index de4c16960..448e4144a 100644 --- a/app/views/bids/_homework_form.html.erb +++ b/app/views/bids/_homework_form.html.erb @@ -32,7 +32,7 @@ <%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;", :maxlength => Bid::DESCRIPTION_LENGTH_LIMIT %>
- <%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:150px;", :readonly => true, :onchange => "regexDeadLine();") %> + <%= f.text_field(:deadline, :required => true, :size => 60, :style => "width:100px;", :readonly => true, :onchange => "regexDeadLine();") %> <%= calendar_for('bid_deadline')%> @@ -43,6 +43,10 @@
<%= f.select :proportion, proportion_option %>
++ <%= f.text_field :evaluation_num, :required => true, :size => 60, :style => "width:150px;", :onblur => "regexEvaluationNum();" , :maxlength => 4%> + 匿评分配数量不宜太大,否则会影响开启匿评速度 +
<%= hidden_field_tag 'course_id', @course.id %>
diff --git a/app/views/bids/edit.html.erb b/app/views/bids/edit.html.erb index fd21872b0..3408e99b1 100644 --- a/app/views/bids/edit.html.erb +++ b/app/views/bids/edit.html.erb @@ -1,7 +1,7 @@