jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course

This commit is contained in:
huang 2015-11-20 20:03:11 +08:00
parent 8b29002a0f c36ec99ff6
commit 2435f06f44
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/exercise_controller.rb
View File

@ -310,7 +310,7 @@ class ExerciseController < ApplicationController
# 重新发布的时候会删除所有的答题
def republish_exercise
@exercise.exercise_questions.each do |exercise_question|
exercise_question.exercise_ansers.destroy_all
exercise_question.exercise_answers.destroy_all
end
@exercise.exercise_users.destroy_all
@exercise.exercise_status = 1

4
app/views/exercise/_exercise.html.erb
View File

@ -20,8 +20,10 @@
<% if exercise.exercise_status == 1 %>
<li><a href="javascript:" class="pollsbtn btn_pu fl ml5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>);">发布试卷</a></li>
<% elsif exercise.exercise_status == 2%>
<li><a href="javascript:" class="pollsbtn btn_de fl ml5" onclick="republish_exercise(<%= exercise.id%>);">取消发布</a></li>
<% else%>
<li class="pollsbtn fl ml5 pollsbtn_grey">发布试卷</li>
<li class="pollsbtn fl ml10 pollsbtn_grey" style="margin-left: 5px;" >发布试卷</li>
<% end%>
<%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %>

8
app/views/exercise/_exercise_form.html.erb
View File

@ -84,8 +84,11 @@
{
var title = $.trim($("#poll_questions_title").val());
var score = $.trim($("#question_score").val());
var standard_ans = $.trim($("#question_standard_ans").val());
if(title.length == 0 || score.length == 0){
alert("题目标题/分数不能为空");
}else if(standard_ans.length == 0) {
alert("标准答案不能为空");
}else{
doc.parent().parent().parent().submit();}
}
@ -94,8 +97,11 @@
{
var title = $.trim($("#poll_questions_title_" + id).val());
var score = $.trim($("#poll_question_score_"+ id).val());
var standard_ans = $.trim($("#poll_question_standard_answer_" + id).val());
if(title.length == 0 || score.length == 0){
alert("题目标题不能为空");
alert("题目标题/分数不能为空");
}else if(standard_ans.length == 0) {
alert("标准答案不能为空");
}else{
doc.parent().parent().parent().submit();}
}

4
app/views/exercise/create_exercise_question.js.erb
View File

@ -1,6 +1,8 @@
<% if @is_insert %>
$("#poll_content").html('<%= escape_javascript(render :partial => 'exercise_content', :locals => {:exercise => @exercise})%>');
$("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise}) %>");
$("#current_score_div").show();
$("#current_score").html("<%=get_current_score @exercise %>分");
<% else %>
$("#new_exercise_question").html('<%= escape_javascript(render :partial => 'new_question', :locals => {:exercise => @exercise}) %>');
$("#new_poll_question").html("");
@ -35,6 +37,6 @@
"</div>" +
"</div>");
<% end %>
$("#current_score").html("<%=get_current_score @exercise %>分");
$("#current_score_div").show();
$("#current_score").html("<%=get_current_score @exercise %>分");
<% end %>

2
app/views/exercise/update_exercise_question.js.erb
View File

@ -16,5 +16,5 @@ $("#poll_questions_<%= @exercise_question.id%>").html("<div id='show_poll_questi
"<%= escape_javascript(render :partial => 'edit_single', :locals => {:exercise_question => @exercise_question}) %>" +
"<% end%>" +
"</div>");
$("#current_score").html("<%=get_current_score @exercise %>分");
$("#current_score").html("<%=get_current_score @exercise_question.exercise %>分");
$("#exercise_submit").html("<%= escape_javascript(render :partial => 'exercise_submit', :locals => {:exercise => @exercise_question.exercise}) %>");