From eb12c7cdfbeb9de558a91909c108c957176b0556 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sat, 27 Apr 2019 09:13:08 +0800 Subject: [PATCH 1/4] .. --- app/controllers/colleges_controller.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/colleges_controller.rb b/app/controllers/colleges_controller.rb index 2505a3bf..9f7b42e6 100644 --- a/app/controllers/colleges_controller.rb +++ b/app/controllers/colleges_controller.rb @@ -97,9 +97,12 @@ class CollegesController < ApplicationController shixun_ids = HomeworkCommonsShixuns.find_by_sql("SELECT hcs.shixun_id FROM homework_commons_shixuns hcs, homework_commons hc WHERE hc.course_id in (#{all_course_ids.map(&:id).join(',').strip == "" ? -1 : all_course_ids.map(&:id).join(',')}) AND hcs.homework_common_id = hc.id").map(&:shixun_id) - shixun_tags = TagRepertoire.find_by_sql("SELECT tr.`name`, COUNT(str.shixun_id) as shixun_count FROM tag_repertoires tr, shixun_tag_repertoires str WHERE tr.id = str.tag_repertoire_id AND str.shixun_id IN (#{shixun_ids.join(',').strip == "" ? -1 : shixun_ids.join(',')}) GROUP BY tr.id order by shixun_count desc") + shixun_tags = TagRepertoire.find_by_sql("SELECT tr.`name`, COUNT(str.shixun_id) as shixun_count FROM tag_repertoires tr, + shixun_tag_repertoires str WHERE tr.id = str.tag_repertoire_id AND str.shixun_id + IN (#{shixun_ids.join(',').strip == "" ? -1 : shixun_ids.join(',')}) GROUP BY tr.id + order by shixun_count desc") all_shixun_count = shixun_tags.map(&:shixun_count).sum - other_count = all_shixun_count - shixun_tags[0..8].map(&:shixun_count).sum + other_count = all_shixun_count.to_i - shixun_tags[0..8].map(&:shixun_count).sum.to_i @shixun_tags_name = [] @shixun_tags_data = [] shixun_tags[0..8].each do |tag| @@ -254,7 +257,7 @@ 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? || + 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)))) From 2be42bebe5d54e439ed703c77a294556714701cf Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 27 Apr 2019 09:28:41 +0800 Subject: [PATCH 2/4] remove order in school data contrast feature --- .../management/school_data_contrast_service.rb | 15 +++++++-------- .../schools/_data_contrast_list.html.erb | 3 ++- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/services/management/school_data_contrast_service.rb b/app/services/management/school_data_contrast_service.rb index a1ad4c24..9390e46f 100644 --- a/app/services/management/school_data_contrast_service.rb +++ b/app/services/management/school_data_contrast_service.rb @@ -27,7 +27,9 @@ class Management::SchoolDataContrastService reports = reports.group(:school_id) count = reports.count.count - [count, SchoolDailyReport.find_by_sql(query_report_sql(reports.to_sql))] + reports = reports.limit(PAGE_SIZE).offset(offset) + + [count, reports] end private @@ -55,12 +57,9 @@ class Management::SchoolDataContrastService def select_columns "school_id, school_name,"\ - "SUM(IF(date BETWEEN '#{format_date(params[:begin_date])}' AND '#{format_date(params[:end_date])}', #{contrast_column}, 0)) total,"\ - "SUM(IF(date BETWEEN '#{format_date(params[:other_begin_date])}' AND '#{format_date(params[:other_end_date])}', #{contrast_column}, 0)) other_total" - end - - def query_report_sql(from_sql) - "SELECT reports.*, (other_total - total) increase, (IF(other_total - total = 0, 0.0, round((other_total - total) / IF(total = 0, 1, total), 5))) percentage "\ - "FROM (#{from_sql}) reports ORDER BY percentage #{sort_direction} LIMIT #{PAGE_SIZE} OFFSET #{offset}" + "(@total:=SUM(IF(date BETWEEN '#{format_date(params[:begin_date])}' AND '#{format_date(params[:end_date])}', #{contrast_column}, 0))) total,"\ + "(@other_total:=SUM(IF(date BETWEEN '#{format_date(params[:other_begin_date])}' AND '#{format_date(params[:other_end_date])}', #{contrast_column}, 0))) other_total,"\ + "(IF(@other_total - @total = 0, 0.0, round((@other_total - @total) / IF(@total = 0, 1, @total), 5))) percentage,"\ + "(@other_total - @total) increase" end end diff --git a/app/views/managements/schools/_data_contrast_list.html.erb b/app/views/managements/schools/_data_contrast_list.html.erb index 0a9ee965..ae2ecfd2 100644 --- a/app/views/managements/schools/_data_contrast_list.html.erb +++ b/app/views/managements/schools/_data_contrast_list.html.erb @@ -17,7 +17,8 @@ 时段一
<%= "（#{params[:begin_date]}至#{params[:end_date]}）" %> 时段二
<%= "（#{params[:other_begin_date]}至#{params[:other_end_date]}）" %> - <%= sort_tag('变化情况', name: 'percentage', path: school_data_contrast_managements_path) %> + <%#= sort_tag('变化情况', name: 'percentage', path: school_data_contrast_managements_path) %> + 变化情况
（ 新 增 数 | 新增百分比） From b68720ee382e0d6c6342cead51ab2e963838e591 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sat, 27 Apr 2019 10:34:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BF=90=E8=90=A5=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/managements/update_user.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/managements/update_user.html.erb b/app/views/managements/update_user.html.erb index 232275ce..3203614d 100644 --- a/app/views/managements/update_user.html.erb +++ b/app/views/managements/update_user.html.erb @@ -187,8 +187,8 @@
  • - name="business" value="<%= @user.business? ? 1 : 0 %>" id="person_9" class="magic-checkbox" style="float:left; margin-top: 8px;"> - + name="business" value="<%= @user.business? ? "1" : "0" %>" id="person_business" class="magic-checkbox" style="float:left; margin-top: 8px;"> +
  • From c349dd1621d14854ddbcd43ab239aa1ffbc69143 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Sat, 27 Apr 2019 10:45:43 +0800 Subject: [PATCH 4/4] .. --- app/controllers/welcome_controller.rb | 2 +- app/views/layouts/base_edu_user.html.erb | 36 ++++++++++++++++++------ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 729a9564..c9d41c0a 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -218,7 +218,7 @@ class WelcomeController < ApplicationController @tea_users = User.where(homepage_teacher: 1).includes(:user_extensions).limit(10).order("experience desc") @stu_users = User.includes(:user_extensions).where(user_extensions: {identity: 1}).limit(10).order("experience desc") - render :layout => 'base_local' + render :layout => 'educoder' end # 自动导入用户 diff --git a/app/views/layouts/base_edu_user.html.erb b/app/views/layouts/base_edu_user.html.erb index 37ba85ca..8de851ea 100644 --- a/app/views/layouts/base_edu_user.html.erb +++ b/app/views/layouts/base_edu_user.html.erb @@ -7,23 +7,43 @@ <%= csrf_meta_tag %> <%= favicon %> - <%= stylesheet_link_tag 'css/font-awesome','educoder/edu-main','educoder/edu-all','/assets/iconfont/iconfont.css', :media => 'all' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/font-awesome','educoder/edu-main','educoder/edu-all','educoder/magic-check.css','/assets/iconfont/iconfont.css', :media => 'all' %> <%= javascript_heads %> + <%= javascript_include_tag 'edu/application', 'educoder/edu_application','educoder/edu_account',"educoder/edu_user" %> + <%= yield :header_tags -%> + + + + -
    -
    - <%= render :partial => 'layouts/logined_header' %> +
    +
    + <% if User.current.logged? %> + <%= render :partial => 'layouts/logined_header' %> + <% else%> + <%= render :partial => 'layouts/unlogin_header' %> + <% end%>
    -
    +
    <%= yield %>
    - + <%= render :partial => 'users/returnTop_btn' %>
    - + + <%#= render :partial => 'layouts/public_left_info' %> <%= render :partial => 'layouts/footer' %>
    @@ -35,6 +55,4 @@
    -<%= javascript_heads_local %> -<%= javascript_include_tag 'edu/application', 'educoder/edu_application',"educoder/edu_user" %> \ No newline at end of file