diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 63ab4d0f0..d5bbd6586 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -74,27 +74,25 @@ class StudentWorkController < ApplicationController
#添加评分,已评分则为修改评分
def add_score
- score = student_work_score @work,User.current
- if score
- if params[:new_form] && params[:new_form][:user_message]
- score.score = params[:score]
- score.comment = params[:new_form][:user_message]
- end
+ @score = student_work_score @work,User.current
+ if @score
+ @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
+ @score.score = params[:score] if params[:score]
+ @is_new = false
else
- if params[:new_form] && params[:new_form][:user_message]
- score = StudentWorksScore.new
- score.score = params[:score]
- score.comment = params[:new_form][:user_message]
- score.user_id = User.current.id
- score.student_work_id = @work.id
- score.reviewer_role = 1
- end
+ @score = StudentWorksScore.new
+ @score.score = params[:score] if params[:score]
+ @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != ""
+ @score.user_id = User.current.id
+ @score.student_work_id = @work.id
+ @score.reviewer_role = 1
+ @is_new = true
end
- score.save_attachments(params[:attachments])
- render_attachment_warning_if_needed(score)
+ @score.save_attachments(params[:attachments])
+ render_attachment_warning_if_needed(@score)
- if score.save
+ if @score.save
respond_to do |format|
format.js
end
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index f7a01f309..fae1c1e89 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -32,48 +32,18 @@
+
<%= render :partial => 'add_score',:locals => {:work => @work,:score => @score}%>
-<% unless @work.student_works_scores.empty?%>
-
+
<%@work.student_works_scores.each do |score|%>
-
- <%= link_to image_tag(url_to_avatar(score.user), :width => "34", :height => "34"), user_path(score.user),:class => "ping_pic fl" %>
-
- <%= link_to score.user.show_name, user_path(score.user), :title => score.user.show_name, :class => "c_blue fl" %>
-
(<%= student_work_score_role score%>)
-
评分:
-
<%= score.score%>分
-
回复
-
- <%=format_time score.created_at %>
-
-
-
- <%= score.comment%>
-
-
- <%= render :partial => 'work_attachments', :locals => {:attachments => score.attachments} %>
-
-
- <%= render :partial => 'add_score_reply',:locals => {:score => score}%>
-
-
-
-
- <% score.journals_for_messages.order("created_on desc").each do |jour|%>
- <%= render :partial => 'jour_replay',:locals => {:jour => jour}%>
- <% end%>
-
-
-
-
+
+ <%= render :partial => 'student_work_score',:locals => {:score => score}%>
+
<% end%>
-<%end%>
收起
\ No newline at end of file
diff --git a/app/views/student_work/_student_work_score.html.erb b/app/views/student_work/_student_work_score.html.erb
new file mode 100644
index 000000000..c1536df98
--- /dev/null
+++ b/app/views/student_work/_student_work_score.html.erb
@@ -0,0 +1,31 @@
+
+ <%= link_to image_tag(url_to_avatar(score.user), :width => "34", :height => "34"), user_path(score.user),:class => "ping_pic fl" %>
+
+ <%= link_to score.user.show_name, user_path(score.user), :title => score.user.show_name, :class => "c_blue fl" %>
+
(<%= student_work_score_role score%>)
+
评分:
+
<%= score.score%>分
+
回复
+
+ <%=format_time score.created_at %>
+
+
+
+ <%= score.comment%>
+
+
+ <%= render :partial => 'work_attachments', :locals => {:attachments => score.attachments} %>
+
+
+ <%= render :partial => 'add_score_reply',:locals => {:score => score}%>
+
+
+
+
+ <% score.journals_for_messages.order("created_on desc").each do |jour|%>
+ <%= render :partial => 'jour_replay',:locals => {:jour => jour}%>
+ <% end%>
+
+
+
+
\ No newline at end of file
diff --git a/app/views/student_work/add_score.js.erb b/app/views/student_work/add_score.js.erb
index fa58c3739..22f31a6c3 100644
--- a/app/views/student_work/add_score.js.erb
+++ b/app/views/student_work/add_score.js.erb
@@ -1,3 +1,8 @@
-$("#add_student_score").html("<%= escape_javascript(render :partial => 'add_score',:locals => {:work => @work}) %>");
+$("#add_student_score_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'add_score',:locals => {:work => @work,:score => @score}) %>");
$('#score_<%= @work.id%>').peSlider({range: 'min'});
-alert("评分成功");
\ No newline at end of file
+
+<% if @is_new%>
+ $("#score_list_<%= @work.id%>").prepend("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %>");
+<% else %>
+ $("#work_score_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score}) %>");
+<% end%>