Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

app/controllers/colleges_controller.rb

@@ -44,31 +44,31 @@ class CollegesController < ApplicationController
   def statistics
     logger.info("#########################{params}")
     @teachers_count = User.find_by_sql("SELECT COUNT(users.`id`) AS teacher_count FROM users LEFT JOIN user_extensions ON users.id=user_extensions.user_id WHERE
-                                        user_extensions.`school_id` = #{@department.school_id} AND user_extensions.`identity` = 0").first.try(:teacher_count)
+                                        user_extensions.`school_id` = #{@school.id} AND user_extensions.`identity` = 0").first.try(:teacher_count)
     @students_count = User.find_by_sql("SELECT COUNT(users.`id`) AS student_count FROM users LEFT JOIN user_extensions ON users.id=user_extensions.user_id WHERE
-                                        user_extensions.`school_id` = #{@department.school_id} AND user_extensions.`identity` = 1").first.try(:student_count)
+                                        user_extensions.`school_id` = #{@school.id} AND user_extensions.`identity` = 1").first.try(:student_count)
     # Redo：这样做内存会卡死的
-    # user_ids = User.find_by_sql("SELECT users.id FROM users LEFT JOIN user_extensions ON users.id=user_extensions.user_id WHERE user_extensions.`school_id` = #{@department.school_id}").map(&:id)
+    # user_ids = User.find_by_sql("SELECT users.id FROM users LEFT JOIN user_extensions ON users.id=user_extensions.user_id WHERE user_extensions.`school_id` = #{@school.id}").map(&:id)
     # Redo：是否直接使用count会更好
-    all_course_ids = Course.joins("join users u on courses.tea_id = u.id").joins("join user_extensions ue on u.id = ue.user_id").where("courses.id != 1309 and ue.school_id = #{@department.school_id}")
+    all_course_ids = Course.joins("join users u on courses.tea_id = u.id").joins("join user_extensions ue on u.id = ue.user_id").where("courses.id != 1309 and ue.school_id = #{@school.id}")
     @courses_count = all_course_ids.size
 
     # Redo：对于量比较大的尽量不使用笛卡尔积
     # @shixuns_count = Shixun.where(:status => [2, 3], :user_id => user_ids).size
     @shixuns_count = Shixun.find_by_sql("select count(s.id) as shixun_count from users u right join shixuns s on u.id=s.user_id and s.status in (2, 3) inner join user_extensions ue on
-                                         u.id=ue.user_id and ue.school_id=#{@department.school_id}").first.try(:shixun_count)
+                                         u.id=ue.user_id and ue.school_id=#{@school.id}").first.try(:shixun_count)
     # @shixun_time_sum = (Game.where(:user_id => user_ids).pluck(:cost_time).sum / (24*60*60.0)).ceil
     @shixun_time_sum = (Game.find_by_sql("select sum(g.cost_time) cost_time from users u RIGHT join games g on u.id=g.user_id inner join user_extensions ue on
-                                          u.id=ue.user_id and ue.school_id=#{@department.school_id}").first.try(:cost_time).to_i / (24 * 60 * 60.0)).ceil
+                                          u.id=ue.user_id and ue.school_id=#{@school.id}").first.try(:cost_time).to_i / (24 * 60 * 60.0)).ceil
 
     # select count(sw.id) from users u left join student_works sw on u.id=sw.user_id and sw.myshixun_id is not null and sw.work_status !=0 inner join user_extensions ue on u.id=ue.user_id and ue.school_id=117 ;
     # @shixun_report_count = StudentWork.where("work_status != 0 and user_id in (#{user_ids.join(',').strip == "" ? -1 : user_ids.join(',')}) and myshixun_id is not null").count
     @shixun_report_count = StudentWork.find_by_sql("SELECT count(*) as sw_count FROM `student_works` where user_id in (SELECT users.id FROM users RIGHT JOIN user_extensions ON users.id=user_extensions.user_id WHERE
-                                                    user_extensions.`school_id`=#{@department.school_id}) and work_status between 1 and 2 and myshixun_id !=0").first.try(:sw_count)
+                                                    user_extensions.`school_id`=#{@school.id}) and work_status between 1 and 2 and myshixun_id !=0").first.try(:sw_count)
 
     @teachers = User.find_by_sql("SELECT users.id, users.login, users.lastname, users.firstname, users.nickname, IFNULL((SELECT count(shixuns.id) FROM shixuns where shixuns.user_id =users.id group by shixuns.user_id), 0) AS publish_shixun_count,
                                 (SELECT count(c.id) FROM courses c, members m, member_roles mr WHERE m.course_id = c.id AND m.id=mr.member_id AND mr.role_id in (3,7,9) AND m.user_id=users.id AND c.is_delete = 0) as course_count
-                                FROM `users`, user_extensions ue where users.id=ue.user_id and ue.identity=0 and ue.school_id=#{@department.school_id} ORDER BY publish_shixun_count desc, course_count desc, id desc LIMIT 10")
+                                FROM `users`, user_extensions ue where users.id=ue.user_id and ue.identity=0 and ue.school_id=#{@school.id} ORDER BY publish_shixun_count desc, course_count desc, id desc LIMIT 10")
     # ).order("publish_shixun_count desc, experience desc").limit(10)
     @teachers =
         @teachers.map do |teacher|
@@ -131,7 +131,7 @@ class CollegesController < ApplicationController
                (select count(m.id) from messages m inner join boards b on  b.id=m.board_id and b.parent_id=0 where b.course_id=c.id group by c.id) as messages_count,
                c.tea_id, c.name, c.is_end,
                (SELECT MAX(created_at) FROM `course_activities` ca WHERE ca.course_id = c.id) AS update_time
-               FROM `courses` c WHERE (c.school_id = #{@department.school_id} and c.is_delete = 0)")
+               FROM `courses` c WHERE (c.school_id = #{@school.id} and c.is_delete = 0)")
 
     @courses.each do |course|
       course[:evaluating_count] = Output.find_by_sql("select sum(g.evaluate_count) as evaluating_count from games g inner join
@@ -157,11 +157,11 @@ class CollegesController < ApplicationController
 
   # 学生实训
   def student_shixun
-    user_ids = User.find_by_sql("SELECT users.id FROM users, user_extensions WHERE users.id=user_extensions.user_id AND user_extensions.`school_id` = #{@department.school_id}").map(&:id)
+    user_ids = User.find_by_sql("SELECT users.id FROM users, user_extensions WHERE users.id=user_extensions.user_id AND user_extensions.`school_id` = #{@school.id}").map(&:id)
     @students = User.find_by_sql("SELECT users.id, users.login, users.lastname, users.firstname, users.nickname, users.grade,
                 users.experience, ue.student_id, (SELECT COUNT(myshixuns.id) FROM `myshixuns` WHERE myshixuns.user_id
                 = users.id AND myshixuns.status = 1 GROUP BY users.id) AS myshixun_count FROM users join user_extensions ue on
-                users.id = ue.user_id where ue.school_id = #{@department.school_id} AND ue.identity = 1 AND `users`.`type` IN ('User', 'AnonymousUser') ORDER BY experience DESC, myshixun_count DESC LIMIT 10")
+                users.id = ue.user_id where ue.school_id = #{@school.id} AND ue.identity = 1 AND `users`.`type` IN ('User', 'AnonymousUser') ORDER BY experience DESC, myshixun_count DESC LIMIT 10")
 
     ## outputs基数过大，用inner join有奇效
     @shixun_tags = TagRepertoire.find_by_sql(%Q{
@@ -172,7 +172,7 @@ class CollegesController < ApplicationController
           AND str.shixun_id = myshixuns.`shixun_id`
           AND myshixuns.id = games.`myshixun_id`
           AND myshixuns.`user_id` IN (
-            SELECT users.id FROM users, user_extensions WHERE users.id=user_extensions.user_id AND user_extensions.`school_id` = #{@department.school_id}
+            SELECT users.id FROM users, user_extensions WHERE users.id=user_extensions.user_id AND user_extensions.`school_id` = #{@school.id}
           )
         ) a on a.id = outputs.game_id and outputs.`test_set_position` = 1 group by trid
         ORDER BY test_count DESC
@@ -197,50 +197,50 @@ class CollegesController < ApplicationController
     @eval_data = []
     case @index
     when "day"
-      same_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+      same_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                     ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 AND outputs.created_at > '#{(end_day - 365.days).beginning_of_day}' AND outputs.created_at < '#{(end_day - 365.days).end_of_day}'").first.try(:count).to_i
-      last_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+      last_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                     ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 AND outputs.created_at > '#{(end_day - 1.day).beginning_of_day}' AND outputs.created_at < '#{(end_day - 1.day).end_of_day}'").first.try(:count).to_i
       @time_range = "#{end_day.strftime("%Y-%m-%d")}~#{end_day.strftime("%Y-%m-%d")}"
       @time_data = ["2:00", "4:00", "6:00", "8:00", "10:00", "12:00", "14:00", "16:00", "18:00", "20:00", "22:00", "24:00"]
       for i in 0..11
-        @eval_data << Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+        @eval_data << Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                     ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 AND outputs.created_at > '#{end_day.beginning_of_day + (i * 2).hour}' AND outputs.created_at < '#{end_day.beginning_of_day + ((i + 1) * 2).hour}'").first.try(:count).to_i
       end
     when "week"
       start_day = end_day - 6.days
-      same_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+      same_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                     ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 AND outputs.created_at > '#{(start_day - 365.days).beginning_of_day}' AND outputs.created_at < '#{(end_day - 365.days).end_of_day}'").first.try(:count).to_i
-      last_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+      last_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                     ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 AND outputs.created_at > '#{(start_day - 7.days).beginning_of_day}' AND outputs.created_at < '#{(end_day - 7.days).end_of_day}'").first.try(:count).to_i
       @time_range = "#{start_day.strftime("%Y-%m-%d")}~#{end_day.strftime("%Y-%m-%d")}"
 
       for i in 0..6
         @time_data << (start_day + i.days).strftime("%m.%d")
-        @eval_data << Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+        @eval_data << Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                 ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 AND outputs.created_at > '#{(start_day + i.days).beginning_of_day}' AND outputs.created_at < '#{(start_day + (i + 1).days).end_of_day}'").first.try(:count).to_i
       end
     when "mon"
       start_day = end_day - 30.days
-      same_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+      same_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                     ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 AND outputs.created_at > '#{(start_day - 365.days).beginning_of_day}' AND outputs.created_at < '#{(end_day - 365.days).end_of_day}'").first.try(:count).to_i
-      last_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+      last_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                     ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 AND outputs.created_at > '#{(start_day - 30.days).beginning_of_day}' AND outputs.created_at < '#{(end_day - 30.days).end_of_day}'").first.try(:count).to_i
       @time_range = "#{start_day.strftime("%Y-%m-%d")}~#{end_day.strftime("%Y-%m-%d")}"
       for i in 0..9
         @time_data << (start_day + (3 * i).days).strftime("%m.%d")
-        @eval_data << Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+        @eval_data << Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                 ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 AND outputs.created_at > '#{(start_day + (3 * i).days).beginning_of_day}' AND outputs.created_at < '#{(start_day + (3 * (i + 1)).days).end_of_day}'").first.try(:count).to_i
       end
     when "year"
       start_day = end_day - 365.days
-      same_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+      same_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                     ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 AND outputs.created_at > '#{(start_day - 365.days).beginning_of_day}' AND outputs.created_at < '#{(end_day - 365.days).end_of_day}'").first.try(:count).to_i
       last_count = same_count
       @time_range = "#{start_day.strftime("%Y-%m-%d")}~#{end_day.strftime("%Y-%m-%d")}"
       for i in 0..11
         @time_data << (start_day + i.month).strftime("%m.%d")
-        @eval_data << Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+        @eval_data << Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                 ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 AND outputs.created_at > '#{(start_day + i.days).beginning_of_day}' AND outputs.created_at < '#{(start_day + (i + 1).days).end_of_day}'").first.try(:count).to_i
       end
     end
@@ -248,9 +248,9 @@ class CollegesController < ApplicationController
     @same_rate = (@new_count == 0 || same_count == 0) ? 0 : (@new_count * 1.0 / same_count - 1).to_f
     @last_rate = (@new_count == 0 || last_count == 0) ? 0 : (@new_count * 1.0 / last_count - 1).to_f
 
-    @total_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+    @total_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                    ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 ").first.try(:count).to_i
-    @trend_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@department.school_id}) b
+    @trend_count = Output.find_by_sql("select count(outputs.id) as count from outputs RIGHT JOIN (SELECT games.id FROM games RIGHT JOIN user_extensions ue ON games.`user_id` = ue.`user_id` AND ue.`school_id`=#{@school.id}) b
                    ON outputs.`game_id` = b.id WHERE outputs.test_set_position = 1 AND outputs.created_at > '#{Time.now - 7.days}'").first.try(:count).to_i
   end
 
@@ -259,9 +259,9 @@ class CollegesController < ApplicationController
   def manager_auth
     # unless (User.current.admin? || DepartmentMember.where(:user_id => User.current.id, :department_id => @department.id).first.present?)
     unless (User.current.admin? || User.current.business? ||
-        DepartmentMember.where(:user_id => User.current.id, :department_id => @department.id).first.present? ||
-        (User.current.user_extensions.try(:school_id) == @department.school_id && User.current.user_extensions.try(:identity) == 0) ||
-        (@department.school.try(:customer_id) && User.current.try(:partner).try(:customer_ids) &&  User.current.try(:partner).try(:customer_ids).include?(@department.school.try(:customer_id))))
+        (@department.present? && DepartmentMember.where(:user_id => User.current.id, :department_id => @department.id).first.present?) ||
+        (User.current.user_extensions.try(:school_id) == @school.id && User.current.user_extensions.try(:identity) == 0) ||
+        (@school.try(:customer_id) && User.current.try(:partner).try(:customer_ids) &&  User.current.try(:partner).try(:customer_ids).include?(@school.try(:customer_id))))
       render_403
     end
   end
@@ -270,6 +270,8 @@ class CollegesController < ApplicationController
     @department = Department.find_by_identifier(params[:id])
     if @department.present?
       @school = @department.school
+    else
+      @school = School.find_by_id(params[:id])
     end
   rescue ActiveRecord::RecordNotFound
     render_404

app/controllers/users_controller.rb

@@ -940,7 +940,7 @@ class UsersController < ApplicationController
     @limit = 16
     if 1 == @index
       # @shixuns_result = Shixun.where(:status => [2,3]).where("name like ?", "%#{@search}%").reorder("created_at desc")
-      @shixuns_result = Shixun.where("name like ? and hidden=0", "%#{@search}%").reorder("myshixuns_count desc")
+      @shixuns_result = Shixun.where("name like ? and hidden=0 and status != -1", "%#{@search}%").reorder("myshixuns_count desc")
       @shixuns_result_count = @shixuns_result.count
       @shixun_pages = Paginator.new @shixuns_result_count, @limit, params['page'] || 1
       @offset ||= @shixun_pages.offset

app/models/school.rb

@@ -64,7 +64,7 @@ class School < ActiveRecord::Base
 
   def statistic_url
     dep = departments.where("identifier is not null").first
-    url = dep.present? ? "/colleges/#{dep.identifier}/statistics" : ""
+    url = dep.present? ? "/colleges/#{dep.identifier}/statistics" : "/colleges/#{self.id}/statistics"
   end
 
   def course_act_time

app/views/colleges/_student_eval.html.erb

@@ -30,10 +30,10 @@
     <input type="text" class="winput-240-30 edu-txt-center" value="<%= @time_range %>" id="time-condition" readonly/>
   </li>
   <li class="fr count_student_test">
-    <a href="<%= student_eval_college_path(@department, :index => 'day') %>" data-remote="true" class="<%= @index == "day" ? "active" : "" %>">日</a>
-    <a href="<%= student_eval_college_path(@department, :index => 'week') %>" data-remote="true" class="<%= @index == "week" ? "active" : "" %>">周</a>
-    <a href="<%= student_eval_college_path(@department, :index => 'mon') %>" data-remote="true" class="<%= @index == "mon" ? "active" : "" %>">月</a>
-    <a href="<%= student_eval_college_path(@department, :index => 'year') %>" data-remote="true" class="<%= @index == "year" ? "active" : "" %>">年</a>
+    <a href="<%= student_eval_college_path(@school, :index => 'day') %>" data-remote="true" class="<%= @index == "day" ? "active" : "" %>">日</a>
+    <a href="<%= student_eval_college_path(@school, :index => 'week') %>" data-remote="true" class="<%= @index == "week" ? "active" : "" %>">周</a>
+    <a href="<%= student_eval_college_path(@school, :index => 'mon') %>" data-remote="true" class="<%= @index == "mon" ? "active" : "" %>">月</a>
+    <a href="<%= student_eval_college_path(@school, :index => 'year') %>" data-remote="true" class="<%= @index == "year" ? "active" : "" %>">年</a>
   </li>
 </div>
 <div id="studentTestCount" style="width: 1200px;height: 440px;"></div>

app/views/colleges/statistics.html.erb

@@ -44,15 +44,15 @@
       <li><span><%= @shixuns_count %></span>个</li>
       <li><span><%= @shixun_report_count %></span>个</li>
       <li><span data-tip-down="所有学员的实训耗时之和"><span><%= @shixun_time_sum %></span>天</span></li>
-      <li><span><%= @department.host_count.to_i %></span>台</li>
+      <li><span><%= @department.present? ? @department.host_count.to_i : @school.departments.first.try(:host_count).to_i %></span>台</li>
     </div>
   </div>
 
   <div class="white-panel mb20 pl0 clearfix">
     <li class="active" index="1"><a href="javascript:void(0);">课堂</a></li>
-    <li index="2"><a href="<%= student_shixun_college_path(@department) %>" data-remote="true">学生实训</a></li>
+    <li index="2"><a href="<%= student_shixun_college_path(@school) %>" data-remote="true">学生实训</a></li>
     <!--<li><a href="<%#= engineering_capability_college_path(@department) %>" data-remote="true">工程能力</a></li>-->
-    <li index="4"><a href="<%= student_eval_college_path(@department) %>" data-remote="true">学生测评</a></li>
+    <li index="4"><a href="<%= student_eval_college_path(@school) %>" data-remote="true">学生测评</a></li>
   </div>
 
   <div class="panelContent panelContent-1">
@@ -153,7 +153,7 @@
             })
         });
 
-        $.get('<%= course_statistics_college_path(@department) %>');
+        $.get('<%= course_statistics_college_path(@school) %>');
 
         $(".count_student_test a").click(function(){
             $(".count_student_test a").removeClass("active");

app/views/layouts/_logined_header.html.erb

@@ -6,8 +6,25 @@
       <li class="<%= course_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "翻转课堂", courses_path %></li>
       <!-- 精选实训 -->
       <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "开发社区", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li>
+
+      <% careers = Career.published.order("created_at asc") %>
+      <% if careers.present? %>
+        <li class="fl edu-menu-panel headIcon careershover <%= params[:action] == "index" && params[:controller] == "careers" ? " active" : "" %>" style="cursor: auto;">
+          <p>职业路径</p>
+          <ul class="edu-menu-list edu-menu-listnew" style="top:60px">
+            <% careers.each do |career| %>
+              <li><a href="<%= introduction_career_path(career) %>"><%= career.name %></a></li>
+            <% end %>
+          </ul>
+        </li>
+      <% end %>
       <li class="<%= params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "竞赛", competitions_path %></li>
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "问答", forums_path %></li>
+      <% if User.current.ec_school.present? %>
+        <li class="<%= ecs_controller.include?(params[:controller]) ? " active" : "" %>" id="ec_banner">
+          <%= link_to "认证", department_ecs_path(:school_id => User.current.ec_school) %>
+        </li>
+      <% end %>
     </ul>
     <div class="posi-search" id="posi-search" style="display: none">
       <div class="search-all clearfix">
@@ -28,27 +45,25 @@
       </div>
     </div>
   </div>
-  <% if User.current.logged? %>
-    <div class="fr edu-menu-panel ml15" style="height:60px;">
-      <%= link_to (image_tag(url_to_avatar(User.current), :width =>"34", :height => "34", :class => "radius mt13", :nhname => "avatar_image", :alt=>"头像", :id => "nh_user_logo")), user_path(User.current),:class => "fl" %>
-      <ul class="edu-menu-list" style="top:60px;">
-        <span class="bor-bottom-greyE currentName task-hide"><%= User.current.show_name %></span>
-        <li><%= link_to '我的课堂', user_path(User.current) %></li>
-        <li><%= link_to '我的实训', user_path(User.current, :type => 'a_shixun') %></li>
-        <li><%= link_to '我的实训课程', user_path(User.current, :type => 'a_path') %></li>
-        <li><%= link_to '我的项目', user_path(User.current, :type => 'a_project') %></li>
-        <li><%= link_to '账号管理', my_account_path %></li>
-        <li class="bor-top-greyE"><%= link_to '退出', signout_path %></li>
-      </ul>
-    </div>
-  <% else %>
-    <span class="font-15 fr mt15 ml15">
-      <%= link_to '登录', signin_path, :class => "mr5 color-white" %>
-      <em class="vertical-line"></em>
-      <%= link_to '注册', user_join_path, :class => "ml5 color-white" %>
-    </span>
-  <% end %>
+  <div class="fr edu-menu-panel ml15" style="height:60px;">
+    <%= link_to (image_tag(url_to_avatar(User.current), :width =>"34", :height => "34", :class => "radius mt13", :nhname => "avatar_image", :alt=>"头像", :id => "nh_user_logo")), user_path(User.current),:class => "fl" %>
+    <ul class="edu-menu-list" style="top:60px;">
+      <span class="bor-bottom-greyE currentName task-hide"><%= User.current.show_name %></span>
+      <li><%= link_to '我的课堂', user_path(User.current) %></li>
+      <li><%= link_to '我的实训', user_path(User.current, :type => 'a_shixun') %></li>
+      <li><%= link_to '我的实训课程', user_path(User.current, :type => 'a_path') %></li>
+      <% if User.current.partner.present? %>
+        <li><%= link_to '客户管理', partner_list_cooperate_path(User.current.partner) %></li>
+      <% end %>
+      <li><%= link_to '我的项目', user_path(User.current, :type => 'a_project') %></li>
 
+      <% if User.current.department_members.count > 0 %>
+        <li><%= link_to '学院统计', statistics_college_path(User.current.department_members.first.try(:department)) %></li>
+      <% end %>
+      <li><%= link_to '账号管理', my_account_path %></li>
+      <li class="bor-top-greyE"><%= link_to '退出', signout_path %></li>
+    </ul>
+  </div>
   <div class="fr head-right">
     <a href="javascript:void(0)" id="search-open" class="fl headIcon pointer">
       <i class="iconfont icon-sousuo color-white"></i>
@@ -58,9 +73,7 @@
       <div class="edu-menu-list" style="top:60px;width: 240px;">
         <div class="overPart"></div>
         <ul class="fl with50 edu-txt-center pr ul-leftline">
-          <% unless User.current.user_extensions.try(:identity) == 1 %>
-            <li><%= link_to '新建课堂', new_course_path() %></li>
-          <% end %>
+          <li><%= link_to '新建课堂', new_course_path() %></li>
           <li><%= link_to '新建实训', new_shixun_path() %></li>
           <li><%= link_to '新建实训课程', new_subject_path() %></li>
           <li><%= link_to '新建项目', new_project_path() %></li>
@@ -72,6 +85,22 @@
       </div>
     </div>
 
+
+    <div class="fl edu-menu-panel headIcon">
+      <a href="<%= user_tidings_user_path(User.current) %>">
+        <i class="iconfont icon-xiaoxilingdang color-white"></i>
+      </a>
+      <!--新消息提醒-->
+      <% new_tidings_count = User.current.tidings.where("created_at > '#{User.current.onclick_time.onclick_time}'").count %>
+      <% new_pri_message_count = User.current.private_messages.where("created_at > '#{User.current.onclick_time.onclick_time}'").count %>
+      <% count = new_tidings_count + new_pri_message_count %>
+      <% if count > 0 %>
+        <a href="<%= user_tidings_user_path(User.current) %>"><span class="newslight"><%= count > 99 ? "99+" : count %></span>  </a>
+        <div class="edu-menu-list edu-txt-center" style="width:220px;top:60px">
+          <a class="font-14 padding10" style="line-height: 35px;" href="<%= user_tidings_user_path(User.current) %>">您有<span class="color-orange"><%= count %></span>条新消息，点击查看</a>
+        </div>
+      <% end %>
+    </div>
   </div>
 </div>
 

app/views/layouts/_unlogin_header.html.erb

@@ -8,36 +8,47 @@
 
       <li class="pr <%= shixuns_controller.include?(params[:controller]) ? " active" : "" %>"><%= link_to "开发社区", shixuns_path %><img src="/images/educoder/hot-h.png" class="nav-img" /></li>
 
+      <% careers = Career.published.order("created_at asc") %>
+      <% if careers.present? %>
+        <li class="fl edu-menu-panel headIcon careershover <%= params[:action] == "index" && params[:controller] == "careers" ? " active" : "" %>" style="cursor: auto;">
+          <p>职业路径</p>
+          <ul class="edu-menu-list edu-menu-listnew" style="top:60px">
+            <% careers.each do |career| %>
+              <li><a href="<%= introduction_career_path(career) %>"><%= career.name %></a></li>
+            <% end %>
+          </ul>
+        </li>
+      <% end %>
       <li class="<%= params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "竞赛", competitions_path %></li>
       <li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "问答", forums_path %></li>
       <!--<li><%#= link_to "活动竞赛", competitions_path %></li>-->
     </ul>
     <div class="posi-search unlogin" id="posi-search" style="display: none" >
-        <div class="search-all clearfix">
-          <!--<a href="javascript:void(0)" class="search-clear fl" onclick="closeSearch();">×</a>-->
-          <div class="fl pr search-clear edu-menu-panel" style="display: none">
-            <input type="hidden" id="search_type" value="1">
-            <span class="searchkey">实训</span><i class="fa fa-angle-down ml5 font-16"></i>
-            <ul id="searchkey" class="edu-menu-list edu-txt-center" style="min-width: 80px;right: -10px;top: 50px;">
-              <li><a href="javascript:void(0)">实训</a></li>
-              <li><a href="javascript:void(0)">课堂</a></li>
-              <li><a href="javascript:void(0)">用户</a></li>
-            </ul>
-          </div>
-          <div class="seperateLine"></div>
-          <input type="text" class="search-input fl" id="search-input" name="search_keyword" placeholder="搜索实训项目"/>
-          <a href="javascript:void(0)" class="search-icon fl" id="header_keyword_search">
-            <!--<svg class="icon fl mt23" width="20px" height="20px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#333333" d="M463.9 804.4c-194.7 0-353.1-158.4-353.1-353.1S269.2 98.2 463.9 98.2 817 256.6 817 451.3 658.6 804.4 463.9 804.4z m0-651.9c-164.8 0-298.8 134-298.8 298.8s134 298.8 298.8 298.8 298.8-134 298.8-298.8-134-298.8-298.8-298.8zM884.9 926.6c-7.2 0-14.4-2.9-19.8-8.6l-198-210.6c-10.3-10.9-9.7-28.1 1.2-38.4 10.9-10.3 28.1-9.8 38.4 1.2l198 210.6c10.3 10.9 9.7 28.1-1.2 38.4-5.2 5-11.9 7.4-18.6 7.4z" /></svg>-->
-            <i class="iconfont icon-sousuo color-blue mt14 fl"></i>
-          </a>
+      <div class="search-all clearfix">
+        <!--<a href="javascript:void(0)" class="search-clear fl" onclick="closeSearch();">×</a>-->
+        <div class="fl pr search-clear edu-menu-panel" style="display: none">
+          <input type="hidden" id="search_type" value="1">
+          <span class="searchkey">实训</span><i class="fa fa-angle-down ml5 font-16"></i>
+          <ul id="searchkey" class="edu-menu-list edu-txt-center" style="min-width: 80px;right: -10px;top: 50px;">
+            <li><a href="javascript:void(0)">实训</a></li>
+            <li><a href="javascript:void(0)">课堂</a></li>
+            <li><a href="javascript:void(0)">用户</a></li>
+          </ul>
         </div>
+        <div class="seperateLine"></div>
+        <input type="text" class="search-input fl" id="search-input" name="search_keyword" placeholder="搜索实训项目"/>
+        <a href="javascript:void(0)" class="search-icon fl" id="header_keyword_search">
+          <!--<svg class="icon fl mt23" width="20px" height="20px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#333333" d="M463.9 804.4c-194.7 0-353.1-158.4-353.1-353.1S269.2 98.2 463.9 98.2 817 256.6 817 451.3 658.6 804.4 463.9 804.4z m0-651.9c-164.8 0-298.8 134-298.8 298.8s134 298.8 298.8 298.8 298.8-134 298.8-298.8-134-298.8-298.8-298.8zM884.9 926.6c-7.2 0-14.4-2.9-19.8-8.6l-198-210.6c-10.3-10.9-9.7-28.1 1.2-38.4 10.9-10.3 28.1-9.8 38.4 1.2l198 210.6c10.3 10.9 9.7 28.1-1.2 38.4-5.2 5-11.9 7.4-18.6 7.4z" /></svg>-->
+          <i class="iconfont icon-sousuo color-blue mt14 fl"></i>
+        </a>
+      </div>
     </div>
   </div>
 
-    <span class="font-15 fr mt15 ml15">
+  <span class="font-15 fr mt15 ml15">
       <%= link_to '登录', signin_path, :class => "mr5 color-white" %>
-      <em class="vertical-line"></em>
-      <%= link_to '注册', user_join_path, :class => "ml5 color-white" %>
+    <em class="vertical-line"></em>
+    <%= link_to '注册', user_join_path, :class => "ml5 color-white" %>
     </span>
   <div class="fr head-right">
     <a href="javascript:void(0)" id="search-open" class="fl headIcon">
@@ -55,8 +66,8 @@
           <li><%= link_to '新建项目', new_project_path() %></li>
         </ul>
         <ul class="fl with50 edu-txt-center">
-            <li><%= link_to "加入课堂", signin_path, :remote => true %></li>
-            <li><%= link_to "加入项目", applied_join_project_path, :remote => true %></li>
+          <li><%= link_to "加入课堂", signin_path, :remote => true %></li>
+          <li><%= link_to "加入项目", applied_join_project_path, :remote => true %></li>
         </ul>
       </div>
     </div>

app/views/layouts/base_management.html.erb

@@ -113,9 +113,9 @@
         </li>
         <li class="fl edu-admin-nav-li edu-position <%= 'active' if @menu_type == 10 %>"><a href="javascript:void(0);" class="edu-admin-nav-a">审批</a>
           <ul class="edu-admin-nav-inner">
-            <li><%= link_to "实名认证", :controller => "managements", :action => "identity_authentication" %></li>
-            <li><%= link_to "职业认证", :controller => "managements", :action => "professional_authentication" %></li>
-            <li><%= link_to "试用授权", :controller => "managements", :action => "trial_authorization" %></li>
+            <li><%= link_to "实名认证", identity_authentication_managements_path %></li>
+            <li><%= link_to "职业认证", professional_authentication_managements_path %></li>
+            <li><%= link_to "试用授权", trial_authorization_managements_path %></li>
             <li><%= link_to "部门审批", depart_managements_path %></li>
             <li><%= link_to '单位审批', unit_managements_path %></li>
             <li><%= link_to '实训发布', shixun_authorization_managements_path %></li>

app/views/managements/_trial_authorization_passed_list.html.erb

@@ -17,7 +17,7 @@
               </li>
               <li class="clearfix mb5">
                 <% if !user.try(:user_extensions).school_id.blank? && user.try(:user_extensions).try(:school) %>
-                    <span><%= user.try(:user_extensions).school.name %><%= user.try(:user_extensions).department ? ' - '+user.try(:user_extensions).department.name.to_s : '' %></span>
+                    <a href="<%= user.try(:user_extensions).school.statistic_url %>" target="_blank" class="color-blue"><%= user.try(:user_extensions).school.name %><%= user.try(:user_extensions).department ? ' - '+user.try(:user_extensions).department.name.to_s : '' %></a>
                 <% end %>
                 <% if user.try(:user_extensions) && user.try(:user_extensions).identity %>
                     <span class="ml30"><%= user.identity %></span>