educode_sales 1.10.73 → 1.10.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15f942191d49adf14251131ca42b9b52f90632a87a66d39aec6fc35bc74003ff
-  data.tar.gz: 0bc063e437a008ac318812d7fed49b9c9e7536d4f0f5065685c90505ad3dd40b
+  metadata.gz: 5ec2d7381687c07a5b58b7ed90ffe76661f07306ce8a2f51f9039103395a7189
+  data.tar.gz: cc6976e822ae4f79e83b2520d2d1d4a5387589d41f3214b475b32afed729443c
 SHA512:
-  metadata.gz: 2c235442e8c83921301a06be4ea22a46bcd98acd1079691c8f1c0fd06da09e85529f3397e6d99af5b5390e68ee33c7c3a3822d684559686edb390f244b3d0b10
-  data.tar.gz: 6c519c179301c3f6b454fedc8149734d5f7e34a07b2e8e4c2ed6a19400d4431a42addae70ecf72a2ab6824867f74ea1070cfffbd48facb3628b2388fcd392da6
+  metadata.gz: fb92d32d8e635cd97e9da876a7309499326c43384ffa2b2d2678a041fed7c59f909da1c9b6e3280df85a5b387398b4dc4d84039def13ee4dc78a026e9c5565f1
+  data.tar.gz: 3db12b9e7401c2f915f0376cccc4d97fb64b0d7508c3677bf5121c0b8b9fc1a0740634efc31dc19fad989e87215371af9e8d62a067fb41c825c2ee1ce61035f6

data/app/controllers/educode_sales/activities_controller.rb

@@ -100,6 +100,66 @@ module EducodeSales
       end
     end
 
+    def import
+      render layout: false
+    end
+
+    def import_data
+      doc = SimpleXlsxReader.open(params[:file])
+
+      doc.sheets[0].rows.each_with_index do |d, i|
+        next if i == 0 || d[1].blank?
+        activity = @current_admin.activities.new({
+          name: d[0],
+          state_id: d[1],
+          clazz_id: d[2],
+          sponsor: d[5],
+          linkman: d[6],
+          phone: d[7],
+          scale: d[8],
+          address: d[9],
+          meeting_form: d[10],
+          start_at: d[13],
+          days: d[14]
+        })
+        activity.save
+        
+        if d[4].present?
+          # 生态经理
+          d[4].gsub(/、|,|，/, "_").split("_").each do |c|
+            staff = EducodeSales::Staff.joins(:user).where("users.lastname =?", c).first
+            EducodeSales::ActivityStaff.create(staff_id: staff.id, clazz_id: 'manage', activity_id: activity.id) if staff
+          end
+        end
+
+        if d[11].present?
+          # 协助人员
+          d[11].gsub(/、|,|，/, "_").split("_").each do |c|
+            u = User.find_by(lastname: c)
+            if u
+              EducodeSales::ActivityStaff.create(name: u.real_name, clazz_id: 'assist', user_id: u.id, activity_id: activity.id)
+            else
+              EducodeSales::ActivityStaff.create(name: c, clazz_id: 'assist', activity_id: activity.id)
+            end
+          end
+        end
+
+        if d[12].present?
+          # 邀请专家
+          d[12].gsub(/、|,|，/, "_").split("_").each do |c|
+            u = User.find_by(lastname: c)
+            if u
+              EducodeSales::ActivityStaff.create(name: u.real_name, clazz_id: 'invitation', user_id: u.id, activity_id: activity.id)
+            else
+              EducodeSales::ActivityStaff.create(name: c, clazz_id: 'invitation', activity_id: activity.id)
+            end
+          end
+        end
+      end
+
+      render_success
+    end
+
     def update
       activity = Activity.find(params[:id])
       activity.assign_attributes(

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

@@ -271,7 +271,7 @@
             });
           }
           else if (obj.event === 'import') {  //
-              var content = miniPage.getHrefContent('/missions/teachers/import');
+              var content = miniPage.getHrefContent('/missions/activities/import');
               var openWH = miniPage.getOpenWidthHeight();
               import_index = layer.open({
                   title: '导入数据',

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

@@ -0,0 +1,40 @@
+<div style="padding-left: 50px">
+  <button type="button" class="layui-btn" id="test3"><i class="layui-icon"></i>选择文件</button>
+</div>
+<script>
+layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
+  var form = layui.form,
+      layer = layui.layer,
+      table = layui.table,
+      laytpl = layui.laytpl,
+      upload = layui.upload,
+      request = layui.request,
+      $ = layui.$;
+  selectInput = layui.selectInput;
+
+  form.render();
+
+  //指定允许上传的文件类型
+  upload.render({
+      elem: '#test3'
+      ,url: '/missions/activities/import_data' //此处配置你自己的上传接口即可
+      ,accept: 'file', //普通文件
+          headers: {
+              'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
+          }
+      ,before: function(obj){ //obj参数包含的信息，跟 choose回调完全一致，可参见上文。
+          layer.load(); //上传loading
+      }
+      ,done: function(res){
+          layer.msg('导入成功');
+          table.reload('activities_table');
+          layer.close(parent.import_index)
+          layer.closeAll('loading'); //关闭loading
+      }
+      ,error: function(index, upload){
+          layer.closeAll('loading'); //关闭loading
+          layer.alert('导入失败，请检查文件格式')
+      }
+  });
+});
+</script>

data/config/routes.rb

@@ -432,6 +432,8 @@ EducodeSales::Engine.routes.draw do
       get :follow_ups
       post :add_advise
       get :upload_file
+      get :import
+      post :import_data
     end
     member do
       get :show_schools

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.73'
+  VERSION = '1.10.74'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.73
+  version: 1.10.74
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2023-09-27 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
@@ -291,6 +290,7 @@ files:
 - app/views/educode_sales/activities/files.html.erb
 - app/views/educode_sales/activities/files.json.jbuilder
 - app/views/educode_sales/activities/follow_ups.json.jbuilder
+- app/views/educode_sales/activities/import.html.erb
 - app/views/educode_sales/activities/index.html.erb
 - app/views/educode_sales/activities/index.json.jbuilder
 - app/views/educode_sales/activities/new.html.erb
@@ -813,7 +813,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -828,8 +828,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: []