educode_sales 0.9.50 → 0.9.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd985344d561d719daf89b1d1d943b489b593be21b0a99e264bd80ca4ee324ac
-  data.tar.gz: 4eed4e4df1ba224d21af8a799efe0d9610e4eddb1ac2fdb25445dedb92b8673b
+  metadata.gz: a3f113e3b9a8f55b0680230f5bfaabd5e6858866342a0aecd8f4195eba24c5b3
+  data.tar.gz: 8b3b11f2eac6297e680a765e0f633b63a97e6d63ee5c58b824bfd04805444636
 SHA512:
-  metadata.gz: 89f9a92091c591835ccaa390edd2c773717362872575741b37e0e227f372cf8c18bc5fac711e019094fea046b72358631e4eb0e497e2a63988f4a8eb1de1842b
-  data.tar.gz: 79404f53215289824fdf91805d276966d140377983c012e7d5650b003f56519ff895911d0736142e7ab7dfa54a628df5cd65073da082d6eb4e1ca5993f9d2644
+  metadata.gz: 9311f0790f150cd5c1c38f1f403628570e7da76e27c40aca5b7640c1670decaeb476a7f2173136309cecd5246485d469f2133483249415d50e6af5fc989444fc
+  data.tar.gz: 5882f0b229d65d15efdefab83c7a8c0aefc761b5e8ae53140e7581b4e4b2de9eb3221e7a852da6ea0c787c1d6e27f726d54567acb47083ed4e0615c7e650b019

data/app/controllers/educode_sales/businesses_controller.rb

@@ -107,7 +107,7 @@ module EducodeSales
               # 区域管理商机
               # 排查看区域商机，需要排除掉其它人员手上的监管学校
               other_staff_school_id = EducodeSales::StaffSchool.where.not(staff_id: @current_admin.id).where("school_id IN (SELECT school_id FROM educode_sales_staff_schools WHERE staff_id = #{@current_admin.id}) IS NOT TRUE").distinct.pluck :school_id
-               
+
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id) - other_staff_school_id
               @businesses = Business.joins("JOIN departments  AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
             end
@@ -123,7 +123,7 @@ module EducodeSales
               when '区域'
                 # 查看区域商机，需要排除掉其它人员手上的监管学校
                 other_staff_school_id = EducodeSales::StaffSchool.where.not(staff_id: @current_admin.id).where("school_id IN (SELECT school_id FROM educode_sales_staff_schools WHERE staff_id = #{@current_admin.id}) IS NOT TRUE").distinct.pluck :school_id
-               
+
                 school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id) - other_staff_school_id
                 if can?(:special, EducodeSales::Business)
                 # 专项商机
@@ -492,6 +492,7 @@ module EducodeSales
       respond_to do |format|
         format.html do
           @follow_ups = @business.follow_ups.order(created_at: :desc)
+          @latest = @follow_ups.present? ? @follow_ups[0] : nil
           render layout: false
         end
       end

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -71,7 +71,7 @@ module EducodeSales
         staff = Staff.find(params[:q][:staff_id])
         school_ids = School.where(province: staff.areas.pluck(:name)).pluck(:id)
         teacher_ids = EducodeSales::Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where("departments.school_id in (?)", school_ids).pluck(:id)
-        @follow_ups = TeacherFollow.where(teacher_id: teacher_ids)
+        @follow_ups = @follow_ups.where(teacher_id: teacher_ids)
       end
 
       if params[:q].present? && params[:q][:department].present?
@@ -118,7 +118,7 @@ module EducodeSales
       else
         @follow_ups = @follow_ups.order("educode_sales_teacher_follows.created_at desc")
       end
-       @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+      @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
     end
 
     private

data/app/controllers/educode_sales/teachers_controller.rb

@@ -346,7 +346,16 @@ module EducodeSales
     end
 
     def daily_paper
-      @num_1 = @current_admin.operation_plans.where("month >= ? AND month < ?", Time.now.beginning_of_month, Time.now.end_of_month).count
+      # 累计完成教师
+      @total_teachers_num = @current_admin.operation_plans.where("created_at >= ?", Time.now.beginning_of_month).distinct.count("teacher_id")
+      @today_teacher_num = @current_admin.operation_plans.where("created_at >= ?", Time.now.beginning_of_day).distinct.count("teacher_id")
+      user_ids = @current_admin.operation_plans.joins(:teacher).where("educode_sales_teachers.user_id IS NOT NULL").pluck(:user_id)
+      @today_course_num = Course.joins(:course_members).where(course_members: {user_id: user_ids}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("courses.created_at > ?", Time.now.beginning_of_day).count
+
+      my_area = @current_admin.areas.pluck(:name)
+      @total_users_num = UserExtension.joins(department: :school).where(schools: {province: my_area}).where("user_extensions.created_at > ?", Time.now.beginning_of_month).count
+      @today_users_num = UserExtension.joins(department: :school).where(schools: {province: my_area}).where("user_extensions.created_at > ?", Time.now.beginning_of_day).count
+
       render layout: false
     end
 

data/app/views/educode_sales/businesses/time_line.html.erb

@@ -20,6 +20,9 @@
         <br>
         关键人：<% teacher_ids =  f.key_person.present? ? f.key_person.pluck(:teacher_id) : [] %>
                <%= EducodeSales::Teacher.where(id: teacher_ids).pluck(:name).join("、") %>
+            <% if f.id == @latest&.id && (f.created_at.present? ? (Time.now - f.created_at).to_f/3600 < 24 : false) %>
+              <a href="javascript:;" class="add_key" data-is_latest="<%= f.id == @latest&.id %>" data-id=<%= f.id %> data-flag="<%= f.created_at.present? ? (Time.now - f.created_at).to_f/3600 < 24 : false %>">添加关键人</a>
+            <% end %>
       </p>
     </div>
   </li>
@@ -33,13 +36,38 @@
 <script type="text/javascript" charset="utf-8">
 
     layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
-        var $ = layui.jquery,
-            form = layui.form,
-            table = layui.table,
-            request = layui.request,
-            miniPage = layui.miniPage;
+      var $ = layui.jquery,
+      table = layui.table,
+      request = layui.request,
+      miniPage = layui.miniPage;
+      form = layui.form;
 
     });
+    $(".add_key").on("click", function(e) {
+      var data = e.currentTarget.dataset;
+      follow_up_id = data.id;
+      content = miniPage.getHrefContent('/missions/teachers/add_keys?follow_up_id=' + data.id);
+      openWH = miniPage.getOpenWidthHeight();
+      is_latest = data.is_latest == "true";
+      flag = data.flag == "true"
+      keyindex = layer.open({
+          title: '关键人',
+          type: 1,
+          shade: 0.2,
+          maxmin: true,
+          shadeClose: true,
+          area: [openWH[0] + 'px', openWH[1] + 'px'],
+          offset: [openWH[2] + 'px', openWH[3] + 'px'],
+          content: content,
+          success: function (layero, index) {
+            // 重新渲染弹层中的下拉选择框select
+            form.render('select');
+          }
+      });
+      $(window).on("resize", function () {
+          layer.full(keyindex);
+      });
+    })
     function demo(){
         layer.closeAll()
         business_id = parent.business_id

data/app/views/educode_sales/teachers/_index.html.erb

@@ -223,7 +223,7 @@
                 {
                     field: 'follow_person',
                     width: 120,
-                    title: '跟进人',
+                    title: '最新跟进人',
                 },
                 {
                     field: 'followup_at',
@@ -293,7 +293,7 @@
                 {
                     field: 'mobile',
                     width: 120,
-                    title: '手机号',
+                    title: '联系电话',
                 },
                 {
                     field: 'wechat',

data/app/views/educode_sales/teachers/daily_paper.html.erb

@@ -5,37 +5,37 @@
 
     <p>一、数据指标</p>
     <p>1、【教师合作-老客户运营】</p>
-    <p>本月目标<%= @num_1 %>人；</p>
-    <p>累计完成**人； </p>
-    <p>今日已完成沟通xx人；</p>
-    <p style="margin-bottom: 30px;">今日已完成新建课堂**个；</p>
+    <p>本月目标 ** 人；</p>
+    <p>累计完成 <%= @total_teachers_num %> 人； </p>
+    <p>今日已完成沟通 <%= @today_teacher_num %> 人；</p>
+    <p style="margin-bottom: 30px;">今日已完成新建课堂 <%= @today_course_num %> 个；</p>
     <p>2、【市场活动-新客户注册】</p>
-    <p>本月目标**人；</p>
-    <p>累计完成**人；</p>
-    <p style="margin-bottom: 30px;">今日已完成转化注册**人；</p>
+    <p>本月目标 ** 人；</p>
+    <p>累计完成 <%= @total_users_num %> 人；</p>
+    <p style="margin-bottom: 30px;">今日已完成转化注册 <%= @today_users_num %> 人；</p>
     <p>3、课程建设-新型态教材合作】</p>
-    <p>本月目标**门课程（教材）；</p>
-    <p>累计完成**门课程（教材）；</p>
-    <p style="margin-bottom: 30px;">今日已完成挖掘**门课程（教材）；</p>
+    <p>本月目标 ** 门课程（教材）；</p>
+    <p>累计完成 ** 门课程（教材）；</p>
+    <p style="margin-bottom: 30px;">今日已完成挖掘 ** 门课程（教材）；</p>
     <p>二、客户跟进情况</p>
     <p style="margin-bottom: 30px;">（填写每日重点客户沟通内容，可涵盖总部安排的重要工作事项） </p>
     <p>三、商机与项目线索</p>
     <p style="margin-bottom: 30px;">（在运营过程中发现的商机以及小toB非招标项目商机：saas课程、在线考试等）</p>
     <p>四、需要协助支持事宜</p>
-    <p style="margin-bottom: 30px;">1、需支持运营目标院校**学校，教师注册量**人，活跃用户**人，待运营**人；</p>
+    <p style="margin-bottom: 30px;">1、需支持运营目标院校 ** 学校，教师注册量 ** 人，活跃用户 ** 人，待运营 ** 人；</p>
   </div>
 
   <% text = "\n" %>
   <% text += "一、数据指标\n" %>
   <% text += "1、【教师合作-老客户运营】\n" %>
-  <% text += "本月目标**人；\n" %>
-  <% text += "累计完成**人；\n" %>
-  <% text += "今日已完成沟通**人；\n" %>
-  <% text += "今日已完成新建课堂**个；\n\n" %>
+  <% text += "本月目标 ** 人；\n" %>
+  <% text += "累计完成 #{@total_teachers_num} 人；\n" %>
+  <% text += "今日已完成沟通 #{@today_teacher_num} 人；\n" %>
+  <% text += "今日已完成新建课堂 #{@today_course_num } 个；\n\n" %>
   <% text += "2、【市场活动-新客户注册】\n" %>
-  <% text += "本月目标**人\n" %>
-  <% text += "累计完成**人\n" %>
-  <% text += "今日已完成挖掘**门课程（教材）\n\n" %>
+  <% text += "本月目标 ** 人\n" %>
+  <% text += "累计完成 #{@total_users_num} 人\n" %>
+  <% text += "今日已完成转化注册 #{@today_users_num} 人\n\n" %>
   <% text += "3、课程建设-新型态教材合作】\n" %>
   <% text += "本月目标**门课程（教材）；\n" %>
   <% text += "累计完成**门课程（教材）；\n" %>
@@ -45,7 +45,7 @@
   <% text += "三、商机与项目线索\n" %>
   <% text += "（在运营过程中发现的商机以及小toB非招标项目商机：saas课程、在线考试等）\n\n" %>
   <% text += "四、需要协助支持事宜\n" %>
-  <% text += "1、需支持运营目标院校**学校，教师注册量**人，活跃用户**人，待运营**人；\n\n" %>
+  <% text += "1、需支持运营目标院校 ** 学校，教师注册量 ** 人，活跃用户 ** 人，待运营 ** 人；\n\n" %>
   <% text += "头歌营销系统 \n"%>
   <% text +=  "#{Time.now.to_s}"%>
   <div id="content" style="display: none;" data-content="生态经理日报-转正后<%=text %>"></div>

data/app/views/educode_sales/teachers/edit.html.erb

@@ -37,6 +37,13 @@
       </div>
     </div>
     <br>
+    <div class="layui-inline">
+     <label class="layui-form-label ">手机号</label>
+     <div class="layui-input-block" style="width: 188px;">
+       <input type="text" name="mobile" autocomplete="off"  class="layui-input" placeholder="请输入手机号"  value="<%= @teacher.mobile %>">
+     </div>
+    </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label required">单位部门</label>
       <div class="layui-input-block" id="add_department2" style="width: 400px"></div>

data/db/migrate/20230227061043_create_educode_sales_ideas.rb

@@ -4,7 +4,7 @@ class CreateEducodeSalesIdeas < ActiveRecord::Migration[5.2]
       t.references :school, index: true, comment: "学校"
       t.string :name, comment: "名称"
       t.integer :level, comment: "优先级"
-      t.integer :user_id, comment: "指派人"
+      t.integer :staff_id, comment: "指派人"
       t.integer :status, comment: "状态"
       t.integer :types, comment: "类型"
       t.integer :model, comment: "部署模式"
@@ -19,8 +19,8 @@ class CreateEducodeSalesIdeas < ActiveRecord::Migration[5.2]
       t.boolean :is_deleted, default: false, comment: "是否删除"
       t.datetime :deleted_at, comment: "删除时间"
       t.references :department, index: true, comment: "部门"
-      t.integer :manager_name, comment: "负责人"
-      t.integer :manager_phone, comment: "负责人电话"
+      t.string :manager_name, comment: "负责人"
+      t.string :manager_phone, comment: "负责人电话"
       t.text :history_record, comment: "修改记录"
       t.timestamps
     end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.50'
+  VERSION = '0.9.52'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.50
+  version: 0.9.52
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
-- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -545,7 +544,6 @@ files:
 - db/migrate/20220920080302_add_column_number_to_educode_sales_businesses.rb
 - db/migrate/20220921131116_add_change_clazz_to_follow_up.rb
 - db/migrate/20220923084102_create_table_to_busines_number_recoreds.rb
-- db/migrate/20221025094655_delete_business_number.rb
 - db/migrate/20221107122147_change_divide_rate_follow_ups.rb
 - db/migrate/20230115080730_add_origin_business_id_to_follow_ups.rb
 - db/migrate/20230117144025_create_educode_sales_business_clazz_changes.rb
@@ -554,10 +552,7 @@ files:
 - db/migrate/20230215141612_add_mobile_to_teachers.rb
 - db/migrate/20230220144737_add_clazz_id_to_business.rb
 - db/migrate/20230227061043_create_educode_sales_ideas.rb
-- db/migrate/20230227070206_change_to_educode_sales_ideas.rb
-- db/migrate/20230227125936_add_follow_at_to_teachers.rb
 - db/migrate/20230228063555_create_educode_sales_idea_histories.rb
-- db/migrate/20230302074324_change_manager_for_ideas.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -566,7 +561,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -581,8 +576,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []

data/db/migrate/20221025094655_delete_business_number.rb

@@ -1,5 +0,0 @@
-class DeleteBusinessNumber < ActiveRecord::Migration[5.2]
-  def change
-    EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != 77").update_all("educode_sales_businesses.number = null")
-  end
-end

data/db/migrate/20230227070206_change_to_educode_sales_ideas.rb

@@ -1,5 +0,0 @@
-class ChangeToEducodeSalesIdeas < ActiveRecord::Migration[5.2]
-  def change
-    rename_column :educode_sales_ideas, :user_id, :staff_id
-  end
-end

data/db/migrate/20230227125936_add_follow_at_to_teachers.rb

@@ -1,6 +0,0 @@
-class AddFollowAtToTeachers < ActiveRecord::Migration[5.2]
-  def change
-    add_column :educode_sales_teachers, :followup_at, :datetime unless column_exists?(:educode_sales_teachers, :followup_at)
-    add_column :educode_sales_teacher_follows, :advise, :text unless column_exists?(:educode_sales_teacher_follows, :advise)
-  end
-end

data/db/migrate/20230302074324_change_manager_for_ideas.rb

@@ -1,6 +0,0 @@
-class ChangeManagerForIdeas < ActiveRecord::Migration[5.2]
-  def change
-    change_column :educode_sales_ideas, :manager_phone, :string
-    change_column :educode_sales_ideas, :manager_name, :string
-  end
-end