educode_sales 0.1.1 → 0.1.5

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
@@ -75,19 +75,19 @@ module EducodeSales
           else
             @sale_reports = @sale_reports.order("updated_at desc")
           end
-          @sale_reports = @sale_reports.page(params[:page]).per(params[:per_page])
+          @sale_reports = @sale_reports.page(params[:page]).per(params[:limit])
         end
       end
     end
 
 
     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
@@ -123,7 +123,7 @@ module EducodeSales
 
     def plans
       sale_report = SaleReport.find(params[:id])
-      @sale_plans = SalePlan.where(staff_id: sale_report.staff_id, month: sale_report.month, weekly: sale_report.weekly).order("updated_at desc").page(params[:page]).per(params[:per_page])
+      @sale_plans = SalePlan.where(staff_id: sale_report.staff_id, month: sale_report.month, weekly: sale_report.weekly).order("updated_at desc").page(params[:page]).per(params[:limit])
     end
 
     private

data/app/controllers/educode_sales/sales_controller.rb

@@ -16,7 +16,7 @@ module EducodeSales
           @b_clazz = Common.find_by(clazz: 'business_type', name: 'B类')
           @step_ids = Common.where(name: %w(已中标 已签单 已验收 回款中 服务中 已结束), clazz: 'business_step').pluck(:id)
           
-          @staffs = Staff.where(job_type: common.id).page(params[:page]).per(params[:per_page])
+          @staffs = Staff.where(job_type: common.id).page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -44,7 +44,7 @@ module EducodeSales
         end
         format.json do
           common_id = Common.where(clazz: 'staff_type', name: ['销售', '运营']).pluck(:id)
-          @staffs = Staff.where(job_type: common_id).page(params[:page]).per(params[:per_page])
+          @staffs = Staff.where(job_type: common_id).page(params[:page]).per(params[:limit])
         end
       end
     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/staffs_controller.rb

@@ -8,7 +8,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @staffs = Staff.where(is_admin: false).page(params[:page]).per(params[:per_page])
+          @staffs = Staff.where(is_admin: false).page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -67,13 +67,13 @@ module EducodeSales
 
     def follow_up_schools
       staff = Staff.find(params[:id])
-      @schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at").page(params[:page]).per(params[:per_page])
+      @schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at").page(params[:page]).per(params[:limit])
       @count =  EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").count
     end
 
     def follow_up_departments
       staff = Staff.find(params[:id])
-      @schools = EducodeSales::Business.joins(:last_follow_up, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.name, schools.name AS school, educode_sales_follow_ups.updated_at").page(params[:page]).per(params[:per_page])
+      @schools = EducodeSales::Business.joins(:last_follow_up, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.name, schools.name AS school, educode_sales_follow_ups.updated_at").page(params[:page]).per(params[:limit])
     end
 
 

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -2,5 +2,145 @@ 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[:limit])
+    #   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[:limit])
+    # 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

@@ -73,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[:limit])
 
         end
       end
     end
 
+
+
     def new
       render layout: false
     end
@@ -97,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
       
@@ -110,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
@@ -118,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[:limit])
+    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[:limit])
+        end
+      end
     end
 
     def show_class
@@ -144,21 +216,35 @@ 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
 
     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}).page(params[:page]).per(params[:per_page])
+      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).page(params[:page]).per(params[:limit])
       else
         @courses = Course.none
       end
@@ -167,7 +253,7 @@ module EducodeSales
 
     def activities
       teacher = Teacher.find(params[:id])
-      @activities = teacher.activities.page(params[:page]).per(params[:per_page]) 
+      @activities = teacher.activities.page(params[:page]).per(params[:limit])
     end
 
     private
@@ -175,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

data/app/models/ability.rb

@@ -6,14 +6,10 @@
       #
       #   user ||= User.new # guest user (not logged in)
        alias_action :index, :trends, :show,  :to => :read
-       p "----------"
-       p staff.is_admin
         if staff.is_admin
           can :manage, :all
         else
           staff.role.permissions.each do |ps|
-            p ps.action
-            p "EducodeSales::#{ps.subject}".constantize
             can ps.action.to_sym, "EducodeSales::#{ps.subject}".constantize
             # level = @current_admin.role.role_areas.find_by(clazz: 'name')&.level
             # if level == '自己'