educode_sales 0.2.9 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adac2dac455b86334fc478e4f84454fe0596f15b
-  data.tar.gz: ab4d5c46df6d081c3b193f94aba90d6f644bb35e
+  metadata.gz: d03c13290f7199b6950c19060fb7efc58f3d5bbd
+  data.tar.gz: a3bc8311248e48fcfa615906d5607a8d3347755a
 SHA512:
-  metadata.gz: d6c23010d60071f32bad83b9ae20e8ffe767e06120db34992faef60d58aca8f1f1e1b690b0421ecf54cd35fd126948c8dad429aa1e386af64aad7b8ca6522482
-  data.tar.gz: 0a863555c19683cc7516bf77468df8cc296af577d8e7a87d5f2fc588005b2f4c59325062d617ae70af64929060cf9f1328b80a0ee70af5c196574dbd24743f84
+  metadata.gz: ec1f20e0b7e6d6d4ffbcc89cab5fd6815ae26c37f836f027ac8065746e21546141fe26c15cad74f403bc80402bc4bf9e315ae099969bd24a84a33d1e329828ac
+  data.tar.gz: 35154b0f7e422796b80e80a7952485885cb4d4cb4718e9065db900b915aee9d4df8b11d87ae9bf56f25d9b09e8c11a0cf51e473b24f4f51a27d4af83e8979416

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 ?", staff.areas.pluck(:name)).pluck(:id)
+              staff_ids = Staff.joins(department: :school).where("school.province in ?", @current_admin.areas.pluck(:name)).pluck(:id)
               @sale_plans = OperationPlan.where("staff_id in ?", staff_ids)
             else
               @sale_plans = OperationPlan
@@ -117,7 +117,16 @@ module EducodeSales
 
     def edit_week
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
+      level = @current_admin.is_admin? ? '全部' : @current_admin.role.role_areas.find_by(clazz: '运营计划').level
+      if level == '自己'
+        @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
+      elsif level == '区域'
+        school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+        @teachers = Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where(is_key: false).where("departments.school_id in (?) OR educode_sales_teachers.staff_id = #{@current_admin.id}", school_ids)
+      else
+        @teachers = Teacher.where(is_key: 0).pluck(:name, :id)
+      end
+
       @sale_plan = OperationPlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
@@ -145,7 +154,15 @@ module EducodeSales
 
     def edit_month
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
+      level = @current_admin.is_admin? ? '全部' : @current_admin.role.role_areas.find_by(clazz: '运营计划').level
+      if level == '自己'
+        @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
+      elsif level == '区域'
+        school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
+        @teachers = Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where(is_key: false).where("departments.school_id in (?) OR educode_sales_teachers.staff_id = #{@current_admin.id}", school_ids)
+      else
+        @teachers = Teacher.where(is_key: 0).pluck(:name, :id)
+      end
       @sale_plan = OperationPlan.find(params[:id])
       @months = [Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]
       @months << @sale_plan.month.strftime("%Y-%m")

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -23,7 +23,7 @@ module EducodeSales
     end
 
     def destroy
-      follow_up = @current_admin.teacher_follows.find(params[:id])
+      follow_up = TeacherFollow.find(params[:id])
       if follow_up.destroy
         render_success
       else
@@ -32,7 +32,7 @@ module EducodeSales
     end
 
     def update
-      follow_up = @current_admin.teacher_follows.find(params[:id])
+      follow_up = TeacherFollow.find(params[:id])
       follow_up.assign_attributes(follow_up_params)
       # follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save

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/businesses/index.json.jbuilder

@@ -15,8 +15,7 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     json.return_money d.return_money
     json.place d.last_follow_up&.place&.name
-    json.last_follow_person d.last_follow_up.present? d.last_follow_up.staff.user.real_name : ''
-
+    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : ''
   end
 end
 json.code 0

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/_weekPlan.html.erb

@@ -129,12 +129,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/edit_month.html.erb

@@ -11,9 +11,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">教师</label>
       <div class="layui-input-inline">
-        <%#= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
-        <%= select_tag "teacher_id", options_for_select(@teachers), class: 'required' %>
-
+        <%= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

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

@@ -19,9 +19,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">教师</label>
       <div class="layui-input-inline">
-        <%#= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
-        <%= select_tag "teacher_id", options_for_select(@teachers), class: 'required' %>
-
+        <%= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

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/app/views/layouts/educode_sales/login.html.erb

@@ -2,7 +2,7 @@
 <html>
 
 <head>
-  <title><%= @title || 'Educode sales' %></title>
+  <title><%= @title || '头歌营销系统' %></title>
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
   <%= favicon_link_tag "educode_sales/favicon.ico" %>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.2.9'
+  VERSION = '0.3.3'
 end

metadata

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