educode_sales 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e11b0c160f2894e96d39dff5b6f90e895950940a
-  data.tar.gz: fcb96df55ddd39ed2dc9e67e4cd6313cdd6c8259
+  metadata.gz: 701b98e32352e12147e3d299f1fc472104e79900
+  data.tar.gz: '09bf0ee2949ccfa809b77fae0fdee56cebc10941'
 SHA512:
-  metadata.gz: f5fba1e9ca510c1803807abb69e41a1482a0858b4e7e54757fdf894ae5460b110ae8bd1faf0559de01cc108f47594bdc2f8cd0e4f90c91e59054a47f7f99d5b8
-  data.tar.gz: 0c6e805fe44da4508bc033bbf63846bda0bd24248a3f8face88ae839fc06ceabb90e9dbb061f6f8cae7fd91b711806f0c841b0c9aa2fcc9541166e77cbce4e7a
+  metadata.gz: a69e25dab404aafef54c493263e10df1cf3541a687b5d1b56ff2fa630f7bdc7df70aef76eb968896499625f4a05579c94f1871991c99fd563821141195c14558
+  data.tar.gz: c736a30571dfe038f29da56b9563b1ab62edf49cd33ec76024dca760d31e44bfbb7a4553f47cf40a67f9f0313b2566a19d51e1e37396c93575353733210c29be

data/app/controllers/educode_sales/activities_controller.rb

@@ -13,7 +13,7 @@ module EducodeSales
           else
             @activities = @activities.order("created_at desc")
           end
-          @activities = @activities.page(params[:page]).per(params[:per_page])
+          @activities = @activities.page(params[:page]).per(params[:limit])
         end
       end
     end

data/app/controllers/educode_sales/businesses_controller.rb

@@ -64,7 +64,6 @@ module EducodeSales
             @businesses = @businesses.where("created_at > ? AND created_at < ?", date[0], date[1])
           end
 
-          @businesses = @businesses.page(params[:page]).per(params[:per_page])
 
           if params[:sort].present? && params[:sort][:field]
             @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
@@ -80,7 +79,7 @@ module EducodeSales
             last_follow.reception_at,
             last_follow.total_amount").joins(" 
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
-          ").page(params[:page]).per(params[:per_page])
+          ").page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -145,7 +144,7 @@ module EducodeSales
           else
             @follow_ups = @follow_ups.order("created_at desc")
           end
-          @follow_ups = @follow_ups.page(params[:page]).per(params[:per_page])
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -162,7 +161,7 @@ module EducodeSales
 
     def unfinish_plans
       load_business
-      @plans = @business.sale_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:per_page])
+      @plans = @business.sale_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:limit])
     end
 
     def show_follow_record

data/app/controllers/educode_sales/commons_controller.rb

@@ -8,7 +8,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @commons = Common.group("clazz")
+          @commons = Common.group("clazz").page(params[:page]).per(params[:limit])
         end
       end
     end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -43,7 +43,7 @@ module EducodeSales
     def teachers
       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])
+        @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:limit])
       else
         @teachers = FollowUp.none
       end
@@ -51,7 +51,7 @@ module EducodeSales
 
     def money_plans
       follow_up = FollowUp.find_by(id: params[:id])
-      @money_plans = follow_up.money_plans.page(params[:page]).per(params[:per_page])
+      @money_plans = follow_up.money_plans.page(params[:page]).per(params[:limit])
     end
 
     def add_money

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -46,7 +46,7 @@ module EducodeSales
           else
             @sale_plans = @sale_plans.order("updated_at desc")
           end
-          @sale_plans = @sale_plans.page(params[:page]).per(params[:per_page])
+          @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -166,7 +166,7 @@ module EducodeSales
       else
         @sale_plans = @sale_plans.order("updated_at desc")
       end
-      @sale_plans =  @sale_plans.page(params[:page]).per(params[:per_page])
+      @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
     def my_month
@@ -176,7 +176,7 @@ module EducodeSales
       else
         @sale_plans = @sale_plans.order("updated_at desc")
       end
-      @sale_plans =  @sale_plans.page(params[:page]).per(params[:per_page])
+      @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
     def update

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -42,7 +42,7 @@ 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
@@ -118,7 +118,7 @@ module EducodeSales
 
     def plans
       sale_report = OperationReport.find(params[:id])
-      @sale_plans = OperationPlan.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 = OperationPlan.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/places_controller.rb

@@ -8,7 +8,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @places = Place.page(params[:page]).per(params[:per_page])
+          @places = Place.page(params[:page]).per(params[:limit])
           @stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
         end
       end

data/app/controllers/educode_sales/plans_controller.rb

@@ -47,7 +47,7 @@ module EducodeSales
             @sale_plans = @sale_plans.order("updated_at desc")
           end
 
-          @sale_plans = @sale_plans.page(params[:page]).per(params[:per_page])
+          @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -187,7 +187,7 @@ module EducodeSales
       else
         @sale_plans = @sale_plans.order("updated_at desc")
       end
-      @sale_plans =  @sale_plans.page(params[:page]).per(params[:per_page])
+      @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
     def my_month
@@ -197,13 +197,13 @@ module EducodeSales
       else
         @sale_plans = @sale_plans.order("updated_at desc")
       end
-      @sale_plans =  @sale_plans.page(params[:page]).per(params[:per_page])
+      @sale_plans =  @sale_plans.page(params[:page]).per(params[:limit])
     end
 
     private
 
     def plan_params
-      params.permit(:month, :weekly, :content, :finish_rate)
+      params.permit(:month, :weekly, :content, :finish_rate, :business_id)
     end
 
   end

data/app/controllers/educode_sales/roles_controller.rb

@@ -9,7 +9,7 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @roles = Role.all
+          @roles = Role.page(params[:page]).per(params[:limit])
         end
       end
     end

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -75,7 +75,7 @@ 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
@@ -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/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

@@ -44,7 +44,7 @@ module EducodeSales
     # 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])
+    #     @teachers = follow_up.key_person.includes(:teacher).page(params[:page]).per(params[:limit])
     #   else
     #     @teachers = FollowUp.none
     #   end
@@ -52,7 +52,7 @@ module EducodeSales
     #
     # 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])
+    #   @money_plans = follow_up.money_plans.page(params[:page]).per(params[:limit])
     # end
     #
     # def add_money

data/app/controllers/educode_sales/teachers_controller.rb

@@ -73,7 +73,7 @@ module EducodeSales
             @teachers = @teachers.where("created_at > ? AND created_at < ?", date[0], date[1])
           end
 
-          @teachers = @teachers.order("created_at desc").page(params[:page]).per(params[:per_page])
+          @teachers = @teachers.order("created_at desc").page(params[:page]).per(params[:limit])
 
         end
       end
@@ -144,7 +144,7 @@ module EducodeSales
 
     def unfinish_plans
       load_teacher
-      @plans = @teacher.operation_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:per_page])
+      @plans = @teacher.operation_plans.where.not(finish_rate: 100).page(params[:page]).per(params[:limit])
     end
 
     def course_subject
@@ -206,7 +206,7 @@ module EducodeSales
           else
             @follow_ups = @follow_ups.order("created_at desc")
           end
-          @follow_ups = @follow_ups.page(params[:page]).per(params[:per_page])
+          @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
         end
       end
     end
@@ -244,7 +244,7 @@ module EducodeSales
     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
@@ -253,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

data/app/views/educode_sales/activities/index.json.jbuilder

@@ -11,4 +11,4 @@ json.data do
   end
 end
 json.code 0
-json.count @activities.size
+json.count @activities.total_count

data/app/views/educode_sales/businesses/index.json.jbuilder

@@ -17,5 +17,5 @@ json.data do
   end
 end
 json.code 0
-json.count @business_count
+json.count @businesses.total_count
 json.msg 'succcess'

data/app/views/educode_sales/businesses/show_follow.json.jbuilder

@@ -18,4 +18,4 @@ json.data do
 end
 
 json.code 0
-json.count @follow_ups.count
+json.count @follow_ups.total_count

data/app/views/educode_sales/businesses/unfinish_plans.json.jbuilder

@@ -11,4 +11,4 @@ json.data do
 end
 
 json.code 0
-json.count @plans.count
+json.count @plans.total_count

data/app/views/educode_sales/commons/index.json.jbuilder

@@ -10,4 +10,4 @@ json.data do
 end
 
 json.code 0
-json.count @commons.size
+json.count @commons.total_count

data/app/views/educode_sales/follow_ups/money_plans.json.jbuilder

@@ -8,4 +8,4 @@ json.data do
 end
 
 json.code 0
-json.count @money_plans.count
+json.count @money_plans.total_count

data/app/views/educode_sales/follow_ups/teachers.json.jbuilder

@@ -13,4 +13,4 @@ json.data do
 end
 
 json.code 0
-json.count @teachers.count
+json.count @teachers.total_count

data/app/views/educode_sales/operation_plans/index.json.jbuilder

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/operation_plans/my_month.json.jbuilder

@@ -15,4 +15,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/operation_plans/my_week.json.jbuilder

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

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

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @rate %></span>
+      <span><%= @rate %>%</span>
       <%= hidden_field_tag 'finish_rate', @rate, {id: 'monthly_rate_hide'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">

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

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @rate %></span>
+      <span><%= @rate %>%</span>
       <%= hidden_field_tag 'finish_rate', @rate, {id: 'weekly_rate_hide'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">

data/app/views/educode_sales/operation_reports/index.json.jbuilder

@@ -15,4 +15,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_reports.count
+json.count @sale_reports.total_count

data/app/views/educode_sales/operation_reports/plans.json.jbuilder

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/places/index.json.jbuilder

@@ -10,4 +10,4 @@ json.data do
 end
 
 json.code 0
-json.count @places.size
+json.count @places.total_count

data/app/views/educode_sales/plans/index.json.jbuilder

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/plans/my_month.json.jbuilder

@@ -15,4 +15,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/plans/my_week.json.jbuilder

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/plans/new_monthly.html.erb

@@ -10,7 +10,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @rate %></span>
+      <span><%= @rate %>%</span>
       <%= hidden_field_tag 'finish_rate', @rate, {id: 'monthly_rate_hide'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">

data/app/views/educode_sales/plans/new_weekly.html.erb

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @rate %></span>
+      <span><%= @rate %>%</span>
       <%= hidden_field_tag 'finish_rate', @rate, {id: 'weekly_rate_hide'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">

data/app/views/educode_sales/roles/index.json.jbuilder

@@ -7,4 +7,4 @@ json.data do
 end
 
 json.code 0
-json.count @roles.size
+json.count @roles.total_count

data/app/views/educode_sales/sale_reports/index.json.jbuilder

@@ -14,4 +14,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_reports.count
+json.count @sale_reports.total_count

data/app/views/educode_sales/sale_reports/plans.json.jbuilder

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

data/app/views/educode_sales/sales/index.json.jbuilder

@@ -14,4 +14,4 @@ json.data do
 end
 
 json.code 0
-json.count @staffs.count
+json.count @staffs.total_count

data/app/views/educode_sales/sales/operations.json.jbuilder

@@ -11,4 +11,4 @@ json.data do
 end
 
 json.code 0
-json.count @staffs.count
+json.count @staffs.total_count

data/app/views/educode_sales/staffs/follow_up_departments.json.jbuilder

@@ -10,4 +10,4 @@ json.data do
 end
 
 json.code 0
-json.count @schools.count
+json.count @schools.total_count

data/app/views/educode_sales/staffs/index.json.jbuilder

@@ -12,4 +12,4 @@ json.data do
 end
 
 json.code 0
-json.count @staffs.count
+json.count @staffs.total_count

data/app/views/educode_sales/teachers/course_subject.json.jbuilder

@@ -7,4 +7,4 @@ json.data do
   end
 end
 json.code 0
-json.count @courses.count
+json.count @courses.total_count

data/app/views/educode_sales/teachers/index.json.jbuilder

@@ -21,5 +21,5 @@ json.data do
   end
 end
 json.code 0
-json.count @teachers.count
+json.count @teachers.total_count
 json.msg 'succcess'

data/app/views/educode_sales/teachers/show_follow.json.jbuilder

@@ -17,4 +17,4 @@ json.data do
 end
 
 json.code 0
-json.count @follow_ups.count
+json.count @follow_ups.total_count

data/app/views/educode_sales/teachers/unfinish_plans.json.jbuilder

@@ -11,4 +11,4 @@ json.data do
 end
 
 json.code 0
-json.count @plans.count
+json.count @plans.total_count

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

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