From 96827146924c4766aee5ca5178295a83ccd23018 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 19 Jul 2019 11:22:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/competitions/_team_list.html.erb | 4 ++--
app/views/competitions/enroll.html.erb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/views/competitions/_team_list.html.erb b/app/views/competitions/_team_list.html.erb
index 3800248c..4c424bc0 100644
--- a/app/views/competitions/_team_list.html.erb
+++ b/app/views/competitions/_team_list.html.erb
@@ -19,10 +19,10 @@
<% team.teachers.each do |teacher| %>
<%= link_to image_tag(url_to_avatar(teacher.user), width: 26, height: 26, class: 'radius fl mr4'), user_path(teacher.user), class: 'fl', target: '_blank', data: { 'tip-down' => "指导老师:#{teacher.user.show_name}" } %>
<% end %>
- <% team.members.each do |member| %>
+ <% team.members[0, 8].each do |member| %>
<%= link_to image_tag(url_to_avatar(member.user), :width => "20", :height => "20", :class => "radius fl mr4 mt3"), user_path(member.user), :title => member.user.show_name, :target => "_blank", :class => "fl", :alt => "用户头像" %>
<% end %>
- <% if team.members.size > 8 %>
+ <% if team.members.size > 9 %>
...
<% end %>
diff --git a/app/views/competitions/enroll.html.erb b/app/views/competitions/enroll.html.erb
index ee439267..449d71c9 100644
--- a/app/views/competitions/enroll.html.erb
+++ b/app/views/competitions/enroll.html.erb
@@ -79,7 +79,7 @@
<% team.team_members.where("user_id != #{team.teacher_id.present? ? team.teacher_id : '-1'}")[0, 8].each do |member| %>
<%= link_to image_tag(url_to_avatar(member.user), :width => "20", :height => "20", :class => "radius fl mr5 mt3"), user_path(member.user), :title => member.user.show_name, :target => "_blank", :class => "fl", :alt => "用户头像" %>
<% end %>
- <% if team.team_members.size > 8 %>
+ <% if team.team_members.size > 9 %>
<% end %>
From 71decd0e755da57362a6ed4c46e64bd57d622cae Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 19 Jul 2019 11:26:43 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/competitions/_team_list.html.erb | 2 +-
app/views/competitions/enroll.html.erb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/views/competitions/_team_list.html.erb b/app/views/competitions/_team_list.html.erb
index 4c424bc0..f2134708 100644
--- a/app/views/competitions/_team_list.html.erb
+++ b/app/views/competitions/_team_list.html.erb
@@ -22,7 +22,7 @@
<% team.members[0, 8].each do |member| %>
<%= link_to image_tag(url_to_avatar(member.user), :width => "20", :height => "20", :class => "radius fl mr4 mt3"), user_path(member.user), :title => member.user.show_name, :target => "_blank", :class => "fl", :alt => "用户头像" %>
<% end %>
- <% if team.members.size > 9 %>
+ <% if team.members.size > 8 %>
...
<% end %>
diff --git a/app/views/competitions/enroll.html.erb b/app/views/competitions/enroll.html.erb
index 449d71c9..ee439267 100644
--- a/app/views/competitions/enroll.html.erb
+++ b/app/views/competitions/enroll.html.erb
@@ -79,7 +79,7 @@
<% team.team_members.where("user_id != #{team.teacher_id.present? ? team.teacher_id : '-1'}")[0, 8].each do |member| %>
<%= link_to image_tag(url_to_avatar(member.user), :width => "20", :height => "20", :class => "radius fl mr5 mt3"), user_path(member.user), :title => member.user.show_name, :target => "_blank", :class => "fl", :alt => "用户头像" %>
<% end %>
- <% if team.team_members.size > 9 %>
+ <% if team.team_members.size > 8 %>
<% end %>
From 27d89065a78b95b50939d3ea0d9c1764bef52c3a Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 19 Jul 2019 11:33:48 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/colleges_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb
index 3cd61f51..fc62d664 100644
--- a/app/controllers/colleges_controller.rb
+++ b/app/controllers/colleges_controller.rb
@@ -72,7 +72,7 @@ class CollegesController < ApplicationController
# ).order("publish_shixun_count desc, experience desc").limit(10)
@teachers =
@teachers.map do |teacher|
- course_ids = Course.find_by_sql("SELECT c.id FROM courses c, members m, member_roles mr WHERE c.id != 1309 and m.course_id = c.id AND m.id=mr.member_id AND mr.role_id in (3,7,9) AND m.user_id=#{teacher.id} AND c.is_delete = 0")
+ course_ids = Course.find_by_sql("SELECT c.id FROM courses c, members m, member_roles mr WHERE c.id != 1309 and m.course_id = c.id AND m.id=mr.member_id AND mr.role_id in (3,7,9) AND m.user_id=#{teacher.id} AND c.is_delete = 0 and c.school_id = #{@school.id}")
course_count = course_ids.size
homeworks = HomeworkCommon.where(:homework_type => 4, :course_id => course_ids.map(&:id))
un_shixun_work_count = homeworks.where("publish_time > '#{Time.now}' or publish_time is null").count
From 484de03a039c3911367c88eeee64f3e8e35ef7b0 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 19 Jul 2019 11:36:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/colleges_controller.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb
index fc62d664..4bc6cd87 100644
--- a/app/controllers/colleges_controller.rb
+++ b/app/controllers/colleges_controller.rb
@@ -67,7 +67,7 @@ class CollegesController < ApplicationController
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 c.id != 1309 and 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
+ (SELECT count(c.id) FROM courses c, members m, member_roles mr WHERE c.id != 1309 and m.course_id = c.id AND m.id=mr.member_id AND mr.role_id in (3,7,9) and c.school_id = #{@school.id} 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=#{@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 =