raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-27 06:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change UX to transform from fields_to_hide to fields_to_show

Browse Source 
Fill `params[:fields_to_show]` with its default value
This commit is contained in:
Jean-Baptiste Bellet
2022-05-18 10:59:58 +02:00
parent 9094a65ab6
commit a46416a98e
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/admin/reports_controller.rb
View File

@@ -46,6 +46,7 @@ module Admin
# Initialize data # Initialize data
params[:display_summary_row] = true if request.get? params[:display_summary_row] = true if request.get?
params[:fields_to_show] = @report.columns.keys if request.get?
@data = Reporting::FrontendData.new(spree_current_user) @data = Reporting::FrontendData.new(spree_current_user)
end end

4
app/views/admin/reports/_rendering_options.html.haml
View File

@@ -19,9 +19,9 @@
- if @report.available_headers.present? - if @report.available_headers.present?
.row .row
.alpha.two.columns= label_tag nil, t(:report_hide_columns) .alpha.two.columns= label_tag nil, t(:report_columns)
.omega.fourteen.columns .omega.fourteen.columns
= select_tag(:fields_to_hide, options_for_select(@report.available_headers, params[:fields_to_hide]), = select_tag(:fields_to_show, options_for_select(@report.available_headers, params[:fields_to_show]),
class: "select2 fullwidth", multiple: true) class: "select2 fullwidth", multiple: true)
.row.rendering-options .row.rendering-options

2
config/locales/en.yml
View File

@@ -2625,7 +2625,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using
report_payment_totals: 'Payment Totals' report_payment_totals: 'Payment Totals'
report_all: 'all' report_all: 'all'
report_order_cycle: "Order Cycle" report_order_cycle: "Order Cycle"
report_hide_columns: Columns to Hide report_columns: Columns
report_enterprises: "Enterprises" report_enterprises: "Enterprises"
report_enterprise_fee: "Fees Names" report_enterprise_fee: "Fees Names"
report_users: "Users" report_users: "Users"

2
spec/controllers/admin/reports_controller_spec.rb
View File

@@ -250,6 +250,7 @@ describe Admin::ReportsController, type: :controller do
.and_return(report = double(:report)) .and_return(report = double(:report))
allow(report).to receive(:table_headers).and_return [] allow(report).to receive(:table_headers).and_return []
allow(report).to receive(:table_rows).and_return [] allow(report).to receive(:table_rows).and_return []
allow(report).to receive(:columns).and_return({})
spree_get :show, report_type: :products_and_inventory, test: "foo" spree_get :show, report_type: :products_and_inventory, test: "foo"
expect(assigns(:report)).to eq(report) expect(assigns(:report)).to eq(report)
end end
@@ -300,6 +301,7 @@ describe Admin::ReportsController, type: :controller do
.and_return(report = double(:report)) .and_return(report = double(:report))
allow(report).to receive(:table_headers).and_return [] allow(report).to receive(:table_headers).and_return []
allow(report).to receive(:table_rows).and_return [] allow(report).to receive(:table_rows).and_return []
allow(report).to receive(:columns).and_return({})
spree_get :show, report_type: :customers, test: "foo" spree_get :show, report_type: :customers, test: "foo"
expect(assigns(:report)).to eq(report) expect(assigns(:report)).to eq(report)
end end