From 4d1730f92ef9b2887ffb86da1ffb99b43de88161 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 4 Nov 2014 17:48:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_set_course_time.html.erb | 2 +- config/locales/zh.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/courses/_set_course_time.html.erb b/app/views/courses/_set_course_time.html.erb index 384b07df2..f1eec891f 100644 --- a/app/views/courses/_set_course_time.html.erb +++ b/app/views/courses/_set_course_time.html.erb @@ -7,7 +7,7 @@ <% linkPath = course_endTime_timeout?(course) ? restartcourse_course_path(course) : finishcourse_course_path(course, format: :js) %> <% desc = course_endTime_timeout?(course) ? '重启' : '关闭' %> - <%= link_to "#{desc}课程", linkPath, :remote => true, :method => :post, :id => id, :confirm => ("确定要#{desc}课程？") %> + <%= link_to "#{desc}", linkPath, :remote => true, :method => :post, :id => id, :confirm => ("确定要#{desc}课程？") %> <% else %> <% end %> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index ddde5ccb7..1053e0be1 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -463,7 +463,7 @@ zh: permission_view_courses: 查看课程 permission_new_course: 新建课程 permission_configure_course: 配置课程 - permission_close_course: 关闭/重开课程 + permission_close_course: 关闭/重开 permission_new_assignment: 新建任务 permission_edit_assignment: 编辑任务 permission_delete_assignment: 删除任务 From a08f944d85b206f31d875f84eacd06d1766c1cd9 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 4 Nov 2014 18:33:41 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_homework.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index ab3dbd750..387bed8ff 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -107,9 +107,9 @@ <% case @bid.comment_status %> <% when 0 %> - <%= link_to '启动匿评', start_anonymous_comment_bid_path(bid), id: "#{bid.id}_start_anonymous_comment", remote: true, :confirm => "开启匿评后学生将不能对作业进行提交、修改、删除等操作\n是否确定开启匿评？" %> + <%= link_to '启动匿评', start_anonymous_comment_bid_path(@bid), id: "#{@bid.id}_start_anonymous_comment", remote: true, :confirm => "开启匿评后学生将不能对作业进行提交、修改、删除等操作\n是否确定开启匿评？" %> <% when 1 %> - <%= link_to '关闭匿评', stop_anonymous_comment_bid_path(bid), id: "#{bid.id}_stop_anonymous_comment", remote: true, :confirm => "关闭匿评后学生将不能对作业进行评分\n是否确定关闭匿评？" %> + <%= link_to '关闭匿评', stop_anonymous_comment_bid_path(@bid), id: "#{@bid.id}_stop_anonymous_comment", remote: true, :confirm => "关闭匿评后学生将不能对作业进行评分\n是否确定关闭匿评？" %> <% when 2 %> 匿评结束 <% end %> From eb551788ac7a535be352b9c276f4e28789d79c36 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 5 Nov 2014 09:16:06 +0800 Subject: [PATCH 3/5] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=202.=E5=8C=BF=E8=AF=84=E5=88=86=E9=85=8D=E6=94=AF=E6=8C=812?= =?UTF-8?q?=E4=BB=BD=E4=BD=9C=E4=B8=9A=E5=88=86=E9=85=8D=203.=E5=8C=BF?= =?UTF-8?q?=E8=AF=84=E5=88=86=E9=85=8D=E4=B8=8D=E6=AD=A3=E7=A1=AE=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/bids_controller.rb | 4 ++-- app/controllers/homework_attach_controller.rb | 2 +- app/views/bids/start_anonymous_comment.js.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index 5146282ac..8da054d71 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -511,7 +511,7 @@ class BidsController < ApplicationController all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM(SELECT homework_attaches.*, (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers}) AS t_score, (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN #{teachers}) AS s_score, - (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = 3123) AS m_score + (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id}) AS m_score FROM homework_attaches INNER JOIN homework_evaluations ON homework_evaluations.homework_attach_id = homework_attaches.id WHERE homework_attaches.bid_id = #{@bid.id} AND homework_evaluations.user_id = #{User.current.id} ORDER BY s_score DESC) AS table1 @@ -1006,7 +1006,7 @@ class BidsController < ApplicationController @bid = Bid.find(params[:id]) if(@bid.comment_status == 0) homeworks = @bid.homeworks - if(homeworks && homeworks.size > 2) + if(homeworks && homeworks.size >= 2) homeworks.each_with_index do |homework, index| user = homework.user n = 3 # TODO: this value should get from params, (老师设置) diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb index 12aa5860f..4b7fdb15e 100644 --- a/app/controllers/homework_attach_controller.rb +++ b/app/controllers/homework_attach_controller.rb @@ -103,7 +103,7 @@ class HomeworkAttachController < ApplicationController all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM(SELECT homework_attaches.*, (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id IN #{teachers}) AS t_score, (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id NOT IN #{teachers}) AS s_score, - (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = 3123) AS m_score + (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND rater_id = #{User.current.id}) AS m_score FROM homework_attaches INNER JOIN homework_evaluations ON homework_evaluations.homework_attach_id = homework_attaches.id WHERE homework_attaches.bid_id = #{@bid.id} AND homework_evaluations.user_id = #{User.current.id} ORDER BY s_score DESC) AS table1 diff --git a/app/views/bids/start_anonymous_comment.js.erb b/app/views/bids/start_anonymous_comment.js.erb index c7e2bfb40..392e999a4 100644 --- a/app/views/bids/start_anonymous_comment.js.erb +++ b/app/views/bids/start_anonymous_comment.js.erb @@ -3,7 +3,7 @@ $("#<%= @bid.id %>_start_anonymous_comment").remove(); $("#<%= @bid.id %>_anonymous_comment").append('<%= link_to "关闭匿评", stop_anonymous_comment_bid_path(@bid), remote: true %>'); <% elsif @statue == 2 %> - alert('启动失败\n作业总数大于4份时才能启动匿评'); + alert('启动失败\n作业总数大于等于2份时才能启动匿评'); <% elsif @statue == 3%> alert("已开启匿评，请务重复开启"); <% end %> From 54a904467996f07aaa836b194e07f6a08789a153 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 5 Nov 2014 10:06:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E4=B8=AA=E6=95=B0=E5=8F=AF=E9=85=8D=E7=BD=AE=E3=80=81=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=A2=9E=E5=8A=A0=E5=85=B6=E7=9B=B8=E5=85=B3js?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/bids_controller.rb | 4 ++- app/views/bids/_homework_form.html.erb | 6 +++- app/views/bids/edit.html.erb | 29 +++++++++++++++++-- app/views/courses/_homework_form.html.erb | 6 +++- app/views/courses/new_homework.html.erb | 29 +++++++++++++++++-- config/locales/zh.yml | 3 +- ...0141105012624_add_evaluation_num_to_bid.rb | 5 ++++ db/schema.rb | 18 ++---------- 8 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 db/migrate/20141105012624_add_evaluation_num_to_bid.rb 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 @@