Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts: app/helpers/exercise_helper.rb 解决冲突sw_new_course
commit
7f5fa7fb6f
@ -1,22 +1,21 @@
|
|||||||
|
<% exercise.exercise_questions.each do |exercise_question|%>
|
||||||
<% exercise.exercise_questions.each do |poll_question|%>
|
<div id="poll_questions_<%= exercise_question.id%>">
|
||||||
<div id="poll_questions_<%= poll_question.id%>">
|
<div id="show_poll_questions_<%= exercise_question.id %>">
|
||||||
<!--<div id="show_poll_questions_<%= poll_question.id %>">
|
<% if exercise_question.question_type == 1%>
|
||||||
<%# if poll_question.question_type == 1%>
|
<%= render :partial => 'show_MC', :locals => {:exercise_question => exercise_question} %>
|
||||||
<%#= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
|
<% elsif exercise_question.question_type == 2%>
|
||||||
<%# elsif poll_question.question_type == 2%>
|
<%= render :partial => 'show_MCQ', :locals => {:exercise_question => exercise_question} %>
|
||||||
<%#= render :partial => 'show_MCQ', :locals => {:poll_question => poll_question} %>
|
<% elsif exercise_question.question_type == 3%>
|
||||||
<%# elsif poll_question.question_type == 3%>
|
<%= render :partial => 'show_single', :locals => {:exercise_question => exercise_question} %>
|
||||||
<%#= render :partial => 'show_single', :locals => {:poll_question => poll_question} %>
|
<% end%>
|
||||||
<%# end%>
|
</div>
|
||||||
</div>-->
|
<div id="edit_poll_questions_<%= exercise_question.id %>" style="display: none;">
|
||||||
<div id="edit_poll_questions_<%= poll_question.id %>" style="display: none;">
|
<% if exercise_question.question_type == 1%>
|
||||||
<% if poll_question.question_type == 1%>
|
<%= render :partial => 'edit_MC', :locals => {:exercise_question => exercise_question} %>
|
||||||
<%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
|
<% elsif exercise_question.question_type == 2%>
|
||||||
<% elsif poll_question.question_type == 2%>
|
<%= render :partial => 'edit_MCQ', :locals => {:exercise_question => exercise_question} %>
|
||||||
<%= render :partial => 'edit_MCQ', :locals => {:poll_question => poll_question} %>
|
<% elsif exercise_question.question_type == 3%>
|
||||||
<% elsif poll_question.question_type == 3%>
|
<%= render :partial => 'edit_single', :locals => {:exercise_question => exercise_question} %>
|
||||||
<%= render :partial => 'edit_single', :locals => {:poll_question => poll_question} %>
|
|
||||||
<% end%>
|
<% end%>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -0,0 +1,36 @@
|
|||||||
|
<div>
|
||||||
|
<div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
|
||||||
|
<%= exercise_question.question_title %><span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span></div>
|
||||||
|
|
||||||
|
<%#= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id),
|
||||||
|
method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %>
|
||||||
|
<a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= exercise_question.id%>);"></a>
|
||||||
|
<a class='ur_icon_add' title='向下插入' id="add_mc_<%=exercise_question.id%>" onclick="chooseQuestionType('mc',<%=exercise_question.id%>);"></a>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<div class="ur_inputs">
|
||||||
|
<table class="ur_table" >
|
||||||
|
<tbody>
|
||||||
|
<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<label>
|
||||||
|
<input class="ur_radio" type="radio" name="<%= exercise_question %>" value="<%= exercise_choice.choice_text%>" >
|
||||||
|
<%= convert_to_char((index+1).to_s)%> <%= exercise_choice.choice_text%>
|
||||||
|
</label>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<% end %>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div><!--单选题显示 end-->
|
||||||
|
<!-- 新增问题 -->
|
||||||
|
<div id="insert_new_poll_question_mc_<%=exercise_question.id%>">
|
||||||
|
</div>
|
||||||
|
<div id="div_mc_<%=exercise_question.id%>" style="width: 50px;border: 1px solid #cbcbcb; display:none;position: absolute;padding: 5px;background: white">
|
||||||
|
<ul>
|
||||||
|
<li><a href="javascript:void(0);" onclick=" dismiss('mc',<%=exercise_question.id%>);insert_MC('mc',<%=exercise_question.question_number%>,<%=exercise_question.id%>);">单选</a></li>
|
||||||
|
<!--<li><a href="javascript:void(0);" onclick=" dismiss('mc',<%#=poll_question.id%>);insert_MCQ('mc',<%#=poll_question.question_number%>,<%#=poll_question.id%>);">多选</a></li>
|
||||||
|
<li><a href="javascript:void(0);" onclick=" dismiss('mc',<%#=poll_question.id%>);insert_SINGLE('mc',<%#=poll_question.question_number%>,<%#=poll_question.id%>);">单行主观</a></li>-->
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
@ -1,6 +1,12 @@
|
|||||||
<div class="ur_page_head ur_editor02" ><!--头部显示 start-->
|
<div class="testStatus"><!--头部显示 start-->
|
||||||
<a href="javascript:" class="ur_icon_edit" title="编辑" onclick="pollsEdit();"></a>
|
<a href="javascript:" class="testEdit" title="编辑" onclick="pollsEdit();"></a>
|
||||||
|
<!-- <a class='ur_icon_add' title='导入' id="import_btn" onclick="importPoll();"></a> -->
|
||||||
<h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
|
<h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
|
||||||
<%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%>
|
<div class="fontGrey2">
|
||||||
|
<span class="mr100">发布时间：<%=Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%></span>
|
||||||
|
<span class="mr100">截止时间：<%=Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.end_time %></span>
|
||||||
|
<span>考试时长：<%= exercise.time %>分钟</span></div>
|
||||||
|
<div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
</div><!--头部显示 end-->
|
<div class="cl"></div>
|
||||||
|
</div>
|
||||||
Loading…
Reference in new issue