kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into dev_cs

This commit is contained in:
caishi 2017-07-21 17:31:32 +08:00
parent e80d5882d1 f3f9aea32c
commit 13cdda6d92
18 changed files with 146 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/challenges_controller.rb
View File

@ -92,6 +92,11 @@ class ChallengesController < ApplicationController
end
def edit
challenge_num = Challenge.where(:shixun_id => @shixun).count
challenge_pos = @challenge.position
if challenge_pos < challenge_num
@next_challenge = Challenge.where(:shixun_id => @shixun, :position => challenge_pos+1).first
end
@tab = params[:tab].blank? ? 1 : params[:tab].to_i
@editor = params[:editor] # 编辑模式
end

2
app/controllers/courses_controller.rb
View File

@ -46,7 +46,7 @@ class CoursesController < ApplicationController
@select = params[:select].nil? ? '' : params[:select]
@is_end = params[:is_end].nil? ? 0 : params[:is_end].to_i #是否归档
@syllabuses_num = Course.where("is_end = 0 and is_delete = 0").count
@syllabuses_num = Course.where("is_end = #{@is_end} and is_delete = 0").count
#@syllabus_count = all_syllabuses.count
# 我创建的课堂
create_syllabuses = Course.where(:tea_id => @user.id).where("is_end = #{@is_end} and is_delete = 0 and name like '%#{@search}%'")

14
app/controllers/managements_controller.rb
View File

@ -9,19 +9,21 @@ class ManagementsController < ApplicationController
# 0 全部；1 活动的； 2 已注册； 3 锁定
def users
status = params[:user_status].nil? ? 0 : params[:user_status].to_i
status = params[:user_status].nil? ? 0 : params[:user_status].to_i
@us_order = params[:us_order].blank? ? "desc" : params[:us_order] # 排序
@order_key = params[:order_key].blank? ? "created_on" : params[:order_key] # 排序关键字
condition = (params[:research_condition].nil? || params[:research_condition] == "name") ? "concat(lastname, firstname)" : params[:research_condition]
if 0 == status
if params[:research_condition] == "phone" && params[:research_contents].blank?
@users = User.order("created_on desc").all
@users = User.order("#{@order_key} #{@us_order}").all
else
@users = User.where("#{condition} like '%#{params[:research_contents]}%'").order("created_on desc").all
@users = User.where("#{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}").all
end
else
if params[:research_condition] == "phone" && params[:research_contents].blank?
@users = User.where(:status => status).order("created_on desc").all
@users = User.where(:status => status).order("#{@order_key} #{@us_order}").all
else
@users = User.where("status = #{status} and #{condition} like '%#{params[:research_contents]}%'").order("created_on desc").all
@users = User.where("status = #{status} and #{condition} like '%#{params[:research_contents]}%'").order("#{@order_key} #{@us_order}").all
end
end
@ -33,8 +35,8 @@ class ManagementsController < ApplicationController
@users = paginateHelper @users, @limit
respond_to do |format|
format.html
format.js
format.html
end
end

11
app/controllers/shixuns_controller.rb
View File

@ -168,6 +168,7 @@ class ShixunsController < ApplicationController
end
@language = params[:language]
@status = params[:status].to_i
@shixun_status = params[:shixun_status] # 2是已发布 3是未发布
@search = params[:search]
@major = params[:major]
@course = params[:course]
@ -204,6 +205,16 @@ class ShixunsController < ApplicationController
shixun_ids = Myshixun.where(:user_id => User.current, :status => 1).map(&:shixun_id)
@shixuns = @shixuns.where(:id => shixun_ids)
end
case @shixun_status
when "1"
@shixuns = @shixuns.where(:status => [0, 1])
when "2"
@shixuns = @shixuns.where(:status => 2)
when "3"
@shixuns = @shixuns.where(:status => 3)
when nil, "0"
@shixuns = @shixuns
end
if @order == "created_at"
@shixuns =@shixuns.reorder(order_str)
else

4
app/controllers/users_controller.rb
View File

@ -2046,7 +2046,7 @@ class UsersController < ApplicationController
if @user == User.current
@shixuns = Shixun.where(:user_id => @user).order("created_at desc")
else
@shixuns = Shixun.where(:status => [2, 3], :id => @user).order("created_at desc")
@shixuns = Shixun.where(:status => [2, 3], :user_id => @user).order("created_at desc")
end
@limit = 5
@is_remote = true
@ -2214,7 +2214,7 @@ class UsersController < ApplicationController
if @user == User.current
@shixuns = Shixun.where(:user_id => @user).order("created_at desc")
else
@shixuns = Shixun.where(:status => [2, 3], :id => @user).order("created_at desc")
@shixuns = Shixun.where(:status => [2, 3], :user_id => @user).order("created_at desc")
end
elsif params[:filter] == "cooperative"
# 合作者及创建者

8
app/views/challenges/_answer_form.html.erb
View File

@ -20,7 +20,9 @@
</li>
<li class="clearfix">
<a href="javascript:void(0);" class="task-btn task-btn-green fr" onclick="$('#challenge_shixun_answer_update').submit();">保存</a>
<a href="javascript:void(0);" class="task-btn fr mr10" id="answer_cancel">取消</a>
<% if @challenge.answer %>
<a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 3) %>" class="task-btn fr mr10" id="answer_cancel">取消</a>
<% end %>
</li>
</div>
<script>
@ -70,8 +72,8 @@
$("[type=\"latex\"]").attr("title", "多行公式");
};
$("#answer_cancel").click(function(){
/* $("#answer_cancel").click(function(){
$("#answer_edit").hide();
$("#edit_answer_show").show();
})
})*/
</script>

2
app/views/challenges/_edit_scoring.html.erb
View File

@ -18,7 +18,7 @@
<li class="clearfix">
<label class="panel-form-label fl"><span class="c_red mr5">*</span>奖励经验值：</label>
<div class="fl task-bg-grey panel-box-sizing panel-form-width-690">
<%= @challenge.score %>分
<%= @challenge.score.nil? ? 0 : @challenge.score %>分
</div>
</li>
</ul>

4
app/views/challenges/_evaluating_form.html.erb
View File

@ -86,7 +86,9 @@
</li>
<li class="clearfix">
<a href="javascript:void(0);" class="task-btn task-btn-green fr" onclick="submit_shixun_evaluating();">保存</a>
<a href="javascript:void(0);" class="task-btn fr mr10" id="evaluating_cancel">取消</a>
<% if @challenge.evaluation_way != 0 %>
<a href="javascript:void(0);" class="task-btn fr mr10" id="evaluating_cancel">取消</a>
<% end %>
</li>
</div>

4
app/views/challenges/_score_form.html.erb
View File

@ -36,7 +36,9 @@
<li class="clearfix">
<a href="javascript:void(0);" class="task-btn task-btn-green fr" onclick="challenge_score_update();">保存</a>
<a href="javascript:void(0);" class="task-btn fr mr10" id="score_cancel">取消</a>
<% if !@challenge.score.nil? %>
<a href="javascript:void(0);" class="task-btn fr mr10" id="score_cancel">取消</a>
<% end %>
</li>
</div>

8
app/views/challenges/_skill_form.html.erb
View File

@ -11,7 +11,7 @@
<% end %>
<% end %>
<div class="task-tag tag-grey mt5 mr10 fl" id="add_shixun_skill">
<div class="task-tag tag-grey mt5 mr10 fl <%= @challenge_tags.count > 0 ? "undis" : "" %>" id="add_shixun_skill">
<button data-dismiss="alert" class="close fr mt3 ml5" type="button" onclick="$('#add_shixun_skill').slideToggle();">×</button>
<input type="text" class="task-tag-input" onblur="add_tag();" id="shixun_skill_input" placeholder="请输入知识/技能点" />
</div>
@ -44,16 +44,18 @@
$(".task-tag-input").attr("value","");
}
$("#shixun_skill_input").val("");
$("#add_shixun_skill").hide();
}
function close_tag(thisObj){
// 获取父节点的id
var obj = thisObj.parentNode.id;
$("#"+obj).remove();
var obj = $(thisObj).parent();
$(obj).remove();
}
function challenge_skill_update(){
var nSkill = $(".knowledge_frame");
add_tag();
if (nSkill.length > 0){
$("#challenge_skill_update").submit();
}else{

6
app/views/challenges/_task_pass_form.html.erb
View File

@ -28,7 +28,11 @@
</li>
<li class="clearfix">
<a href="javascript:void(0);" class="task-btn task-btn-green fr" onclick="challenge_update()">保存</a>
<a href="javascript:void(0);" class="task-btn fr mr10" id="task_pass_cancel">取消</a>
<% if params[:action] == "new" %>
<a href="<%= shixun_challenges_url(@shixun) %>" class="task-btn fr mr10" id="task_pass_cancel">取消</a>
<% else %>
<a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun) %>" class="task-btn fr mr10" >取消</a>
<% end %>
</li>
</div>

6
app/views/challenges/edit.html.erb
View File

@ -19,6 +19,12 @@
<div class="task-pm-box mt20">
<div class="panel-header clearfix">
<h3 class="fl mt5">阶段编辑（第<%= @challenge.position %>关）</h3>
<% unless @next_challenge.blank? %>
<a href="<%= edit_shixun_challenge_path(@next_challenge, :shixun_id => @shixun) %>" class="shixun-task-btn task-btn-green fr ml10">下一阶段</a>
<% end %>
<% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %>
<a href="<%= new_shixun_challenge_path(@shixun) %>" class="shixun-task-btn task-btn-green fr">新建阶段</a>
<% end %>
</div>
</div>
<ul class="nav_check_item clearfix mt20" style="margin-bottom: 0;">

4
app/views/courses/index.html.erb
View File

@ -6,8 +6,8 @@
<div class="cl"></div>
</div>
<ul class="task-index-head-info clearfix">
<li><span class="color-orange font-bd"><%= @syllabuses_num %></span><br/><span >全部课堂</span></li>
<li><span class="color-orange font-bd"><%= @create_syllabuses_count + @join_syllabuses_count %></span><br/><span>我的课堂</span></li>
<li><span class="color-orange font-bd" id="all_syllabuses"><%= @syllabuses_num %></span><br/><span >全部课堂</span></li>
<li><span class="color-orange font-bd" id="my_syllabuses"><%= @create_syllabuses_count + @join_syllabuses_count %></span><br/><span>我的课堂</span></li>
<!-- <li><span class="color-orange font-bd"><%#= @create_syllabuses_count %></span><br/><span>你已创建</span></li>-->
</ul>
</div>

4
app/views/courses/index.js.erb
View File

@ -9,5 +9,9 @@ $("#courses_index_syllabuses_3").attr('href', '<%= courses_path(:select => "join
$("#courses_index_syllabuses_4").show();
$("#courses_index_syllabuses_5").hide();
<% end %>
<% if @select == "end" %>
$("#all_syllabuses").html("<%= @syllabuses_num %>");
$("#my_syllabuses").html("<%= @join_syllabuses_count + @create_syllabuses_count %>");
<% end %>
$("#input_select_val").val('<%= @select %>');
$("#input_select_text").val('<%= @is_end %>');

45
app/views/managements/_user_list.html.erb
View File

@ -6,8 +6,8 @@
<th>邮件地址</th>
<th>手机号码</th>
<th>单位</th>
<th><a href="javascript:void(0);">创建于<i class="fa fa-long-arrow-down ml5 color-blue"></i></a></th>
<th>最后登录</th>
<th><a href="javascript:void(0);" id="user_create_order">创建于<i class="fa <%= @order_key == "created_on" ? (@us_order == "desc" ? "fa-long-arrow-down" : "fa-long-arrow-up") : "" %> ml5 color-blue"></i></a></th>
<th><a href="javascript:void(0);" id="user_last_order">最后登录<i class="fa <%= @order_key == "last_login_on" ? (@us_order == "desc" ? "fa-long-arrow-down" : "fa-long-arrow-up") : "" %> ml5 color-blue"></i></a></th>
<th>操作</th>
</tr>
</thead>
@ -44,4 +44,43 @@
<div class="cl"></div>
</div>
</div>
<% end %>
<% end %>
<script>
// 按照创建时间排序
// order -> 表示排序方式; user_status research_condition research_contents -> 当时搜索的状态
$("#user_create_order").on("click", function(){
var icon = $("#user_create_order").find("i");
if(icon.hasClass("fa-long-arrow-down") || icon.hasClass("fa-long-arrow-up")){
var order = $("#user_create_order").find(".fa-long-arrow-down").length > 0 ? "asc" : "desc";
}else{
var order = "desc"
}
var user_status = $("input[name='user_status']").val();
var research_condition = $("input[name='research_condition']").val();
var research_contents = $("input[name='research_contents']").val();
$.ajax({
url: "<%= users_managements_path %>",
type: "post",
dataType: "script",
data: {us_order : order, order_key: "created_on", user_status:user_status, research_condition:research_condition, research_contents:research_contents}
});
});
// 按最后登录时间排序
$("#user_last_order").on("click", function(){
var icon = $("#user_last_order").find("i");
if(icon.hasClass("fa-long-arrow-down") || icon.hasClass("fa-long-arrow-up")){
var order = $("#user_last_order").find(".fa-long-arrow-down").length > 0 ? "asc" : "desc";
}else{
var order = "desc"
}
var user_status = $("input[name='user_status']").val();
var research_condition = $("input[name='research_condition']").val();
var research_contents = $("input[name='research_contents']").val();
$.ajax({
url: "<%= users_managements_path %>",
type: "post",
dataType: "script",
data: {us_order : order, order_key: "last_login_on", user_status:user_status, research_condition:research_condition, research_contents:research_contents}
});
})
</script>

4
app/views/shixuns/_shixun_list.html.erb
View File

@ -1,9 +1,9 @@
<ul class="nav_check_item clearfix">
<li class="fl <%= @order == 'created_at' ? 'check_nav' : "" %>">
<%= link_to "最新", search_shixuns_path(:order => "created_at", :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %>
<%= link_to "最新", search_shixuns_path(:order => "created_at", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %>
</li>
<li class="fl <%= @order == 'myshixun_count' ? 'check_nav' : "" %>">
<%= link_to "最热", search_shixuns_path(:order => "myshixun_count", :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %>
<%= link_to "最热", search_shixuns_path(:order => "myshixun_count", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %>
</li>
</ul>
<div class="task-index-list clearfix mb20">

49
app/views/shixuns/index.html.erb
View File

@ -69,6 +69,27 @@
<div class="course-nav-row clearfix">
<span class="fl color-grey check_item">筛选条件</span>
<div class="fl" style="margin-top:7px">
<li class="edu-dropdown fl ml15 mr5" id="first_select" style="width: 70px">
<a href="javascript:void(0);" class="edu-dropdown-toggle" id="all_status">所有状态<i class="fa fa-caret-down ml5"></i></a>
<ul class="edu-dropdown-menu" id="all_status_list" style="display: none;">
<li>
<input type="radio" class="undis" name="shixun_status" id="status_0" value="0">
<label for="status_0">所有状态</label>
</li>
<li>
<input type="radio" class="undis" name="shixun_status" id="status_1" value="1">
<label for="status_1">未发布</label>
</li>
<li>
<input type="radio" class="undis" name="shixun_status" id="status_2" value="2">
<label for="status_2">已发布</label>
</li>
<li>
<input type="radio" class="undis" name="shixun_status" id="status_3" value="3">
<label for="status_3">已关闭</label>
</li>
</ul>
</li>
<li class="edu-dropdown fl ml15 mr5" id="thirdly_select" style="width: 70px">
<a href="javascript:void(0);" class="edu-dropdown-toggle color-grey3" id="all_languge">所有难度<i class="fa fa-caret-down ml5"></i></a>
<ul class="edu-dropdown-menu" id="all_trainee_list" style="display: none;">
@ -98,24 +119,24 @@
<a href="javascript:void(0);" class="edu-dropdown-toggle color-grey3" id="all_progress">所有进展<i class="fa fa-caret-down ml5"></i></a>
<ul class="edu-dropdown-menu" id="all_progress_list" style="display: none;">
<li>
<input type="radio" class="undis" name="status" id="status_1" value="1">
<label for="status_1">所有进展</label>
<input type="radio" class="undis" name="status" id="progress_1" value="1">
<label for="progress_1">所有进展</label>
</li>
<li>
<input type="radio" class="undis" name="status" id="status_2" value="2">
<label for="status_2">我已创建</label>
<input type="radio" class="undis" name="status" id="progress_2" value="2">
<label for="progress_2">我已创建</label>
</li>
<li>
<input type="radio" class="undis" name="status" id="status_3" value="3">
<label for="status_3">我未挑战</label>
<input type="radio" class="undis" name="status" id="progress_3" value="3">
<label for="progress_3">我未挑战</label>
</li>
<li>
<input type="radio" class="undis" name="status" id="status_4" value="4">
<label for="status_4">我未通关</label>
<input type="radio" class="undis" name="status" id="progress_4" value="4">
<label for="progress_4">我未通关</label>
</li>
<li>
<input type="radio" class="undis" name="status" id="status_5" value="5">
<label for="status_5">我已通关</label>
<input type="radio" class="undis" name="status" id="progress_5" value="5">
<label for="progress_5">我已通关</label>
</li>
</ul>
</li>
@ -186,6 +207,12 @@
$("#all_progress_list").hide();
});
$("#first_select").hover(function(){
$("#all_status_list").show();
},function(){
$("#all_status_list").hide();
});
function change_language(ev){
$(ev).parent().hide();
$("#all_languge").html($(ev).children().html() + '<i class="fa fa-caret-down ml5" ></i>');
@ -201,7 +228,7 @@
$(this).find("ul").show();
},function(){
$(this).find("ul").hide();
})
});
//最新和最热的切换
// $(".nav_check_item li").click(function(){
// $(".nav_check_item li").removeClass("check_nav");

6
app/views/users/show.html.erb
View File

@ -230,9 +230,9 @@
</li>
</ul>
<div style="height: 40px; margin-top: 10px;margin-left: 12px;">
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "create") %>" class="course_filtrate fl course_filtrate_bg" data-remote="true">我创建的</a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "cooperative") %>" class="course_filtrate fl" data-remote="true">我合作的</a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "challenge") %>" class="course_filtrate fl" data-remote="true">我挑战的</a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "create") %>" class="course_filtrate fl course_filtrate_bg" data-remote="true"><%= str %>创建的</a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "cooperative") %>" class="course_filtrate fl" data-remote="true"><%= str %>合作的</a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "challenge") %>" class="course_filtrate fl" data-remote="true"><%= str %>挑战的</a>
</div>
<div class="lesson clearfix" id="my_shixuns_list">
<%= render :partial => "my_homepage_shixuns_list" %>