educode_sales 0.5.9 → 0.6.3

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

@@ -88,16 +88,6 @@
 <table class="layui-hide" id="teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
 </div>
 <script type="text/html" id="currentTableBar">
-  <%# if can? :create, EducodeSales::OperationPlan %>
-<!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addWeek">添加周计划</a>-->
-<!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addMonth">添加月计划</a>-->
-  <%# end %>
-  <%# if can? :update, EducodeSales::Teacher %>
-<!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>-->
-  <%# end %>
-  <%# if can? :destroy, EducodeSales::Teacher %>
-<!--  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>-->
-   <%# end %>
   <% if can? :create, EducodeSales::TeacherFollow %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
   <% end %>
@@ -243,19 +233,22 @@
                     templet: "#event"
                 },
                 {
-                    field: 'regist_at',
+                    field: 'created_on',
                     width: 120,
                     title: '注册时间',
+                    sort: true,
                 },
                 {
                     field: 'last_login_on',
                     width: 120,
                     title: '最近登录',
+                    sort: true,
                 },
                 {
                     field: 'created_at',
                     width: 120,
                     title: '添加时间',
+                    sort: true,
                 },
                 {
                     field: 'wechat',

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

@@ -18,7 +18,7 @@ json.data do
     json.courses_count d.courses_count
     json.actives d.actives
     json.students d.students_count
-    json.regist_at d.user.present? ? d.user.created_on.to_s(:date) : ''
+    json.created_on d.user.present? ? d.user.created_on.to_s(:date) : ''
     json.last_login_on (d.user.present? && d.user.last_login_on.present?) ? d.user.last_login_on.to_s(:date) : ''
     json.teacher_used d.teacher_used
     json.wechat d.wechat

data/db/migrate/20211220102720_add_position_to_commons.rb

@@ -0,0 +1,12 @@
+class AddPositionToCommons < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_permissions, :position, :integer
+    EducodeSales::Permission.all.each_with_index do |d,index|
+      if d.clazz == '销售态势' || d.clazz == '销售分工' || d.clazz == '商机管理' || d.clazz == '客户管理'
+        d.update(position: index)
+      else
+        d.update(position: index * 10)
+      end
+    end
+  end
+end

data/db/migrate/20211221075146_add_school_id_to_educode_sales_businesses.rb

@@ -0,0 +1,8 @@
+class AddSchoolIdToEducodeSalesBusinesses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_businesses, :school_id, :integer
+    EducodeSales::Business.all.each do |business|
+      business.update(school_id: business.department.school.id)
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.5.9'
+  VERSION = '0.6.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.3
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -405,6 +405,8 @@ files:
 - db/migrate/20211206054756_add_year_to_follow_ups.rb
 - db/migrate/20211214100803_create_customer_extensions.rb
 - db/migrate/20211215025029_create_educode_sales_customer_follows.rb
+- db/migrate/20211220102720_add_position_to_commons.rb
+- db/migrate/20211221075146_add_school_id_to_educode_sales_businesses.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb