educode_sales 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beaaef9ad85e45c39ff91fc919a392c864872b7c3c6b5ad40cbff4ca931ab7b8
-  data.tar.gz: c99241524289cd79e31c992e85921aa706962253a60d08ecb10dece9215d9120
+  metadata.gz: a53a5638c3708924d823c7d38345f07e6200af65a51f2264d8594751b35e02d6
+  data.tar.gz: 1fe5e13bf4abbd2462563ba1c1e5c58b045276866f06632f5bb8974f43b44fee
 SHA512:
-  metadata.gz: 7abc3483c8e33f0385e1a77edaed2c60b8db9dbf06ae41679cbd379a74a168a3f5869b2a5bd49e2e5e95dd0c90fea504668433841970239ca453031a1ba04bc5
-  data.tar.gz: fe192afb0f2a09d6b924c5901c2aac1bc1d83046ffe4cd3fe20152df2084b19afc5bba62dc71816f68d30418ca2b35c060037b7acf5ab44b3d86f5d45a647d9e
+  metadata.gz: 338f2df8729a2ad99198303b0f9e9820901fdf1fb63fa21bfc8b14569fd212bcac7ad89e1a0965015604664ae86b227cc01d0de6f486bec6c955159e10867f40
+  data.tar.gz: 32b2dfd1edb077700db056aea8607e074f2f373330f21c59fa6350f4f92879c81ce0ed73723de11b02cea81cf834ba00ad30bb507963a1be881ea256f287aa19

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -20,7 +20,7 @@ module EducodeSales
             when '自己'
               @sale_plans = OperationPlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", @current_admin.areas.pluck(:name)).pluck(:id)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
               @sale_plans = OperationPlan.where("staff_id in ?", staff_ids)
             else
               @sale_plans = OperationPlan

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -17,7 +17,7 @@ module EducodeSales
             when '自己'
               @sale_reports = OperationReport.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", staff.areas.pluck(:name)).pluck(:id)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
               @sale_reports = OperationReport.where("staff_id in ?", staff_ids)
             else
               @sale_reports = OperationReport

data/app/controllers/educode_sales/plans_controller.rb

@@ -21,7 +21,7 @@ module EducodeSales
             when '自己'
               @sale_plans = SalePlan.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", staff.areas.pluck(:name)).pluck(:id)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]].where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
               @sale_plans = SalePlan.where("staff_id in ?", staff_ids)
             else
               @sale_plans = SalePlan

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -50,7 +50,7 @@ module EducodeSales
             when '自己'
               @sale_reports = SaleReport.where(staff_id: @current_admin.id)
             when '区域'
-              staff_ids = Staff.joins(department: :school).where("school.province in ?", staff.areas.pluck(:name)).pluck(:id)
+              staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
               @sale_reports = SaleReport.where("staff_id in ?", staff_ids)
             else
               @sale_reports = SaleReport

data/app/controllers/educode_sales/teachers_controller.rb

@@ -280,7 +280,7 @@ module EducodeSales
     def course_list
       user = User.find_by(id: params[:user_id])
       if user
-      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).distinct("course_id").page(params[:page]).per(params[:limit])
+      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct("course_id").page(params[:page]).per(params[:limit])
       else
         @courses = Course.none
       end

data/app/models/educode_sales/teacher.rb

@@ -37,7 +37,7 @@ module EducodeSales
 
     def students_count
       if user_id.present?
-        course_ids = CourseMember.where.not(role: "STUDENT").where(user_id: user_id).pluck(:course_id)
+        course_ids = Course.joins(:course_members).where(course_members: {user_id: user_id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct("course_id").pluck(:course_id)
         CourseMember.where(course_id: course_ids, role: "STUDENT").count
       else
         0

data/app/views/educode_sales/teachers/index.json.jbuilder

@@ -12,10 +12,8 @@ json.data do
     json.teacher_follows_count d.teacher_follows_count
     json.activities_count d.activity_teachers_count
     json.source EducodeSales::Common.teacher_source_name[d.source_id]
-    # a_id = EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).present? ? EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).attitude_id : 73
-    # json.attitude EducodeSales::TeacherFollow.find_by(teacher_id: d.id).present? ? EducodeSales::Common.find(EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).attitude_id).name : ''
     json.attitude d.follow_up&.attitude&.name
-    json.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).distinct("course_id").count : 0
+    json.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).where("is_delete = 0 and role != 4  and excellent = 0 and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct(:course_id).count : 0
     json.actives d.actives
     json.students d.students_count
     json.regist_at d.user.present? ? d.user.created_on.to_s(:date) : ''

data/app/views/educode_sales/teachers/show_follow.json.jbuilder

@@ -8,8 +8,9 @@ json.data do
     json.course_build EducodeSales::Common.find_by(id: d.course_build_id).name
     json.contact EducodeSales::Common.find_by(id: d.follow_id).name
     json.staff d.staff.user.real_name
-    json.students_count d.students_count
-    json.courses_count Course.joins(:course_members).where(course_members: {user_id: d.teacher&.user_id}).distinct("course_id").count
+    json.students_count d.teacher&.students_count
+    # json.courses_count Course.joins(:course_members).where(course_members: {user_id: d.teacher&.user_id}).distinct("course_id").count
+    json.courses_count Course.joins(:course_members).where(course_members: {user_id: d.teacher&.user_id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct(:course_id).count
     json.evaluates_count d.evaluates_count
     json.course_shixuns_count d.course_shixuns_count
     json.shixuns_count d.shixuns_count

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 2021-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails