educode_sales 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 701b98e32352e12147e3d299f1fc472104e79900
-  data.tar.gz: '09bf0ee2949ccfa809b77fae0fdee56cebc10941'
+  metadata.gz: b0b586bc3b1634320b6fb34e4646577e51cd2eed
+  data.tar.gz: a05dcbb55cc2e2e8f3e7dfbc7671d5f89c24fca5
 SHA512:
-  metadata.gz: a69e25dab404aafef54c493263e10df1cf3541a687b5d1b56ff2fa630f7bdc7df70aef76eb968896499625f4a05579c94f1871991c99fd563821141195c14558
-  data.tar.gz: c736a30571dfe038f29da56b9563b1ab62edf49cd33ec76024dca760d31e44bfbb7a4553f47cf40a67f9f0313b2566a19d51e1e37396c93575353733210c29be
+  metadata.gz: 7099d303b654990b619fcad31ddf547c3412be01a359bb00c0fec6534f32a7764326d512916536d1dbd1710193bddb08b370096250c21fc5dedc976bfc786f12
+  data.tar.gz: 17ac1d2f5b4b134147ca1b77b53c340c04389269e2f1b8b89c9b89c90893eed640c5cb5980f0be28a10e8ada7c18f927d2b326069d1a0f47d237902f13b5f832

data/app/assets/stylesheets/educode_sales/app.css

@@ -109,6 +109,7 @@
 
 .welcome .layui-bg-number {
   background-color: #F8F8F8;
+  height: 90px;
 }
 
 .welcome .layuimini-notice:hover {

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -21,7 +21,7 @@ module EducodeSales
       business = follow_up.business
       if follow_up.destroy
         if follow_up.id == business.last_follow_up_id
-          business.update(last_follow_up: follow_ups.last, return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: follow_ups.last&.id).sum(:amount))
+          business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: business.follow_ups.last&.id).sum(:amount))
         end
         render_success
       else

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -117,7 +117,7 @@ module EducodeSales
 
     def edit_week
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :id)
       @sale_plan = OperationPlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
@@ -145,7 +145,7 @@ module EducodeSales
 
     def edit_month
       @teacher = Teacher.find_by(id: params[:teacher_id])
-      @teachers = @current_admin.teachers.pluck(:name, :id)
+      @teachers = @current_admin.teachers.where(is_key: 0).pluck(:name, :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")

data/app/controllers/educode_sales/plans_controller.rb

@@ -86,7 +86,7 @@ module EducodeSales
       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.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")
+      @total_amount = sale_plans.joins(business: :last_follow_up).distinct.sum("total_amount")
       render layout: false
     end
 
@@ -100,7 +100,7 @@ module EducodeSales
       sale_plans = SalePlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", staff_id: @current_admin.id, weekly: nil)
       @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")
+      @total_amount = sale_plans.joins(business: :last_follow_up).distinct.sum("total_amount")
       render layout: false
     end
 

data/app/models/educode_sales/common.rb

@@ -29,5 +29,9 @@ module EducodeSales
     def self.key_attitude_name
       self.where(clazz: 'key_attitude').pluck(:id, :name).to_h
     end
+
+    def self.teacher_attitude_name
+      self.where(clazz: 'teacher_attitude').pluck(:id, :name).to_h
+    end
   end
 end

data/app/models/educode_sales/follow_up.rb

@@ -2,7 +2,7 @@ module EducodeSales
   class FollowUp < ApplicationRecord
     belongs_to :business, counter_cache: true
     belongs_to :place, optional: true
-    has_many :money_plans
+    has_many :money_plans, dependent: :destroy
     has_many :key_person
     has_many :teachers, through: :key_person
     belongs_to :staff

data/app/models/educode_sales/teacher.rb

@@ -18,11 +18,20 @@ module EducodeSales
         user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
         course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
         if course_ids.present?
+          course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 30").select("COUNT(*) AS count")
+          course_members.present? ? course_members[0]['count'] : 0
         else
           0
         end
-        course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 30").select("COUNT(*) AS count")
-        course_members.present? ? course_members[0]['count'] : 0
+      else
+        0
+      end
+    end
+
+    def students_count
+      if user_id.present?
+        course_ids = CourseMember.where.not(role: "STUDENT").where(user_id: user_id).pluck(:course_id)
+        CourseMember.where(course_id: course_ids, role: "STUDENT").count
       else
         0
       end

data/app/views/educode_sales/activities/index.html.erb

@@ -60,7 +60,7 @@
                 {
                   field: 'days',
                   title: '天数',
-                  width: 80
+                  width: 100
                 },
                 {
                   field: 'teachers_count',
@@ -68,14 +68,6 @@
                   width: 100,
                   templet: '#teachers_count'
                 },
-                // {
-                //     field: 'return_rate',
-                //     title: '回访率',
-                // },
-                // {
-                //     field: 'course_rate',
-                //     title: '建课率',
-                // },
                 {
                   field: 'students_count',
                   title: '学生数',

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

@@ -66,6 +66,7 @@
       <div class="layui-input-inline">
         <input name="divide_rate" class="layui-input" value="<%= @follow_up.divide_rate%>">
       </div>
+      <span style="margin-top: 10px; float:left;">%</span>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label required">自我小结</label>

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

@@ -194,6 +194,7 @@
                 request.authDelete("educode_sales/follow_ups/" + data.id, {}, function() {
                   obj.del();
                   layer.close(index);
+                    table.reload("businesses_table");
                 })
               });
           } else if (obj.event === 'show') { // 监听添加操作

data/app/views/educode_sales/operation_reports/audit.html.erb

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

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

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">运营教师:</label>

data/app/views/educode_sales/operation_reports/show.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">运营教师:</label>

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

@@ -201,12 +201,7 @@
 
         table.on('tool(monthPlanTable)', function (obj) {
             var data = obj.data;
-            if (obj.event === 'delete') {
-                layer.confirm('真的删除行么', function (index) {
-                    obj.del();
-                    layer.close(index);
-                });
-            } else if (obj.event === 'show') {
+            if (obj.event === 'show') {
                 content = miniPage.getHrefContent('/educode_sales/plans/show_month?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
@@ -259,6 +254,14 @@
               $(window).on("resize", function () {
                   layer.full(index);
               });
+            } else if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.id, function (index) {
+                    console.log("aaaaa");
+                    request.delete('educode_sales/plans/' + data.id, {}, function (res) {
+                        layer.close(index);
+                        table.reload("monthPlanTable")
+                    })
+                });
             }
         });
 

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

@@ -73,7 +73,7 @@
           } else {
             parent.table.reload('unfinish_table')
           }
-          
+          parent.table.reload('newWeeklyTable')
         }
       })
       return false;

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

@@ -87,7 +87,9 @@
           else {
             parent.table.reload('businesses_table')
           }
-         
+            parent.table.reload('newWeeklyTable')
+
+
         }
       })
       return false;

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

@@ -97,6 +97,7 @@
           layer.close(parent.sindex);
           parent.layer.close(parent.layer.getFrameIndex(window.name))
           parent.table.reload('newWeeklyTable');
+          table.reload('weeklyTable');
           layer.alert('添加成功')
         }
       })

data/app/views/educode_sales/sale_reports/audit.html.erb

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

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

@@ -8,7 +8,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">覆盖客户:</label>

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -2,7 +2,7 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span><%= @sale_report.finish_rate %></span>
+      <span><%= @sale_report.finish_rate %>%</span>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">覆盖客户:</label>

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -65,7 +65,7 @@
                 </div>
               </div>
             </div>
-            <div class="layui-col-xs3">
+            <div class="layui-col-xs3" >
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">

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.total_count
+json.count @courses.count

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

@@ -260,7 +260,7 @@
             form.val('search_teachers', {
                 area: "",
                 date: "",
-                key_attitude: "",
+                attitude: "",
                 name: "",
                 professional_title: "",
                 regist_at: "",

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

@@ -12,10 +12,10 @@ json.data do
     json.teacher_follows_count d.teacher_follows_count
     json.activities_count d.activity_teachers_count
     json.source EducodeSales::Common.teacher_source_name[d.source_id]
-    json.attitude EducodeSales::Common.key_attitude_name[d.attitude_id]
+    json.attitude EducodeSales::Common.teacher_attitude_name[d.attitude_id]
     json.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).count : 0
     json.actives d.actives
-    json.students d.students
+    json.students d.students_count
     json.regist_at d.regist_at ? d.regist_at.to_s(:date) : ''
     json.teacher_used d.teacher_used_of_department
   end

data/lib/educode_sales/version.rb

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

metadata

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