From 389b75f7abdf16f047fb3e0a5f06b0f9b7541066 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 29 Apr 2016 17:55:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=BC=95=E7=94=A8=E7=A7=81?= =?UTF-8?q?=E6=9C=89=E4=BD=9C=E4=B8=9A=E6=97=B6=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 11 +++++---- app/models/apply_homework.rb | 2 +- app/models/course_message.rb | 2 +- app/views/users/_homework_repository.html.erb | 2 ++ app/views/users/_user_message_course.html.erb | 24 ++++++++++++++++++- 5 files changed, 34 insertions(+), 7 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d8e9a0f62..f0a884a54 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -292,17 +292,20 @@ class UsersController < ApplicationController #status 1 同意 2 拒绝 def dealwith_apply_homework @msg = CourseMessage.find(params[:msg_id]) + ah = ApplyHomework.where("user_id = ? and homework_common_id = ?",@msg.apply_user_id, @msg.course_message_id) case params[:agree] when 'Y' - ah = ApplyHomework.where("user_id = ? and homework_common_id = ?",@msg.apply_user_id, @msg.course_message_id) unless ah.empty? ah.first.update_column('status', 2) - CourseMessage.create(:user_id => @msg.apply_user_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>@msg.course_message_id,:content=>@msg.content,:course_message_type=>'HomeworkCommon',:status=>5,:apply_result=>1) + CourseMessage.create(:user_id => @msg.apply_user_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>@msg.course_message_id,:content=>@msg.content,:course_message_type=>'HomeworkCommon',:status=>6,:apply_result=>1) @msg.update_attributes(:apply_result=>1,:viewed=>1) end when 'N' - CourseMessage.create(:user_id => @msg.apply_user_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>@msg.course_message_id,:content=>@msg.content,:course_message_type=>'HomeworkCommon',:status=>5,:apply_result=>2) - @msg.update_attributes(:apply_result=>2,:viewed=>1) + unless ah.empty? + ah.first.update_column('status', 3) + CourseMessage.create(:user_id => @msg.apply_user_id, :course_id => @msg.course_id, :viewed => false,:content=> @msg.content,:course_message_id=>@msg.course_message_id,:content=>@msg.content,:course_message_type=>'HomeworkCommon',:status=>6,:apply_result=>2) + @msg.update_attributes(:apply_result=>2,:viewed=>1) + end end respond_to do |format| format.js diff --git a/app/models/apply_homework.rb b/app/models/apply_homework.rb index c92eccca6..0a7c505a4 100644 --- a/app/models/apply_homework.rb +++ b/app/models/apply_homework.rb @@ -1,5 +1,5 @@ class ApplyHomework < ActiveRecord::Base - #status：1. 待审核 2.审核通过 + #status：1. 待审核 2.审核通过 3.已拒绝 belongs_to :user belongs_to :homework_common attr_accessible :status, :user_id, :homework_common_id diff --git a/app/models/course_message.rb b/app/models/course_message.rb index 3375aa5ab..07bfb22de 100644 --- a/app/models/course_message.rb +++ b/app/models/course_message.rb @@ -1,7 +1,7 @@ class CourseMessage < ActiveRecord::Base # status说明： status在课程不同的类型，区分不同的功能 status = 9 作品的提交记录 # HomeworkCommon：status： - # nil：发布了作业； 1：作业截止时间到了提醒！；2:开启匿评； 3：关闭匿评； 4：匿评开始失败； 5：申请引用作业 + # nil：发布了作业； 1：作业截止时间到了提醒！；2:开启匿评； 3：关闭匿评； 4：匿评开始失败； 5：申请引用作业, 6:申请结果 # apply_user_id: 申请者的用户id attr_accessible :course_id, :course_message_id, :course_message_type, :user_id, :viewed, :content, :status, :apply_user_id, :apply_result diff --git a/app/views/users/_homework_repository.html.erb b/app/views/users/_homework_repository.html.erb index 72211a0d9..cc36d9a88 100644 --- a/app/views/users/_homework_repository.html.erb +++ b/app/views/users/_homework_repository.html.erb @@ -46,6 +46,8 @@ 待审核 <% elsif ah.status == 2 %> 可引用 + <% elsif ah.status == 3 %> + 已拒绝 <% end %> <% else %> diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index cfde9d4bd..c0d7020b7 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -237,7 +237,7 @@ ">您有了新的引用作业申请：
  • - " class ='#{ma.viewed==0 ? "newsBlack" : "newsGrey"}'><%=User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"" %> + <%=User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"" %> @@ -259,6 +259,28 @@
  • <%= time_tag(ma.created_at).html_safe %>
    • <% end %> + <% if ma.course_message_type == "HomeworkCommon" && ma.status == 6 %> + + <% end %> <% if ma.course_message_type == "Poll" %>