diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index f71103973..9b0fd56a0 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -89,72 +89,54 @@ class MessagesController < ApplicationController
# Create a new topic
def new
- @message = Message.new
- @message.author = User.current
- @message.board = @board
- @message.safe_attributes = params[:message]
- if request.post?
- @message.save_attachments(params[:attachments])
- if @message.save
- # 更新kindeditor上传的图片资源所有者
- if params[:asset_id]
- ids = params[:asset_id].split(',')
- update_kindeditor_assets_owner ids,@message.id,OwnerTypeHelper::MESSAGE
- end
- # # 与我相关动态的记录add start
- # if(@board && @board.course) #项目的先不管
- # teachers = searchTeacherAndAssistant(@board.course)
- # for teacher in teachers
- # if(teacher.user_id != User.current.id)
- # notify = ActivityNotify.new()
- # if(@board.course)
- # notify.activity_container_id = @board.course_id
- # notify.activity_container_type = 'Course'
- # else
- # notify.activity_container_id = @board.project_id
- # notify.activity_container_type = 'Project'
- # end
- # notify.activity_id = @message.id
- # notify.activity_type = 'Message'
- # notify.notify_to = teacher.user_id
- # notify.is_read = 0
- # notify.save()
- # end
- # end
- # end
- # 与我相关动态的记录add end
+ if User.current.logged?
+ @message = Message.new
+ @message.author = User.current
+ @message.board = @board
+ @message.safe_attributes = params[:message]
+ if request.post?
+ @message.save_attachments(params[:attachments])
+ if @message.save
+ # 更新kindeditor上传的图片资源所有者
+ if params[:asset_id]
+ ids = params[:asset_id].split(',')
+ update_kindeditor_assets_owner ids,@message.id,OwnerTypeHelper::MESSAGE
+ end
- call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
- render_attachment_warning_if_needed(@message)
- if params[:is_board]
- if @project
- redirect_to project_boards_path(@project)
- elsif @course
- redirect_to course_boards_path(@course)
+ call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
+ render_attachment_warning_if_needed(@message)
+ if params[:is_board]
+ if @project
+ redirect_to project_boards_path(@project)
+ elsif @course
+ redirect_to course_boards_path(@course)
+ end
+ else
+ redirect_to board_message_url(@board, @message)
end
else
- redirect_to board_message_url(@board, @message)
+ if params[:is_board]
+ if @project
+ redirect_to project_boards_path(@project, :flag => true)
+ elsif @course
+ redirect_to course_boards_path(@course, :flag => true)
+ end
+ else
+ layout_file = @project ? 'base_projects' : 'base_courses'
+ render :action => 'new', :layout => layout_file
+ end
+
end
else
- if params[:is_board]
- if @project
- redirect_to project_boards_path(@project, :flag => true)
- elsif @course
- redirect_to course_boards_path(@course, :flag => true)
- end
- else
- layout_file = @project ? 'base_projects' : 'base_courses'
- render :action => 'new', :layout => layout_file
+ respond_to do |format|
+ format.html {
+ layout_file = @project ? 'base_projects' : 'base_courses'
+ render :layout => layout_file
+ }
end
-
end
else
- respond_to do |format|
- format.html {
- layout_file = @project ? 'base_projects' : 'base_courses'
- render :layout => layout_file
- }
- end
+ redirect_to signin_path
end
end
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 9f8d25c7e..17c98e3b1 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -14,8 +14,8 @@ class StudentWorkController < ApplicationController
def program_test
is_test = params[:is_test] == 'true'
resultObj = {status: 0, results: [], error_msg: '', time: Time.now.strftime('%Y-%m-%d %T')}
- unless is_test
- student_work = find_or_save_student_work
+
+ student_work = find_or_save_student_work(is_test)
unless student_work
resultObj[:status] = 100
@@ -43,24 +43,7 @@ class StudentWorkController < ApplicationController
end
end
- else
- if @homework.homework_type == 2 && @homework.homework_detail_programing
- result = test_realtime(student_work, params[:src])
- logger.debug result
- resultObj[:status] = result["status"]
- resultObj[:results] = result["results"]
- resultObj[:error_msg] = result["error_msg"]
- results = result["results"]
- if result["status"].to_i == -2 #编译错误
- results = [result["error_msg"]]
- end
-
- resultObj[:status] = result["status"].to_i
- resultObj[:time] = Time.now.strftime('%Y-%m-%d %T')
- resultObj[:index] = 0
- end
-
- end
+
render :json => resultObj
@@ -640,13 +623,14 @@ class StudentWorkController < ApplicationController
xls_report.string
end
- def find_or_save_student_work
+ def find_or_save_student_work(is_test)
student_work = @homework.student_works.where(user_id: User.current.id).first
if student_work.nil?
@homework.student_works.build(
name: params[:title],
description: params[:src],
- user_id: User.current.id
+ user_id: User.current.id,
+ is_test: is_test
)
unless @homework.save
else
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d7cf29387..9c6492448 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -298,7 +298,7 @@ class UsersController < ApplicationController
def user_homeworks
if User.current == @user
@page = params[:page] ? params[:page].to_i + 1 : 0
- user_course_ids = "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
+ user_course_ids = @user.courses.empty? ? "(-1)" :"(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
@homework_commons = HomeworkCommon.where("course_id in #{user_course_ids}").order("created_at desc").limit(10).offset(@page * 10)
respond_to do |format|
format.js
@@ -401,7 +401,7 @@ class UsersController < ApplicationController
homework_detail_programing = HomeworkDetailPrograming.new
homework.homework_detail_programing = homework_detail_programing
homework_detail_programing.ta_proportion = params[:ta_proportion] || 0.6
- homework_detail_programing.language = params[:program][:language].to_i
+ homework_detail_programing.language = params[:language_type].to_i
inputs = params[:program][:input]
if Array === inputs
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index 5158a99c4..77304c1b1 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -202,11 +202,15 @@ class WordsController < ApplicationController
#给用户留言
def leave_user_message
- @user = User.find(params[:id])
- if params[:new_form][:user_message].size>0 && User.current.logged? && @user
- @user.add_jour(User.current, params[:new_form][:user_message])
+ if User.current.logged?
+ @user = User.find(params[:id])
+ if params[:new_form][:user_message].size>0 && User.current.logged? && @user
+ @user.add_jour(User.current, params[:new_form][:user_message])
+ end
+ redirect_to feedback_path(@user)
+ else
+ render_403
end
- redirect_to feedback_path(@user)
end
# add by nwb
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 1c066495f..b51de6c2c 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -10,7 +10,7 @@ class HomeworkCommon < ActiveRecord::Base
has_one :homework_detail_manual, :dependent => :destroy
has_one :homework_detail_programing, :dependent => :destroy
has_many :homework_tests, :dependent => :destroy
- has_many :student_works, :dependent => :destroy
+ has_many :student_works, :dependent => :destroy, :conditions => "is_test=0"
has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表
has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动
# 课程动态
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index 6e39c954a..d7287dcc4 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -1,6 +1,6 @@
#学生提交作品表
class StudentWork < ActiveRecord::Base
- attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :project_id
+ attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :project_id, :is_test
belongs_to :homework_common
belongs_to :user
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 4ff98b1b7..f071cbeb4 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -9,7 +9,6 @@
span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
div.ke-toolbar .ke-outline{border:none;}
.ke-inline-block{display: none;}
- .ke-container{height: 30px !important;}
<% user_activities.each do |user_activity|
if user_activities %>
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index 00d80dd22..0944ffab6 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -49,6 +49,10 @@
上传附件
<%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mr15 mt3",:remote => true%>
+ <% if defined?(has_program) && has_program %>
+ 编程
+
+ <% end %>
<% content_for :header_tags do %>
diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 7be8811a4..72ace3ba5 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -1,5 +1,5 @@
<% content_for :header_tags do %>
- <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
+ <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'%>
<%= javascript_include_tag 'homework','baiduTemplate' %>
<% end %>
@@ -40,7 +40,7 @@
- <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework} %>
+ <%= render :partial => 'users/user_homework_attachment', :locals => {:container => homework, :has_program=>true} %>
@@ -51,29 +51,6 @@
-
-
-
-
-
-
-
-
-
-
-
- <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue' %>
+ <%= link_to "模拟答题", new_user_commit_homework_users_path(homework_id: homework_common.id, is_test: true), class: 'c_blue test-program-btn', title: '教师可以通过模拟答题设置作业的标准答案' %>
<% end %>
diff --git a/app/views/users/new_user_commit_homework.html.erb b/app/views/users/new_user_commit_homework.html.erb
index 8d5a1a48c..8b02b4594 100644
--- a/app/views/users/new_user_commit_homework.html.erb
+++ b/app/views/users/new_user_commit_homework.html.erb
@@ -38,11 +38,15 @@
-