educode_sales 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a5096eaa908019932cbddf41165f340d93ee6e1
-  data.tar.gz: 23d6bbd33db8cf4e9a7ebcd675f930b502ae14f6
+  metadata.gz: 4d94abe298e3376939b4f3d8f7b2bcc594f5d2c1
+  data.tar.gz: 7530fa27a99ebfb62676367f3752ceee53238a86
 SHA512:
-  metadata.gz: 6c30ed5b195123de8a120d43d76e7b26a4dedaeb6211e1a09cc75bd28132456b4eed0f6e0ffc0af3bd0ca1915ea3ec3ca1275ae9da70702601b8bed7b05103f0
-  data.tar.gz: bcb870fe68cc291d0e3c1fcf46f3bc2d6ca05858670cdffd5ae3788e47a18a03e92a80baec0ce5ea1ad7d15ee268ffc9fa6eb0362231601cc5122f314b42b39c
+  metadata.gz: 0c2f74657f5bf026f37f10d70cb3be4077022154558c3477b729c162f1d6b1efe48fe606b178c947f43a072fc127af4995faa5bf9ced2198acf27471e40f70b6
+  data.tar.gz: a092427e3505659b6602d3bde854d4bf8b39e31d9d1f46cd188688d85d3701df3c85830d5e80c3d37843e1bccc33576a9593a176e6f573c780b0ccb9f4e48c81

data/app/controllers/educode_sales/teachers_controller.rb

@@ -98,13 +98,19 @@ module EducodeSales
       end
 
       if params[:activity_id].present? && params[:user_id].present?
+        @teacher_id = EducodeSales::Teacher.find_by(name: params[:name]).id
+
         # 把老师添加到活动列表，提取判断下老师列表是否存在
         find_teacher = Teacher.find_by(user_id: params[:user_id])
         if find_teacher
           teacher = find_teacher
         end
       end
-      teacher.activity_teachers.build(activity_id: params[:activity_id])
+      if params[:activity_id].present?
+        return render json: {msg: '该教师已在活动中', success: false } if teacher.activity_teachers.find_by(activity_id: params[:activity_id]).present?
+        teacher.activity_teachers.build(activity_id: params[:activity_id])
+      end
+
       if teacher.save
         render_success
       else

data/app/models/educode_sales/activity_teacher.rb

@@ -2,5 +2,7 @@ module EducodeSales
   class ActivityTeacher < ApplicationRecord
     belongs_to :activity, counter_cache: true
     belongs_to :teacher, counter_cache: true
+
+    validates :teacher_id, uniqueness: {scope: :activity_id, message: '已存在'}
   end
 end

data/app/models/educode_sales/teacher.rb

@@ -14,19 +14,25 @@ module EducodeSales
     validates :user_id, uniqueness: { allow_blank: true, message: '已存在老师列表'}
 
 
+    # def teacher_used_of_department
+    #   if user_id.present?
+    #     user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
+    #     course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
+    #     if course_ids.present?
+    #       course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
+    #       course_members.present? ? course_members[0]['count'] : 0
+    #     else
+    #       0
+    #     end
+    #   else
+    #     0
+    #   end
+    # end
     def teacher_used_of_department
-      if user_id.present?
         user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
         course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
-        if course_ids.present?
-          course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
-          course_members.present? ? course_members[0]['count'] : 0
-        else
-          0
-        end
-      else
-        0
-      end
+        course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
+        course_members.present? ? course_members[0]['count'] : 0
     end
 
     def students_count

data/app/views/educode_sales/operation_plans/_monthPlan.html.erb

@@ -118,12 +118,12 @@
                     },
                     {
                         field: 'rate',
-                        width: 100,
+                        width: 80,
                         title: '完成率',
                     },
                     {
                         field: 'updated_at',
-                        width: 150,
+                        width: 170,
                         title: '更新时间',
                         sort: true,
                     },

data/app/views/educode_sales/operation_plans/new_monthly.html.erb

@@ -130,7 +130,7 @@
                 },
                 {
                     title: '操作',
-                    minWidth: 150,
+                    minWidth: 190,
                     toolbar: '#currentMonthly',
                     align: "center"
                 }

data/app/views/educode_sales/operation_plans/new_weekly.html.erb

@@ -130,7 +130,7 @@
                     },
                 {
                     title: '操作',
-                    minWidth: 150,
+                    minWidth: 190,
                     toolbar: '#currentWeekly',
                     align: "center"
                 }

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

@@ -9,7 +9,7 @@ json.data do
     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 d.courses_count
+    json.courses_count Course.joins(:course_members).where(course_members: {user_id: d.teacher&.user_id}).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.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - anke1460