diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
index 953a3575f..89e298286 100644
--- a/app/controllers/challenges_controller.rb
+++ b/app/controllers/challenges_controller.rb
@@ -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
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 84f445f53..e19008076 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -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}%'")
diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb
index d434651cf..400fad766 100644
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@@ -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
diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 4b52d2384..1c9ae8fb9 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -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
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1458d532e..9d32d761f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -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"
# 合作者及创建者
diff --git a/app/views/challenges/_answer_form.html.erb b/app/views/challenges/_answer_form.html.erb
index 9e7ed5cde..11007ca74 100644
--- a/app/views/challenges/_answer_form.html.erb
+++ b/app/views/challenges/_answer_form.html.erb
@@ -20,7 +20,9 @@
保存
- 取消
+ <% if @challenge.answer %>
+ 取消
+ <% end %>
\ No newline at end of file
diff --git a/app/views/challenges/_edit_scoring.html.erb b/app/views/challenges/_edit_scoring.html.erb
index 4c19ce5bd..307f8d74c 100644
--- a/app/views/challenges/_edit_scoring.html.erb
+++ b/app/views/challenges/_edit_scoring.html.erb
@@ -18,7 +18,7 @@
* 奖励经验值:
- <%= @challenge.score %>分
+ <%= @challenge.score.nil? ? 0 : @challenge.score %>分
diff --git a/app/views/challenges/_evaluating_form.html.erb b/app/views/challenges/_evaluating_form.html.erb
index 673a07e61..fdcad1338 100644
--- a/app/views/challenges/_evaluating_form.html.erb
+++ b/app/views/challenges/_evaluating_form.html.erb
@@ -86,7 +86,9 @@
保存
- 取消
+ <% if @challenge.evaluation_way != 0 %>
+ 取消
+ <% end %>
diff --git a/app/views/challenges/_score_form.html.erb b/app/views/challenges/_score_form.html.erb
index ee973870d..8dbcd49d3 100644
--- a/app/views/challenges/_score_form.html.erb
+++ b/app/views/challenges/_score_form.html.erb
@@ -36,7 +36,9 @@
保存
- 取消
+ <% if !@challenge.score.nil? %>
+ 取消
+ <% end %>
diff --git a/app/views/challenges/_skill_form.html.erb b/app/views/challenges/_skill_form.html.erb
index ddedeafea..012ae2ea9 100644
--- a/app/views/challenges/_skill_form.html.erb
+++ b/app/views/challenges/_skill_form.html.erb
@@ -11,7 +11,7 @@
<% end %>
<% end %>
-
+
" id="add_shixun_skill">
×
@@ -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{
diff --git a/app/views/challenges/_task_pass_form.html.erb b/app/views/challenges/_task_pass_form.html.erb
index e1849fc65..b5ca126ed 100644
--- a/app/views/challenges/_task_pass_form.html.erb
+++ b/app/views/challenges/_task_pass_form.html.erb
@@ -28,7 +28,11 @@
保存
- 取消
+ <% if params[:action] == "new" %>
+ 取消
+ <% else %>
+ 取消
+ <% end %>
diff --git a/app/views/challenges/edit.html.erb b/app/views/challenges/edit.html.erb
index 0a4ff1b29..741f09a1f 100644
--- a/app/views/challenges/edit.html.erb
+++ b/app/views/challenges/edit.html.erb
@@ -19,6 +19,12 @@
diff --git a/app/views/courses/index.html.erb b/app/views/courses/index.html.erb
index 466b8d9d4..ec838b511 100644
--- a/app/views/courses/index.html.erb
+++ b/app/views/courses/index.html.erb
@@ -6,8 +6,8 @@
- <%= @syllabuses_num %> 全部课堂
- <%= @create_syllabuses_count + @join_syllabuses_count %> 我的课堂
+ <%= @syllabuses_num %> 全部课堂
+ <%= @create_syllabuses_count + @join_syllabuses_count %> 我的课堂
diff --git a/app/views/courses/index.js.erb b/app/views/courses/index.js.erb
index ed6add425..6f5412247 100644
--- a/app/views/courses/index.js.erb
+++ b/app/views/courses/index.js.erb
@@ -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 %>');
\ No newline at end of file
diff --git a/app/views/managements/_user_list.html.erb b/app/views/managements/_user_list.html.erb
index 441dc6170..398c5f486 100644
--- a/app/views/managements/_user_list.html.erb
+++ b/app/views/managements/_user_list.html.erb
@@ -6,8 +6,8 @@
邮件地址
手机号码
单位
- 创建于
- 最后登录
+ 创建于 ml5 color-blue">
+ 最后登录 ml5 color-blue">
操作
@@ -44,4 +44,43 @@
-<% end %>
\ No newline at end of file
+<% end %>
+
\ No newline at end of file
diff --git a/app/views/shixuns/_shixun_list.html.erb b/app/views/shixuns/_shixun_list.html.erb
index db2105df6..2b0dcec9e 100644
--- a/app/views/shixuns/_shixun_list.html.erb
+++ b/app/views/shixuns/_shixun_list.html.erb
@@ -1,9 +1,9 @@
">
- <%= 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 %>
">
- <%= 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 %>
diff --git a/app/views/shixuns/index.html.erb b/app/views/shixuns/index.html.erb
index 5346911f2..8da81b6d6 100644
--- a/app/views/shixuns/index.html.erb
+++ b/app/views/shixuns/index.html.erb
@@ -69,6 +69,27 @@
筛选条件
+
+ 所有状态
+
+
所有难度
@@ -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() + '
');
@@ -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");
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 9a883636f..ba3b2c5bb 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -230,9 +230,9 @@
<%= render :partial => "my_homepage_shixuns_list" %>