educode_sales 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90a0d369409f2ebe29b56d92f7a254eb2704751c
-  data.tar.gz: 0ce02076698626fbc2065281c9643069a6454a71
+  metadata.gz: 6baded80505507fdcdbd19b692cb8aea834ed542
+  data.tar.gz: e1c6c03ff6afc8f1d9b311b2ac1a443a74937694
 SHA512:
-  metadata.gz: 3825dfa734ae7cc135b650630e8a6e018a1e0d7fff9678b18df835922eff20cc04d24550b45eeab273baa03a9401285198cd82afe311c2be8347e90863b83af3
-  data.tar.gz: '029f778234ed11d66f786259ffe72a6861ddbf0c10e984d9db30c67fc160435532fe055d6947df9c9c04e4dba749caabc79ceb478b6e0eeb97efde1321c4f28d'
+  metadata.gz: 2f29bf7099856cbbd37f27b0b35f0181b74e16b9ac0b8570a66f5f99cdbc2addd71936a608dc449d6a3dc393aa76a90fa0128f4c80813b19d339fc97233e8978
+  data.tar.gz: 9f56ff2aa864e839270995775e73fb43a5353bfdfeaa8a0ad2db0af9210dc1f1e80e1fd6f4ce76b19a8ca0e3b10adc7850d3d61ed9455fc50a9c303a7c097ed2

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -17,7 +17,7 @@ module EducodeSales
     end
 
     def destroy
-      follow_up = @current_admin.follow_ups.find(params[:id])
+      follow_up = FollowUp.find(params[:id])
       if follow_up.destroy
         render_success
       else
@@ -26,7 +26,7 @@ module EducodeSales
     end
 
     def update
-      follow_up = @current_admin.follow_ups.find(params[:id])
+      follow_up = FollowUp.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
@@ -37,7 +37,7 @@ module EducodeSales
     end
 
     def teachers
-      follow_up = @current_admin.follow_ups.find_by(id: params[:id])
+      follow_up = FollowUp.find_by(id: params[:id])
       if follow_up.present?
         @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:per_page])
       else
@@ -46,12 +46,12 @@ module EducodeSales
     end
 
     def money_plans
-      follow_up = @current_admin.follow_ups.find_by(id: params[:id])
+      follow_up = FollowUp.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])
+      follow_up = FollowUp.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
@@ -62,7 +62,7 @@ module EducodeSales
     end
 
     def update_money
-      follow_up = @current_admin.follow_ups.find_by(id: params[:id])
+      follow_up = FollowUp.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
@@ -72,7 +72,7 @@ module EducodeSales
     end
 
     def delete_money
-      follow_up = @current_admin.follow_ups.find_by(id: params[:id])
+      follow_up = FollowUp.find_by(id: params[:id])
       money_plan = follow_up.money_plans.find(params[:plan_id])
       if money_plan.destroy
         render_success
@@ -82,7 +82,7 @@ module EducodeSales
     end
 
     def add_keys
-      follow_up = @current_admin.follow_ups.find(params[:id])
+      follow_up = FollowUp.find(params[:id])
       if params[:name].blank?
         return render_failure '请从平台里选择教师'
       end

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -66,7 +66,7 @@ module EducodeSales
 
 
     def create
-      plan = @current_admin.operation_plans.build(plan_params)
+      plan = OperationPlan.build(plan_params)
       plan.month = params["month"] + "-1"
       plan.teacher_id = @current_admin.teachers.find(params[:teacher_id]).id
       if plan.save
@@ -118,7 +118,7 @@ module EducodeSales
     def edit_week
       @teacher = Teacher.find_by(id: params[:teacher_id])
       @teachers = @current_admin.teachers.pluck(:name, :id)
-      @sale_plan = @current_admin.operation_plans.find(params[:id])
+      @sale_plan = OperationPlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
         if week > 3
@@ -135,7 +135,7 @@ 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
 
@@ -146,12 +146,12 @@ module EducodeSales
     def edit_month
       @teacher = Teacher.find_by(id: params[:teacher_id])
       @teachers = @current_admin.teachers.pluck(:name, :id)
-      @sale_plan = @current_admin.operation_plans.find(params[:id])
+      @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")
       @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
 
@@ -180,7 +180,7 @@ module EducodeSales
     end
 
     def update
-      operation_plan = @current_admin.operation_plans.find(params[:id])
+      operation_plan = OperationPlan.find(params[:id])
       params["month"] = params["month"] + "-1"
       if operation_plan.update(params.permit(:month, :weekly, :content, :finish_rate, :teacher_id))
         render_success
@@ -190,7 +190,7 @@ module EducodeSales
     end
 
     def destroy
-       operation_plan = @current_admin.operation_plans.find(params[:id])
+       operation_plan = OperationPlan.find(params[:id])
        operation_plan.destroy
        render_success
     end

data/app/controllers/educode_sales/plans_controller.rb

@@ -84,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
@@ -98,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
@@ -124,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
@@ -141,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
@@ -156,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
@@ -170,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/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
@@ -82,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/sessions_controller.rb

@@ -9,7 +9,7 @@ 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

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[: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

@@ -79,6 +79,8 @@ module EducodeSales
       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[: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
@@ -144,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
 
@@ -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