diff --git a/app/controllers/syllabuses_controller.rb b/app/controllers/syllabuses_controller.rb index cad65f88d..13bacbd4b 100644 --- a/app/controllers/syllabuses_controller.rb +++ b/app/controllers/syllabuses_controller.rb @@ -92,7 +92,7 @@ class SyllabusesController < ApplicationController def destroy if @syllabus && @syllabus.courses.not_deleted.empty? @syllabus.destroy - redirect_to user_courselist_user_path(User.current.id) + redirect_to user_courselist_user_path(User.current) end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1a8c7f7f0..04a3df24a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3476,7 +3476,7 @@ class UsersController < ApplicationController #归档班级列表 def user_archive_courses if User.current.logged? - @order, @c_sort, @type, @list_type = params[:order] || 1, params[:sort] || 1, params[:type] || 1, params[:list_type] || 1 + @order, @c_sort, @type = params[:order] || 1, params[:sort] || 1, params[:type] || 1 #确定 sort_type if @order.to_i == @type.to_i @@ -3485,6 +3485,7 @@ class UsersController < ApplicationController @c_sort = 2 end + @user = User.current sort_name = "updated_at" archive_ids = Course.where("tea_id = #{@user.id} and is_delete = 1").blank? ? "(-1)" : "(" + Course.where("tea_id = #{@user.id} and is_delete = 1").map{|course| course.syllabus_id}.join(",") + ")" @archive_syllabuses = Syllabus.where("id in #{archive_ids}") @@ -3503,13 +3504,14 @@ class UsersController < ApplicationController end syllabus[:infocount] = count end - @c_sort == 1 ? (@archive_syllabuses = @syllabuses.sort{|x,y| x[:infocount] <=> y[:infocount] }) : (@archive_syllabuses = @archive_syllabuses.sort{|x,y| y[:infocount] <=> x[:infocount]}) + @c_sort == 1 ? (@archive_syllabuses = @archive_syllabuses.sort{|x,y| x[:infocount] <=> y[:infocount] }) : (@archive_syllabuses = @archive_syllabuses.sort{|x,y| y[:infocount] <=> x[:infocount]}) @archive_syllabuses = sortby_time_countcommon_nosticky @archive_syllabuses,sort_name else @type = 1 end respond_to do |format| - format.html + format.js + format.html {render :layout => 'new_base_user'} end end end @@ -3518,7 +3520,11 @@ class UsersController < ApplicationController def expand_courses @syllabus = Syllabus.where("id = #{params[:syllabus_id]}").first unless @syllabus.nil? - @courses = @syllabus.courses.not_deleted.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") + if params[:is_delete] && params[:is_delete] == '1' + @courses = @syllabus.courses.where("is_delete = 1").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") + else + @courses = @syllabus.courses.not_deleted.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") + end respond_to do |format| format.js end diff --git a/app/views/courses/archive_course.js.erb b/app/views/courses/archive_course.js.erb index c7cd0f729..a5ef39035 100644 --- a/app/views/courses/archive_course.js.erb +++ b/app/views/courses/archive_course.js.erb @@ -13,7 +13,11 @@ function click_OK(){ hideModal(); <% if params[:source] == "1" %> window.location.href = "<%=syllabus_courselist_syllabus_path(@syllabus, :list_type => params[:type].to_i) %>"; - <% else params[:source] == "0" %> - window.location.href = "<%=user_courselist_path(User.current) %>"; + <% elsif params[:source] == "0" %> + <% if params[:type] == "0" %> + window.location.href = "<%=user_courselist_user_path(User.current) %>"; + <% else %> + window.location.href = "<%=user_archive_courses_users_path() %>"; + <% end %> <% end %> } \ No newline at end of file diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 2f3ef2928..316d10c4c 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -140,25 +140,25 @@
- + 动态
<% if @center_flag %>
- + 我的课程 (<%=@user.courses.count%>)
- + 我的项目 (<%=@user.projects.count%>)
- + 我的资源库 (<%=Attachment.where("(author_id = #{@user.id} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) or (container_type = 'Course' and container_id in (#{@user.courses.map{|c| c.id}.empty? ? '0' : @user.courses.map{|c| c.id}.join(',')}))").count%>) @@ -166,13 +166,13 @@ <% else%>
- + TA的课程 (<%=@user.courses.visible.count%>)
- + TA的项目 (<%=@user.projects.visible.count%>) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 07be357dc..fd86d9dff 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -162,8 +162,8 @@ <% if hidden_unproject_infos %>
  • - <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user.id}, :id => "user_course_list" %> - <%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user.id}, :style => "color:#aaa;" %> + <%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user}, :id => "user_course_list" %> + <%= link_to '全部',{:controller => "users", :action => "user_courselist", :id => @user}, :style => "color:#aaa;" %> <% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
    <%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %> @@ -181,7 +181,7 @@
    • <% if @user == User.current %>
  • - <%=link_to '我的作业', my_homeworks_user_path(@user.id), :target => "_blank", :style => "font-size:14px;" %> + <%=link_to '我的作业', my_homeworks_user_path(@user), :target => "_blank", :style => "font-size:14px;" %>
    • <% end %> <% end %> @@ -190,8 +190,8 @@
    • - <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :id => 'user_project_list'%> - <%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :style => "color:#aaa;" %> + <%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list'%> + <%= link_to '全部',{:controller => "users", :action => "user_projectlist", :id => @user}, :style => "color:#aaa;" %> <% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%>
      <%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %> diff --git a/app/views/users/_courses_list.html.erb b/app/views/users/_courses_list.html.erb index 439a24d10..bee64a059 100644 --- a/app/views/users/_courses_list.html.erb +++ b/app/views/users/_courses_list.html.erb @@ -1,14 +1,16 @@ <% unless courses.nil? %> <% courses.each_with_index do |course, i| %>
    • - <% allow_visit = User.current.member_of_course?(course) || User.current.admin? || course.is_public == 1 %> + <% allow_visit = course.is_delete == 0 && (User.current.member_of_course?(course) || User.current.admin? || course.is_public == 1) %> + <% if course.is_delete == 0 %> <%=render :partial => 'collect_course', :locals => {:course => course} %> + <% end %>
      - " class="syllabus_class_title fl" target="_blank" title="<%= allow_visit ? "" : "私有班级不可访问" %>"><%= course.name %> + " class="syllabus_class_title fl" target="_blank" title="<%= allow_visit ? "" : "班级不可访问" %>"><%= course.name %> <%= course.is_public == 0 ? '私有' : '公开' %>
      @@ -20,15 +22,22 @@
      - <% if User.current == course.teacher || User.current.admin? %> + <% if User.current == @user && (User.current == course.teacher || User.current.admin?) %>
      - 归档 + <%= course.is_delete == 0 ? '归档' : '恢复' %>
      -

      此班级的信息将不再显示
      - 您和您的学生将不能在此班级中继续互动
      - 但您可以点击上方的“归档管理” +

      + <% if course.is_delete == 0 %> + 此班级的信息将不再显示
      + 您和您的学生将不能在此班级中继续互动
      + 但您可以点击上方的“归档管理” + <% else %> + 此班级的信息将恢复显示
      + 您和您的学生将可以重新在此班级中互动 + <% end %>

      diff --git a/app/views/users/_syllabus_course_list.html.erb b/app/views/users/_syllabus_course_list.html.erb index 6c8e2140e..eba104f14 100644 --- a/app/views/users/_syllabus_course_list.html.erb +++ b/app/views/users/_syllabus_course_list.html.erb @@ -40,6 +40,9 @@
        • +
        • + <%= link_to "新建班级", new_course_path(:syllabus_id => syllabus.id), :class => "postOptionLink", :target => '_blank', :title => "新建班级"%> +
        • <%=link_to '查看课程', syllabus_path(syllabus.id), :class => 'postOptionLink',:target =>'_blank', :title => '查看课程' %>
          • diff --git a/app/views/users/_user_archive_course_list.html.erb b/app/views/users/_user_archive_course_list.html.erb new file mode 100644 index 000000000..122e70264 --- /dev/null +++ b/app/views/users/_user_archive_course_list.html.erb @@ -0,0 +1,60 @@ +
          + <% if @type.to_i == 2 %> + <%= link_to "", {:controller => 'users', :action => 'user_archive_courses', :type => @type, :sort => @c_sort, :order => 2 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} fr", :style => "margin-right: 5px;", :remote => true %> + <% end %> + <%= link_to "人气", {:controller => 'users', :action => 'user_archive_courses', :type => @type, :sort => @c_sort, :order => 2 }, :class => "sortTxt fr", :remote => true %> + <% if @type.to_i == 1 %> + <%= link_to "", {:controller => 'users', :action => 'user_archive_courses', :type => @type, :sort => @c_sort, :order => 1 }, :class => "#{@c_sort.to_i == 1 ? 'sortupbtn' : 'sortdownbtn'} fr", :remote => true %> + <% end %> + <%= link_to "时间", {:controller => 'users', :action => 'user_archive_courses', :type => @type, :sort => @c_sort, :order => 1 }, :class => "sortTxt mr5 fr", :remote => true %> + 归档的班级 +
          +
          + +<% if syllabuses.any? %> + <% syllabuses.each_with_index do |syllabus, index|%> +
          + <% course_count = syllabus.courses.where("is_delete = 1").count %> +
          +
          + + <%=link_to syllabus.title, syllabus_path(syllabus.id), :class => 'syllabus_courses_title fl', :target => '_blank' %> +
          +

          更新时间：<%=format_date syllabus.updated_at %> + 创建老师：<%=syllabus.user.show_name %> + 班级：<%=course_count %> +

          +
          +
          + +
          +
            + <% if index == 0 %> + <% courses = syllabus.courses.where("is_delete = 1").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("updatetime desc") %> + <%= render :partial => 'users/courses_list', :locals => {:courses => courses, :syllabus => syllabus}%> + <% end %> +
          +
          + +
          +
            +
          • +
              +
            • + <%= link_to "新建班级", new_course_path(:syllabus_id => syllabus.id), :class => "postOptionLink", :target => '_blank', :title => "新建班级"%> +
              • +
            • + <%=link_to '查看课程', syllabus_path(syllabus.id), :class => 'postOptionLink',:target =>'_blank', :title => '查看课程' %> +
              • + <% if User.current == syllabus.user %> +
            • <%=link_to '删除课程', delete_syllabus_syllabus_path(syllabus), :class => 'postOptionLink', :remote => 'true'%>
              • + <% end %> +
            +
            • +
          +
          +
          + <% end %> +<% else %> +

          <%= l(:label_no_data) %>

          +<% end %> \ No newline at end of file diff --git a/app/views/users/user_archive_courses.html.erb b/app/views/users/user_archive_courses.html.erb index e69de29bb..61b1e47a8 100644 --- a/app/views/users/user_archive_courses.html.erb +++ b/app/views/users/user_archive_courses.html.erb @@ -0,0 +1,40 @@ +
          +
          +

          课程列表

          + <%= link_to "返回", user_courselist_user_path(@user), :class => "linkBlue2 mt15 fr mr15 f14"%> +
          +
          + +
          + <%= render :partial => 'users/user_archive_course_list', :locals => {:syllabuses => @archive_syllabuses}%> +
          +
          + + + \ No newline at end of file diff --git a/app/views/users/user_archive_courses.js.erb b/app/views/users/user_archive_courses.js.erb new file mode 100644 index 000000000..833786fbf --- /dev/null +++ b/app/views/users/user_archive_courses.js.erb @@ -0,0 +1 @@ +$("#user_archive_course_list").html('<%= escape_javascript(render :partial => 'users/user_archive_course_list', :locals => {:syllabuses => @archive_syllabuses}) %>'); diff --git a/app/views/users/user_courselist.html.erb b/app/views/users/user_courselist.html.erb index b247ed230..7a7b68fa6 100644 --- a/app/views/users/user_courselist.html.erb +++ b/app/views/users/user_courselist.html.erb @@ -2,7 +2,7 @@

          课程列表

          <% if @user == User.current && !@archive_syllabuses.blank? %> - <%= link_to "归档管理", user_archive_courses_users_path(), :class => "linkBlue2 mt15 fr mr20 f14"%> + <%= link_to "归档管理", user_archive_courses_users_path(), :class => "linkBlue2 mt15 fr mr15 f14"%> <% end %>