educode_sales 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adac2dac455b86334fc478e4f84454fe0596f15b
-  data.tar.gz: ab4d5c46df6d081c3b193f94aba90d6f644bb35e
+  metadata.gz: 2a5096eaa908019932cbddf41165f340d93ee6e1
+  data.tar.gz: 23d6bbd33db8cf4e9a7ebcd675f930b502ae14f6
 SHA512:
-  metadata.gz: d6c23010d60071f32bad83b9ae20e8ffe767e06120db34992faef60d58aca8f1f1e1b690b0421ecf54cd35fd126948c8dad429aa1e386af64aad7b8ca6522482
-  data.tar.gz: 0a863555c19683cc7516bf77468df8cc296af577d8e7a87d5f2fc588005b2f4c59325062d617ae70af64929060cf9f1328b80a0ee70af5c196574dbd24743f84
+  metadata.gz: 6c30ed5b195123de8a120d43d76e7b26a4dedaeb6211e1a09cc75bd28132456b4eed0f6e0ffc0af3bd0ca1915ea3ec3ca1275ae9da70702601b8bed7b05103f0
+  data.tar.gz: bcb870fe68cc291d0e3c1fcf46f3bc2d6ca05858670cdffd5ae3788e47a18a03e92a80baec0ce5ea1ad7d15ee268ffc9fa6eb0362231601cc5122f314b42b39c

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/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/_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/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.2.9'
+  VERSION = '0.3.0'
 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.0
 platform: ruby
 authors:
 - anke1460