scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting of stock consumption on tasks [SCI-6737] (#4050)

Browse source
This commit is contained in:
Alex Kriuchykhin 2022-04-25 13:08:33 +02:00 committed by GitHub
parent 957e79f46a
commit 49bc361dee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/helpers/repository_datatable_helper.rb
View file

@ -68,6 +68,12 @@ module RepositoryDatatableHelper
if options[:include_stock_consumption] && record.repository.has_stock_management? && options[:my_module]
consumption_managable = stock_consumption_managable?(record, repository, options[:my_module])
consumed_stock_formatted =
number_with_precision(
record.consumed_stock,
precision: (record.repository.repository_stock_column.metadata['decimals'].to_i || 0),
strip_insignificant_zeros: true
)
row['consumedStock'] = {
stock_present: stock_present,
consumptionPermitted: stock_consumption_permitted?(repository, options[:my_module]),
@ -80,7 +86,7 @@ module RepositoryDatatableHelper
value: {
consumed_stock: record.consumed_stock,
consumed_stock_formatted:
"#{record.consumed_stock || 0} #{record.repository_stock_value&.repository_stock_unit_item&.data}"
"#{consumed_stock_formatted || 0} #{record.repository_stock_value&.repository_stock_unit_item&.data}"
}
}
end
@ -136,10 +142,16 @@ module RepositoryDatatableHelper
my_module, record.repository, row_id: record.id
)
end
consumed_stock_formatted =
number_with_precision(
record.consumed_stock,
precision: (record.repository.repository_stock_column.metadata['decimals'].to_i || 0),
strip_insignificant_zeros: true
)
row['consumedStock'][:value] = {
consumed_stock: record.consumed_stock,
consumed_stock_formatted:
"#{record.consumed_stock || 0} #{record.repository_stock_value&.repository_stock_unit_item&.data}"
"#{consumed_stock_formatted || 0} #{record.repository_stock_value&.repository_stock_unit_item&.data}"
}
end