educode_sales 0.1.0 → 0.1.4

data/app/controllers/educode_sales/places_controller.rb

@@ -4,6 +4,7 @@ module EducodeSales
   class PlacesController < ApplicationController
     def index
       respond_to do |format|
+        authorize! :read, Place
         format.html do
         end
         format.json do
@@ -28,7 +29,6 @@ module EducodeSales
 
     def create
       place = @current_admin.places.new(name: params[:name])
-      # place = Place.new(name: params[:name])
       commons = []
       params[:area_ids].each do |d|
         commons << Common.find(d)
@@ -42,7 +42,6 @@ module EducodeSales
     end
 
     def update
-      # id = @current_admin.id
       place = Place.find(params[:id])
       place.assign_attributes(name: params[:name])
       commons = []
@@ -61,8 +60,8 @@ module EducodeSales
       place = Place.find(params[:id])
       place.destroy
       render_success
-      # rescue ActiveRecord::DeleteRestrictionError => e
-      #   render_failure '该用户已有数据产生，暂不能删除'
+    rescue ActiveRecord::DeleteRestrictionError => e
+      render_failure '渠道下已有关联数据产生，暂不能删除'
     end
 
   end

data/app/controllers/educode_sales/plans_controller.rb

@@ -4,7 +4,7 @@ module EducodeSales
   class PlansController < ApplicationController
 
     def index
-      authorize! :read, SalePlan
+      # authorize! :read, SalePlan
       respond_to do |format|
         format.html do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
@@ -39,13 +39,14 @@ module EducodeSales
             @sale_plans = @sale_plans.where("month >= ? and month <= ?", "#{params[:q][:year]}-01-01 00:00:00".to_date, "#{params[:q][:year]}-12-31 23:59:00".to_date)
           end
           if params[:q].present? && params[:q][:month].present?
-            @sale_plans = @sale_plans.where("month >= ?", "#{params[:q][:month]}-01 00:00:00".to_date)
+            @sale_plans = @sale_plans.where("month = ?", "#{params[:q][:month]}-01 00:00:00".to_date)
           end
           if params[:sort].present? && params[:sort][:field]
             @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
             @sale_plans = @sale_plans.order("updated_at desc")
           end
+
           @sale_plans = @sale_plans.page(params[:page]).per(params[:per_page])
         end
       end
@@ -66,6 +67,7 @@ module EducodeSales
       end
     end
 
+
     def new_week
       @business = Business.find_by(id: params[:business_id])
       week = Time.now.strftime('%W').to_i
@@ -82,7 +84,7 @@ module EducodeSales
 
     def new_weekly
       sale_plans = SalePlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", weekly: Time.now.strftime('%W').to_i, staff_id: @current_admin.id)
-      @rate = sale_plans ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
+      @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
       @departments_count = sale_plans.joins(:business).count("distinct(department_id)")
       @total_amount = sale_plans.joins(business: :last_follow_up).sum("total_amount")
       render layout: false
@@ -96,7 +98,7 @@ module EducodeSales
 
     def new_monthly
       sale_plans = SalePlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", staff_id: @current_admin.id, weekly: nil)
-      @rate = sale_plans ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
+      @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
       @departments_count = sale_plans.joins(:business).count("distinct(department_id)")
       @total_amount = sale_plans.joins(business: :last_follow_up).sum("total_amount")
       render layout: false
@@ -122,7 +124,7 @@ module EducodeSales
 
     def edit_week
       @businesses = @current_admin.businesses.pluck(:name, :id)
-      @sale_plan = @current_admin.sale_plans.find(params[:id])
+      @sale_plan = SalePlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
         if week > 3
@@ -139,12 +141,12 @@ module EducodeSales
       @months << @sale_plan.month.strftime("%Y-%m")
       @months = @months.uniq.sort
       @finish_rates = []
-      10.times { |d| @finish_rates << ["#{d * 10}%", d * 10] }
+      11.times { |d| @finish_rates << ["#{d * 10}%", d * 10] }
       render layout: false
     end
 
     def update
-      sale_plan = @current_admin.sale_plans.find(params[:id])
+      sale_plan = SalePlan.find(params[:id])
       params["month"] = params["month"] + "-1"
       if sale_plan.update(plan_params)
         render_success
@@ -154,7 +156,7 @@ module EducodeSales
     end
 
     def destroy
-      sale_plan = @current_admin.sale_plans.find(params[:id])
+      sale_plan = SalePlan.find(params[:id])
       if sale_plan.destroy
         render_success
       else
@@ -168,9 +170,9 @@ module EducodeSales
 
     def edit_month
       @businesses = @current_admin.businesses.pluck(:name, :id)
-      @sale_plan = @current_admin.sale_plans.find(params[:id])
+      @sale_plan = SalePlan.find(params[:id])
       @finish_rates = []
-      10.times { |d| @finish_rates << ["#{d*10}%", d * 10]}
+      11.times { |d| @finish_rates << ["#{d*10}%", d * 10]}
       render layout: false
     end
 

data/app/controllers/educode_sales/roles_controller.rb

@@ -35,6 +35,17 @@ module EducodeSales
       render layout: false
     end
 
+    def update_role
+      role = Role.find(params[:id])
+      if role.update(name: params[:name])
+        render_success
+      else
+        render_failure role
+      end
+    end
+
+
+
     def update
       permissions = []
       role = Role.find(params[:id])

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -27,7 +27,7 @@ module EducodeSales
     end
 
     def destroy
-      sale_report = @current_admin.sale_reports.find(params[:id])
+      sale_report = SaleReport.find(params[:id])
       if sale_report.destroy
         render_success
       else
@@ -35,8 +35,9 @@ module EducodeSales
       end
     end
 
+
     def index
-      authorize! :read, SalePlan
+      # authorize! :read, SalePlan
       respond_to do |format|
         format.html do
         end
@@ -81,12 +82,12 @@ module EducodeSales
 
 
     def edit
-      @sale_report = @current_admin.sale_reports.find(params[:id])
+      @sale_report = SaleReport.find(params[:id])
       render layout: false
     end
 
     def update
-      sale_report = @current_admin.sale_reports.find(params[:id])
+      sale_report = SaleReport.find(params[:id])
       sale_report.content = params[:content]
       if sale_report.save
         render_success

data/app/controllers/educode_sales/sales_controller.rb

@@ -6,7 +6,7 @@ module EducodeSales
     # authorize_resource class: false
 
     def index
-      # authorize! :sales, Staff
+      authorize! :sales, Staff
       respond_to do |format|
         format.html do
         end
@@ -22,11 +22,13 @@ module EducodeSales
     end
 
     def trends
+      authorize! :trends, SaleTrend
       @year = params[:year] ? params[:year] : Time.now.year
       @sale_trend = SaleTrend.find_or_create_by(year: @year)
     end
 
     def sale_trends
+      authorize! :sale_trends, SaleTrend
       sale_trend = SaleTrend.find_by(year: params[:year])
       if sale_trend.update(sale_trend_params)
         render_success
@@ -36,6 +38,7 @@ module EducodeSales
     end
 
     def operations
+      authorize! :operations, Staff
       respond_to do |format|
         format.html do
         end

data/app/controllers/educode_sales/sessions_controller.rb

@@ -9,12 +9,13 @@ module EducodeSales
     end
 
     def create
-      user = User.find_by(login: params[:account])
+      user = User.where("login = :acount OR mail = :acount OR phone = :acount", acount: params[:account]).first
       if user&.admin
         check_pwd(user)
       elsif user
         staff = Staff.find_by(user_id: user.id)
         if staff
+          return render_failure('该账号已禁止使用') if staff.expired_at < Time.now
           check_pwd(user, staff)
         else
           render_failure('账号不存在')

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -0,0 +1,146 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class TeacherFollowsController < ApplicationController
+    def create
+      load_teacher
+      follow_up = @teacher.teacher_follows.build(follow_up_params)
+      follow_up.staff = @current_admin
+      if @teacher.user_id.present?
+        course_ids = CourseMember.where(user_id: @teacher.user_id).where.not(role: 4).pluck(:course_id)
+        follow_up.course_shixuns_count = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).pluck(:shixun_id).uniq.count
+        follow_up.shixuns_count = ShixunMember.where(user_id: @teacher.user_id, role: 1).count
+        follow_up.students_count = CourseMember.where(course_id: course_ids, role: 4).count
+        follow_up.evaluates_count = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).count
+        follow_up.courses_count = course_ids.size
+      end
+      if follow_up.save
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    def destroy
+      follow_up = @current_admin.teacher_follows.find(params[:id])
+      if follow_up.destroy
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    def update
+      follow_up = @current_admin.teacher_follows.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
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+    #
+    # def teachers
+    #   follow_up = @current_admin.follow_ups.find_by(id: params[:id])
+    #   if follow_up.present?
+    #     @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:per_page])
+    #   else
+    #     @teachers = FollowUp.none
+    #   end
+    # end
+    #
+    # def money_plans
+    #   follow_up = @current_admin.follow_ups.find_by(id: params[:id])
+    #   @money_plans = follow_up.money_plans.page(params[:page]).per(params[:per_page])
+    # end
+    #
+    # def add_money
+    #   follow_up = @current_admin.follow_ups.find(params[:id])
+    #   money_plan = follow_up.money_plans.build(date_at: params[:date_at], amount: params[:amount], clazz: params[:clazz])
+    #   money_plan.staff = @current_admin
+    #   if money_plan.save
+    #     render_success
+    #   else
+    #     render_failure money_plan
+    #   end
+    # end
+    #
+    # def update_money
+    #   follow_up = @current_admin.follow_ups.find_by(id: params[:id])
+    #   money_plan = follow_up.money_plans.find(params[:plan_id])
+    #   if money_plan.update(date_at: params[:date_at], amount: params[:amount], clazz: params[:clazz])
+    #     render_success
+    #   else
+    #     render_failure money_plan
+    #   end
+    # end
+    #
+    # def delete_money
+    #   follow_up = @current_admin.follow_ups.find_by(id: params[:id])
+    #   money_plan = follow_up.money_plans.find(params[:plan_id])
+    #   if money_plan.destroy
+    #     render_success
+    #   else
+    #     render_failure money_plan
+    #   end
+    # end
+    #
+    # def add_keys
+    #   follow_up = @current_admin.follow_ups.find(params[:id])
+    #   if params[:name].blank?
+    #     return render_failure '请从平台里选择教师'
+    #   end
+    #
+    #   names = params[:name].split("-")
+    #   if names[0] == 't'
+    #     # 从教师列表里选择的用户
+    #     teacher = Teacher.find(names[1])
+    #     key_peprson = KeyPerson.new(teacher_params)
+    #     key_peprson.teacher = teacher
+    #   else
+    #     # 从头歌平台选择的用户
+    #     user = User.find(names[1])
+    #     teacher = Teacher.new(staff: @current_admin,
+    #                           professional_title: params[:professional_title],
+    #                           job: params[:job],
+    #                           user_id: user.id,
+    #                           is_key: true,
+    #                           department_id: user.department_id,
+    #                           name: user.real_name
+    #     )
+    #     teacher.save
+    #     key_peprson = KeyPerson.new(teacher_params)
+    #     key_peprson.teacher = teacher
+    #   end
+    #
+    #   follow_up.key_person << key_peprson
+    #   if follow_up.save!
+    #     render_success
+    #   else
+    #     render_failure follow_up
+    #   end
+    # rescue ActiveRecord::RecordInvalid => e
+    #   if e.message.include?("Teacher已经被使用") || e.message.include?('Key person是无效的')
+    #     render_failure '该老师已在关键人列表中'
+    #   else
+    #     render_failure e.message
+    #   end
+    # end
+
+    private
+
+    def load_teacher
+      @teacher = Teacher.find(params[:teacher_id])
+    end
+    #
+    def follow_up_params
+      params.permit(:attitude_id, :follow_id, :course_plan_id, :course_build_id, :description)
+    end
+    #
+    # def teacher_params
+    #   params.permit(:professional_title, :job, :attitude_id, :sex, :birth_date, :remark)
+    # end
+
+  end
+end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -21,11 +21,23 @@ module EducodeSales
     def index
       respond_to do |format|
         format.html do
-          
-          # @teachers = Teacher.joins(:user).map { |d| [d.user.real_name, d.id] }
         end
         format.json do
-          @teachers = Teacher.where(is_key: false)
+          if @current_admin.is_admin?
+            @teachers = Teacher.where(is_key: false)
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '教师运营').level
+            case level
+            when '自己'
+              @teachers = Teacher.where(is_key: false)
+              @teachers = @teachers.where(staff_id: @current_admin.id)
+            when '区域'
+              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: false)
+            end
+          end
           
           if params[:q].present? && params[:q][:name].present?
             @teachers = @teachers.where("educode_sales_teachers.name like ?", "%#{params[:q][:name]}%")
@@ -36,8 +48,8 @@ module EducodeSales
           if params[:q].present? && params[:q][:regist_at].present?
             @teachers = @teachers.where("educode_sales_teachers.regist_at like ?", "%#{params[:q][:regist_at]}%")
           end
-          if params[:q].present? && params[:q][:key_attitude].present?
-            @teachers = @teachers.where("educode_sales_teachers.attitude_id = ?", "#{params[:q][:key_attitude]}")
+          if params[:q].present? && params[:q][:attitude].present?
+            @teachers = @teachers.where("educode_sales_teachers.attitude_id = ?", "#{params[:q][:attitude]}")
           end
           if params[:q].present? && params[:q][:teacher_source].present?
             @teachers = @teachers.where("educode_sales_teachers.source_id = ?", "#{params[:q][:teacher_source]}")
@@ -61,12 +73,14 @@ module EducodeSales
             @teachers = @teachers.where("created_at > ? AND created_at < ?", date[0], date[1])
           end
 
-          @teachers = @teachers.page(params[:page]).per(params[:per_page])
+          @teachers = @teachers.order("created_at desc").page(params[:page]).per(params[:per_page])
 
         end
       end
     end
 
+
+
     def new
       render layout: false
     end
@@ -85,9 +99,10 @@ module EducodeSales
 
       if params[:activity_id].present? && params[:user_id].present?
         # 把老师添加到活动列表，提取判断下老师列表是否存在
-        teacher = Teacher.find_by(user_id: params[:user_id])
-        if teacher
-          teacher.activity_teachers.build(activity_id: params[:activity_id])
+        find_teacher = Teacher.find_by(user_id: params[:user_id])
+        if find_teacher
+          find_teacher.activity_teachers.build(activity_id: params[:activity_id])
+          teacher = find_teacher
         end
       end
       
@@ -98,6 +113,22 @@ module EducodeSales
       end
     end
 
+    def update
+      department = Department.find(params[:department_id])
+      teacher = Teacher.find(params[:id])
+      teacher.department_id = department.id
+      teacher.assign_attributes(teacher_params)
+      if params[:user_id].present?
+        user = User.find(params[:user_id])
+        teacher.user_id = user.id
+      end
+      if teacher.save
+        render_success
+      else
+        render_failure teacher
+      end
+    end
+
     def destroy
       teacher = Teacher.find(params[:id])
       teacher.destroy
@@ -106,25 +137,78 @@ module EducodeSales
 
     def edit
       @teacher = Teacher.find(params[:id])
-      gon.department = { value: @teacher.department_id, name: "#{@teacher.department.school.name}-#{@teacher.department.name}" }
+      gon.department = { value: @teacher.department_id, name: "#{@teacher.department&.school&.name}-#{@teacher.department&.name}" }
       gon.value = @teacher.department_id
       render layout: false
     end
 
+    def unfinish_plans
+      load_teacher
+      @plans = @teacher.operation_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:per_page])
+    end
+
+    def course_subject
+      load_teacher
+      @courses = @teacher.course_subjects.all
+    end
+
     def search_new
       render layout: false
     end
 
     def add_courses
+      load_teacher
       render layout: false
     end
 
+
+    def create_course
+      load_teacher
+      course_subject =  @teacher.course_subjects.build(name: params[:name], role_name: params[:role_name],)
+      # course_subject =  CourseSubject.new(teacher_id: params[:teacher_id], name: params[:name], role_name: params[:role_name],)
+      if course_subject.save
+        render_success
+      else
+        render_failure course_subject
+      end
+    end
+
+    def update_course
+      course_subject = CourseSubject.find(params[:id])
+      if course_subject.update(name: params[:name], role_name: params[:role_name])
+        render_success
+      else
+        render_failure course_subject
+      end
+    end
+
+    def delete_course
+      course_subject = CourseSubject.find(params[:id])
+      course_subject.destroy
+      render_success
+    end
+
+
     def add_event
       render layout: false
     end
 
     def show_follow
-      render layout: false
+      @teacher = Teacher.find(params[:id])
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          @follow_ups = @teacher.teacher_follows
+          if params[:field]
+            @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
+          else
+            @follow_ups = @follow_ups.order("created_at desc")
+          end
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:per_page])
+        end
+      end
     end
 
     def show_class
@@ -132,14 +216,28 @@ module EducodeSales
     end
 
     def new_follow_record
+      @teacher = Teacher.find(params[:id])
       render layout: false
     end
 
+    # def create_follow_record
+    #
+    # end
+    #
+    # def update_follow_record
+    #
+    # end
+    # def delete_follow_record
+    #
+    # end
+
     def show_follow_record
+      @follow_up = TeacherFollow.find(params[:id])
       render layout: false
     end
 
     def edit_follow_record
+      @follow_up = TeacherFollow.find(params[:id])
       render layout: false
     end
 
@@ -163,5 +261,9 @@ module EducodeSales
       params.permit(:name, :professional_title, :job, :source_id)
     end
 
+    def load_teacher
+      @teacher = Teacher.find(params[:id])
+    end
+
   end
 end