raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12307 from Matt-Yorkley/report-form-loading

Browse Source 
Don't generate packing reports twice just to show the form
This commit is contained in:
Filipe
2024-03-26 12:42:45 +00:00
committed by GitHub
parent 6240f37adf fc1b686938
commit 7be06fc38c
5 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/reporting/report_headers_builder.rb
View File

@@ -11,13 +11,13 @@ module Reporting
def table_headers
filter = proc { |key| key.to_sym.in?(fields_to_show) }
report.columns.keys.filter { |key| filter.call(key) }.map do |key|
report.table_columns.keys.filter { |key| filter.call(key) }.map do |key|
translate_header(key)
end
end
def available_headers
report.columns.keys.map { |key| [translate_header(key), key] }
report.table_columns.keys.map { |key| [translate_header(key), key] }
end
def fields_to_hide

4
lib/reporting/report_template.rb
View File

@@ -54,6 +54,10 @@ module Reporting
raise NotImplementedError
end
def table_columns
columns
end
# Exple { total_price: :currency }
def columns_format
{}

11
lib/reporting/reports/packing/customer.rb
View File

@@ -4,11 +4,16 @@ module Reporting
module Reports
module Packing
class Customer < Base
def table_columns
Struct.new(:keys).new(
[:hub, :customer_code, :first_name, :last_name, :phone, :supplier, :product,
:variant, :weight, :height, :width, :depth, :quantity, :price, :temp_controlled]
)
end
def columns
# Reorder default columns
super.slice(:hub, :customer_code, :first_name, :last_name, :phone,
:supplier, :product, :variant, :weight, :height, :width, :depth, :quantity,
:price, :temp_controlled)
super.slice(*table_columns.keys)
end
def rules

11
lib/reporting/reports/packing/product.rb
View File

@@ -4,11 +4,16 @@ module Reporting
module Reports
module Packing
class Product < Base
def table_columns
Struct.new(:keys).new(
[:hub, :supplier, :product, :variant, :customer_code, :first_name,
:last_name, :phone, :quantity, :price, :temp_controlled]
)
end
def columns
# Reorder default columns
super.slice(:hub, :supplier, :product, :variant,
:customer_code, :first_name, :last_name, :phone,
:quantity, :price, :temp_controlled)
super.slice(*table_columns.keys)
end
def rules

10
lib/reporting/reports/packing/supplier.rb
View File

@@ -4,10 +4,16 @@ module Reporting
module Reports
module Packing
class Supplier < Base
def table_columns
Struct.new(:keys).new(
[:hub, :supplier, :customer_code, :first_name, :last_name, :phone,
:product, :variant, :quantity, :price, :temp_controlled]
)
end
def columns
# Reorder default columns
super.slice(:hub, :supplier, :customer_code, :first_name, :last_name, :phone,
:product, :variant, :quantity, :price, :temp_controlled)
super.slice(*table_columns.keys)
end
def rules