educode_sales 0.4.8 → 0.5.2

data/config/routes.rb

@@ -61,6 +61,9 @@ EducodeSales::Engine.routes.draw do
       get :show_follow_record
       get :edit_follow_record
       get :edit_plan
+      get :file
+      get :time_line
+      get :upload_file
     end
 
     member do
@@ -74,6 +77,21 @@ EducodeSales::Engine.routes.draw do
   resources :places do
   end
 
+  resources :recycles do
+    collection do
+      get :monthly
+      get :weekly
+      get :monthPlan
+      get :weekPlan
+      get :business
+    end
+    member do
+      get :restore_plans
+      get :restore_reports
+      get :restore_businesses
+    end
+  end
+
   resources :plans do
     collection do
       get :new_week
@@ -115,6 +133,15 @@ EducodeSales::Engine.routes.draw do
 
   resources :import_teachers
 
+  resources :upload_files do
+    collection do
+      get :download
+    end
+
+    member do
+    end
+  end
+
   resources :teachers do
     collection do
       get :import
@@ -176,6 +203,9 @@ EducodeSales::Engine.routes.draw do
   end
 
   resources :roles do
+    collection do
+      get :rename
+    end
     member do
       put :view
       put :update_role

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -26,6 +26,9 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       EducodeSales::Permission.create(name: '编辑计划', subject: 'SalePlan', action: 'update', clazz: 'sale_plan')
       EducodeSales::Permission.create(name: '删除计划', subject: 'SalePlan', action: 'destroy', clazz: 'sale_plan')
       EducodeSales::Permission.create(name: '审查报告', subject: 'SaleReport', action: 'audit', clazz: 'sale_plan')
+      EducodeSales::Permission.create(name: '填写大区意见', subject: 'SaleReport', action: 'level1_audit', clazz: 'sale_plan')
+      EducodeSales::Permission.create(name: '填写总监意见', subject: 'SaleReport', action: 'level2_audit', clazz: 'sale_plan')
+      EducodeSales::Permission.create(name: '填写副总意见', subject: 'SaleReport', action: 'level3_audit', clazz: 'sale_plan')
 
       EducodeSales::Permission.create(name: '查看渠道', subject: 'Place', action: 'read', clazz: 'place')
       EducodeSales::Permission.create(name: '添加渠道', subject: 'Place', action: 'create', clazz: 'place')
@@ -52,6 +55,9 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       EducodeSales::Permission.create(name: '编辑计划', subject: 'OperationPlan', action: 'update', clazz: 'operation_plan')
       EducodeSales::Permission.create(name: '删除计划', subject: 'OperationPlan', action: 'destroy', clazz: 'operation_plan')
       EducodeSales::Permission.create(name: '审查报告', subject: 'OperationReport', action: 'audit', clazz: 'operation_plan')
+      EducodeSales::Permission.create(name: '填写大区意见', subject: 'OperationReport', action: 'level1_audit', clazz: 'operation_plan')
+      EducodeSales::Permission.create(name: '填写总监意见', subject: 'OperationReport', action: 'level2_audit', clazz: 'operation_plan')
+      EducodeSales::Permission.create(name: '填写副总意见', subject: 'OperationReport', action: 'level3_audit', clazz: 'operation_plan')
 
       EducodeSales::Permission.create(name: '查看活动', subject: 'Activity', action: 'read', clazz: 'activity')
       EducodeSales::Permission.create(name: '添加活动', subject: 'Activity', action: 'create', clazz: 'activity')

data/db/migrate/20211102085743_add_bidded_date_educode_sales_follow_ups.rb

@@ -0,0 +1,6 @@
+class AddBiddedDateEducodeSalesFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :bidded_date, :date
+    add_column :educode_sales_follow_ups, :signed_date, :date
+  end
+end

data/db/migrate/20211109015617_create_educode_sales_recycles.rb

@@ -0,0 +1,25 @@
+class CreateEducodeSalesRecycles < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_recycles do |t|
+      t.string :source_type
+      t.integer :source_id
+      t.integer :deleter_id
+
+      t.timestamps
+    end
+    add_column :educode_sales_businesses, :deleted_at, :datetime
+    add_column :educode_sales_follow_ups, :deleted_at, :datetime
+    add_column :educode_sales_sale_plans, :deleted_at, :datetime
+    add_column :educode_sales_sale_reports, :deleted_at, :datetime
+    add_column :educode_sales_operation_plans, :deleted_at, :datetime
+    add_column :educode_sales_operation_reports, :deleted_at, :datetime
+    add_column :educode_sales_teachers, :deleted_at, :datetime
+    add_column :educode_sales_activities, :deleted_at, :datetime
+    add_column :educode_sales_money_plans, :deleted_at, :datetime
+    add_column :educode_sales_place_areas, :deleted_at, :datetime
+    add_column :educode_sales_places, :deleted_at, :datetime
+    add_column :educode_sales_teacher_follows, :deleted_at, :datetime
+    add_column :educode_sales_staffs, :deleted_at, :datetime
+    
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.4.8'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.2
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,7 @@ files:
 - app/assets/images/educode_sales/loading-2.gif
 - app/assets/images/educode_sales/loginbg.png
 - app/assets/images/educode_sales/logo.png
+- app/assets/images/educode_sales/回收站.png
 - app/assets/javascripts/educode_sales/application.js
 - app/assets/javascripts/educode_sales/extent/miniPage.js
 - app/assets/javascripts/educode_sales/extent/request.js
@@ -145,6 +146,7 @@ files:
 - app/controllers/educode_sales/operations_controller.rb
 - app/controllers/educode_sales/places_controller.rb
 - app/controllers/educode_sales/plans_controller.rb
+- app/controllers/educode_sales/recycles_controller.rb
 - app/controllers/educode_sales/roles_controller.rb
 - app/controllers/educode_sales/sale_reports_controller.rb
 - app/controllers/educode_sales/sale_trends_controller.rb
@@ -153,6 +155,7 @@ files:
 - app/controllers/educode_sales/staffs_controller.rb
 - app/controllers/educode_sales/teacher_follows_controller.rb
 - app/controllers/educode_sales/teachers_controller.rb
+- app/controllers/educode_sales/upload_files_controller.rb
 - app/helpers/educode_sales/activities_helper.rb
 - app/helpers/educode_sales/application_helper.rb
 - app/helpers/educode_sales/business_helper.rb
@@ -162,6 +165,7 @@ files:
 - app/jobs/educode_sales/application_job.rb
 - app/mailers/educode_sales/application_mailer.rb
 - app/models/ability.rb
+- app/models/concerns/deletable.rb
 - app/models/educode_sales/activity.rb
 - app/models/educode_sales/activity_teacher.rb
 - app/models/educode_sales/application_record.rb
@@ -179,6 +183,7 @@ files:
 - app/models/educode_sales/permission.rb
 - app/models/educode_sales/place.rb
 - app/models/educode_sales/place_area.rb
+- app/models/educode_sales/recycle.rb
 - app/models/educode_sales/role.rb
 - app/models/educode_sales/role_area.rb
 - app/models/educode_sales/role_permission.rb
@@ -196,6 +201,7 @@ files:
 - app/views/educode_sales/businesses/edit.html.erb
 - app/views/educode_sales/businesses/edit_follow_record.html.erb
 - app/views/educode_sales/businesses/edit_plan.html.erb
+- app/views/educode_sales/businesses/file.html.erb
 - app/views/educode_sales/businesses/index.html.erb
 - app/views/educode_sales/businesses/index.json.jbuilder
 - app/views/educode_sales/businesses/new.html.erb
@@ -204,7 +210,9 @@ files:
 - app/views/educode_sales/businesses/show_follow.json.jbuilder
 - app/views/educode_sales/businesses/show_follow_record.html.erb
 - app/views/educode_sales/businesses/show_keys.html.erb
+- app/views/educode_sales/businesses/time_line.html.erb
 - app/views/educode_sales/businesses/unfinish_plans.json.jbuilder
+- app/views/educode_sales/businesses/upload_file.html.erb
 - app/views/educode_sales/commons/edit.html.erb
 - app/views/educode_sales/commons/index.html.erb
 - app/views/educode_sales/commons/index.json.jbuilder
@@ -274,10 +282,22 @@ files:
 - app/views/educode_sales/plans/show_monthly.html.erb
 - app/views/educode_sales/plans/show_week.html.erb
 - app/views/educode_sales/plans/show_weekly.html.erb
+- app/views/educode_sales/recycles/_business.html.erb
+- app/views/educode_sales/recycles/_monthPlan.html.erb
+- app/views/educode_sales/recycles/_monthly.html.erb
+- app/views/educode_sales/recycles/_weekPlan.html.erb
+- app/views/educode_sales/recycles/_weekly.html.erb
+- app/views/educode_sales/recycles/business.json.jbuilder
+- app/views/educode_sales/recycles/index.html.erb
+- app/views/educode_sales/recycles/monthPlan.json.jbuilder
+- app/views/educode_sales/recycles/monthly.json.jbuilder
+- app/views/educode_sales/recycles/weekPlan.json.jbuilder
+- app/views/educode_sales/recycles/weekly.json.jbuilder
 - app/views/educode_sales/roles/edit.html.erb
 - app/views/educode_sales/roles/index.html.erb
 - app/views/educode_sales/roles/index.json.jbuilder
 - app/views/educode_sales/roles/new.html.erb
+- app/views/educode_sales/roles/rename.html.erb
 - app/views/educode_sales/sale_reports/audit.html.erb
 - app/views/educode_sales/sale_reports/edit.html.erb
 - app/views/educode_sales/sale_reports/index.json.jbuilder
@@ -285,6 +305,7 @@ files:
 - app/views/educode_sales/sale_reports/show.html.erb
 - app/views/educode_sales/sale_trends/operations.html.erb
 - app/views/educode_sales/sale_trends/trends.html.erb
+- app/views/educode_sales/sale_trends/trends.json.jbuilder
 - app/views/educode_sales/sales/index.html.erb
 - app/views/educode_sales/sales/index.json.jbuilder
 - app/views/educode_sales/sales/operations.html.erb
@@ -318,6 +339,7 @@ files:
 - app/views/educode_sales/teachers/show_follow.json.jbuilder
 - app/views/educode_sales/teachers/show_follow_record.html.erb
 - app/views/educode_sales/teachers/unfinish_plans.json.jbuilder
+- app/views/educode_sales/upload_files/index.json.jbuilder
 - app/views/layouts/educode_sales/application.html.erb
 - app/views/layouts/educode_sales/login.html.erb
 - config/locales/sale.zh-CN.yml
@@ -353,6 +375,8 @@ files:
 - db/migrate/20211013060712_create_educode_sales_assign_follow_ups.rb
 - db/migrate/20211018054256_add_extras_to_commons.rb
 - db/migrate/20211022085324_add_teacher_used_to_teachers.rb
+- db/migrate/20211102085743_add_bidded_date_educode_sales_follow_ups.rb
+- db/migrate/20211109015617_create_educode_sales_recycles.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb