hushasha
/
trustieforge
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

Browse Source
sw_new_course
cxt 10 years ago
parent c7cf34500c bd7ee66e77
commit 2cd1c07028
4 changed files with 161 additions and 146 deletions
Show Stats Download Patch File Download Diff File

122
app/views/exercise/_exercise.html.erb
Unescape View File

@ -1,61 +1,63 @@
<%# has_commit = has_commit_poll?(poll.id ,User.current)%> <%# has_commit = has_commit_poll?(poll.id ,User.current)%>
<% exercise_name = exercise.exercise_name.empty? ? l(:label_poll_new) : exercise.exercise_name%> <% exercise_name = exercise.exercise_name.empty? ? l(:label_poll_new) : exercise.exercise_name%>
<% if @is_teacher%> <% if @is_teacher%>
<li title="<%= exercise.exercise_name %>"> <li title="<%= exercise.exercise_name %>">
<div style="width: 310px;float: left;"> <div style="width: 310px;float: left;">
<%# if has_commit %> <%# if has_commit %>
<%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%> <%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
<%# else %> <%# else %>
<%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %> <%#= link_to poll_name, exercise_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
<%# end %> <%# end %>
<%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %> <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_w fl c_dblue" %>
</div> </div>
</li> </li>
<% if exercise.exercise_status == 1%> <%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %>
<li class="pollsbtn fl ml10 pollsbtn_grey">统计结果</li>
<% else %> <% if exercise.exercise_status == 1 %>
<li><%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fl ml10"%></li> <li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%></li>
<% end%> <% else%>
<li class="polls_de_grey fr ml5" title="未发布的试卷才能进行编辑">编辑</li>
<% if exercise.exercise_status == 1 %> <% end%>
<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%> <%# if exercise.exercise_status == 2 %>
<li><a href="javascript:" class="pollsbtn btn_de fl ml5" onclick="republish_exercise(<%= exercise.id%>);">取消发布</a></li> <!--<li><a class="polls_de fr ml5" onclick="" href="javascript:">关闭</a></li>-->
<% else%> <%# else %>
<li class="pollsbtn fl ml10 pollsbtn_grey" style="margin-left: 5px;" >发布试卷</li> <!--<li class="polls_de_grey fr ml5" title="发布的问卷才能进行关闭">关闭</li>-->
<% end%> <%# end%>
<%= link_to(l(:button_delete), exercise,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10") %> <%# if exercise.exercise_status == 1%>
<!--<li class="polls_de_grey fr ml5">导出</li>-->
<% if exercise.exercise_status == 1 %> <%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %>
<li><%= link_to l(:button_edit), edit_exercise_path(exercise.id), :class => "polls_de fr ml5"%></li> <!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
<% else%> <%# end%>
<li class="polls_de_grey fr ml5" title="未发布的试卷才能进行编辑">编辑</li>
<% end%>
<li class="polls_date fr"><%= format_date exercise.created_at.to_date%></li>
<%# if exercise.exercise_status == 2 %>
<!--<li><a class="polls_de fr ml5" onclick="" href="javascript:">关闭</a></li>-->
<%# else %> <% if exercise.exercise_status == 1 %>
<!--<li class="polls_de_grey fr ml5" title="发布的问卷才能进行关闭">关闭</li>--> <li><a href="javascript:" class="pollsbtn btn_pu fr mr5" onclick="exercise_submit(<%= exercise.id%>,<%= exercise.exercise_name.length %>);">发布试卷</a></li>
<%# end%> <% elsif exercise.exercise_status == 2%>
<li><a href="javascript:" class="pollsbtn btn_de fr mr5" onclick="republish_exercise(<%= exercise.id%>);">取消发布</a></li>
<%# if exercise.exercise_status == 1%> <% else%>
<!--<li class="polls_de_grey fr ml5">导出</li>--> <li class="pollsbtn fr mr10 pollsbtn_grey" style="margin-left: 5px;" >发布试卷</li>
<%# elsif exercise.exercise_status == 2 || exercise.exercise_status == 3 %> <% end%>
<!--<li><%#= link_to "导出", export_exercise_exercise_path(exercise.id,:format => "xls"), :class => "polls_de fr ml5"%></li>-->
<%# end%> <% if exercise.exercise_status == 1%>
<li class="pollsbtn fr mr10 pollsbtn_grey">统计结果</li>
<% else %>
<li class="polls_date fr"><%= format_date exercise.created_at.to_date%></li> <li><%= link_to l(:label_statistical_results), student_exercise_list_exercise_path(exercise.id,:course_id => @course.id), :class => "pollsbtn fr mr10"%></li>
<% else%> <% end%>
<% if exercise.exercise_status == 2%>
<%# if has_commit%> <% else%>
<!--li><%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li> <% if exercise.exercise_status == 2%>
<li class="pollsbtn_tip fl ml5">已答</li--> <%# if has_commit%>
<%#else%> <!--li><%#= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li>
<%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%> <li class="pollsbtn_tip fl ml5">已答</li-->
<%#end%> <%#else%>
<% end%> <%= link_to exercise_name, exercise_path(exercise.id), :class => "polls_title polls_title_st fl c_dblue"%>
<li class="polls_date fr mr10"><%= format_date exercise.created_at.to_date%></li> <%#end%>
<% end%>
<li class="polls_date fr mr10"><%= format_date exercise.created_at.to_date%></li>
<% end%> <% end%>

48
app/views/exercise/_exercises_list.html.erb
Unescape View File

@ -1,25 +1,25 @@
<div class="polls_head"> <div class="polls_head" style="width:730px;">
<h2>所有试卷 <h2>所有试卷
<span>（<%= @obj_count%>）</span> <span>（<%= @obj_count%>）</span>
</h2> </h2>
<% if @is_teacher%> <% if @is_teacher%>
<%#= link_to "导入", other_poll_poll_index_path(:polls_group_id => @course.id), :remote=>true,:class => "newbtn"%> <%#= link_to "导入", other_poll_poll_index_path(:polls_group_id => @course.id), :remote=>true,:class => "newbtn"%>
<%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %> <%= link_to "新建试卷 ", new_exercise_path(:course_id => @course.id), :class => "newbtn" %>
<% end%> <% end%>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div id="polls_list" class="polls_list"> <div id="polls_list" class="polls_list">
<% @exercises.each do |exercise|%> <% @exercises.each do |exercise|%>
<ul id="exercises_<%= exercise.id %>" class="polls_list_ul"> <ul id="exercises_<%= exercise.id %>" class="polls_list_ul">
<%= render :partial => 'exercise', :locals => {:exercise => exercise} %> <%= render :partial => 'exercise', :locals => {:exercise => exercise} %>
</ul> </ul>
<div class="cl"></div> <div class="cl"></div>
<% end%> <% end%>
<ul class="wlist"> <ul class="wlist">
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
</ul> </ul>
<div class="cl"></div> <div class="cl"></div>
</div><!--列表end--> </div><!--列表end-->

129
app/views/exercise/index.html.erb
Unescape View File

@ -1,63 +1,68 @@
<%= stylesheet_link_tag 'polls', :media => 'all' %> <%= stylesheet_link_tag 'polls', :media => 'all' %>
<script type="text/javascript"> <script type="text/javascript">
function republish_exercise(exercise_id) $(function(){
{ $("#RSide").css("width","730px");
$('#ajax-modal').html("<div id='popbox02'>" + $("#homework_page_right").css("min-height",$("#LSide").height()-30);
"<div class='upload_con'>" + $("#Container").css("width","1000px");
"<div class='upload_box'>" + });
"<p class='polls_box_p'>取消发布后学生答题将会被清空<br />是否确定取消发布该测验？</p>" + function republish_exercise(exercise_id)
"<div class='polls_btn_box'>" + {
"<a href='/exercise/"+ exercise_id +"/republish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" + $('#ajax-modal').html("<div id='popbox02'>" +
"<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" + "<div class='upload_con'>" +
"</div>" + "<div class='upload_box'>" +
"<div class='cl'></div>" + "<p class='polls_box_p'>取消发布后学生答题将会被清空<br />是否确定取消发布该测验？</p>" +
"</div>" + "<div class='polls_btn_box'>" +
"</div>" + "<a href='/exercise/"+ exercise_id +"/republish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
"</div>"); "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
showModal('ajax-modal', '310px'); "</div>" +
$('#ajax-modal').css('height','120px'); "<div class='cl'></div>" +
$('#ajax-modal').siblings().remove(); "</div>" +
$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" + "</div>" +
"<a onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>"); "</div>");
$('#ajax-modal').parent().removeClass("alert_praise"); showModal('ajax-modal', '310px');
$('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').css('height','120px');
$('#ajax-modal').parent().addClass("popbox_polls"); $('#ajax-modal').siblings().remove();
} $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
"<a onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
function clickCanel(){hideModal("#popbox02");} $('#ajax-modal').parent().removeClass("alert_praise");
$('#ajax-modal').parent().css("top","").css("left","");
function exercise_submit(exercise_id,exercise_name) $('#ajax-modal').parent().addClass("popbox_polls");
{ }
if(exercise_name == 0)
{ function clickCanel(){hideModal("#popbox02");}
alert("试卷标题不能为空");
} function exercise_submit(exercise_id,exercise_name)
else {
{ if(exercise_name == 0)
$('#ajax-modal').html("<div id='popbox02'>" + {
"<div class='upload_con'>" + alert("试卷标题不能为空");
"<div class='upload_box'>" + }
"<p class='polls_box_p'>测验发布后将不能对测验进行修改，<br />是否确定发布该测验？</p>" + else
"<div class='polls_btn_box'>" + {
"<a href='/exercise/"+ exercise_id +"/publish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" + $('#ajax-modal').html("<div id='popbox02'>" +
"<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" + "<div class='upload_con'>" +
"</div>" + "<div class='upload_box'>" +
"<div class='cl'></div>" + "<p class='polls_box_p'>测验发布后将不能对测验进行修改，<br />是否确定发布该测验？</p>" +
"</div>" + "<div class='polls_btn_box'>" +
"</div>" + "<a href='/exercise/"+ exercise_id +"/publish_exercise' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
"</div>"); "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
showModal('ajax-modal', '310px'); "</div>" +
$('#ajax-modal').css('height','120px'); "<div class='cl'></div>" +
$('#ajax-modal').siblings().remove(); "</div>" +
$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" + "</div>" +
"<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>"); "</div>");
$('#ajax-modal').parent().removeClass("alert_praise"); showModal('ajax-modal', '310px');
$('#ajax-modal').parent().css("top","").css("left",""); $('#ajax-modal').css('height','120px');
$('#ajax-modal').parent().addClass("popbox_polls"); $('#ajax-modal').siblings().remove();
} $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
} "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
$('#ajax-modal').parent().removeClass("alert_praise");
</script> $('#ajax-modal').parent().css("top","").css("left","");
<div class="polls_content02" id="exercise"> $('#ajax-modal').parent().addClass("popbox_polls");
<%= render :partial => 'exercises_list'%> }
}
</script>
<div class="polls_content02" id="exercise" style="width: 730px;">
<%= render :partial => 'exercises_list'%>
</div><!--问卷内容end--> </div><!--问卷内容end-->

8
db/schema.rb
Unescape View File

@ -11,7 +11,11 @@
# #
# It's strongly recommended to check this file into your version control system. # It's strongly recommended to check this file into your version control system.
<<<<<<< HEAD
ActiveRecord::Schema.define(:version => 20151124032319) do
=======
ActiveRecord::Schema.define(:version => 20151120115137) do ActiveRecord::Schema.define(:version => 20151120115137) do
>>>>>>> 1ae514ca4857d7e2ad53b338731c1e01f899fb4d
create_table "activities", :force => true do |t| create_table "activities", :force => true do |t|
t.integer "act_id", :null => false t.integer "act_id", :null => false
@ -1137,6 +1141,10 @@ ActiveRecord::Schema.define(:version => 20151120115137) do
create_table "org_members", :force => true do |t| create_table "org_members", :force => true do |t|
t.integer "user_id" t.integer "user_id"
t.integer "organization_id" t.integer "organization_id"
<<<<<<< HEAD
t.string "role"
=======
>>>>>>> 1ae514ca4857d7e2ad53b338731c1e01f899fb4d
t.datetime "created_at", :null => false t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false t.datetime "updated_at", :null => false
end end

Write Preview
Loading…
Cancel
Save