Skip to content

Commit

Permalink
test with impport
Browse files Browse the repository at this point in the history
  • Loading branch information
qinmingyuan committed Dec 6, 2023
1 parent 2c3acf7 commit 6050cd8
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
18 changes: 18 additions & 0 deletions app/controllers/datum/admin/table_lists_controller.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module Datum
class Admin::TableListsController < Panel::TableListsController
include Controller::Admin
before_action :set_data_list

def find
q_params = {}
Expand All @@ -12,5 +13,22 @@ def find
@table_items = @table_list.table_items.page(params[:page]).per(100)
end

def new_import
@table_list = @data_list.table_lists.build
end

def create_import
@table_list = @data_list.table_lists.build(file_params)
@table_list.save
#@table_list.import_to_table_list

@table_items = @table_list.table_items.page(params[:page]).per(100)
end

private
def set_data_list
@data_list = DataList.find_by data_table: params[:data_list_id]
end

end
end
6 changes: 1 addition & 5 deletions app/controllers/datum/panel/table_lists_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,7 @@ def set_table_list
end

def set_data_list
if /\d/.match? params[:data_list_id]
@data_list = DataList.find params[:data_list_id]
else
@data_list = DataList.find_by data_table: params[:data_list_id]
end
@data_list = DataList.find params[:data_list_id]
end

def table_list_params
Expand Down
5 changes: 5 additions & 0 deletions config/locales/en.controller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,8 @@ en:
title: Run
admin:
title: Reports
table_lists:
find:
title: Export
new_import:
title: Import
2 changes: 2 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
resources :table_lists do
collection do
match :find, via: [:get, :post]
match :new_import, via: [:get, :post]
post :create_import
end
member do
match :chart, via: [:get, :post]
Expand Down

0 comments on commit 6050cd8

Please sign in to comment.