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

Merge pull request #4023 from aignatov-bio/ai-sci-6735-fix-stock-consumption-in-reports

Browse source 
Fix stock consumption in reports [SCI-6735]
This commit is contained in:
aignatov-bio 2022-04-14 14:51:38 +02:00 committed by GitHub
parent 30ee6cd40c c73dc5ea2f
commit 4f2fd79f67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/models/my_module.rb
View file

@ -300,15 +300,14 @@ class MyModule < ApplicationRecord
headers = [
I18n.t('repositories.table.id'),
I18n.t('repositories.table.row_name'),
I18n.t('repositories.table.added_by'),
I18n.t('repositories.table.')
I18n.t('repositories.table.added_on'),
I18n.t('repositories.table.added_by')
]
data = []
rows = repository.assigned_rows(self).includes(:created_by).order(created_at: order)
if repository.has_stock_management?
headers.push(I18n.t('repositories.table.row_consumption'))
rows = rows.joins(:my_module_repository_rows, repository_stock_value: :repository_stock_unit_item)
.where(my_module_repository_rows: { my_module: self })
rows = rows.left_joins(my_module_repository_rows: :repository_stock_unit_item)
.select(
'repository_rows.*',
'my_module_repository_rows.stock_consumption',
@ -321,7 +320,14 @@ class MyModule < ApplicationRecord
row_json << (row.archived ? "#{row.name} [#{I18n.t('general.archived')}]" : row.name)
row_json << I18n.l(row.created_at, format: :full)
row_json << row.created_by.full_name
row_json << "#{row['stock_consumption'] || 0} #{row['stock_unit']}" if repository.has_stock_management?
if repository.has_stock_management?
if repository.is_a?(RepositorySnapshot)
consumed_stock = row.repository_stock_consumption_cell&.value&.formatted
row_json << (consumed_stock || 0)
else
row_json << "#{row['stock_consumption'] || 0} #{row['stock_unit']}"
end
end
data << row_json
end

2
app/services/reports/docx/draw_my_module_repository.rb
View file

@ -13,7 +13,7 @@ module Reports::Docx::DrawMyModuleRepository
return false unless repository_data[:rows].any? && can_read_repository?(@user, repository)
table = prepare_row_columns(repository_data, my_module)
table = prepare_row_columns(repository_data, my_module, repository)
@docx.p
@docx.p I18n.t('projects.reports.elements.module_repository.name',

13
app/services/reports/docx/repository_helper.rb
View file

@ -3,7 +3,7 @@
module Reports::Docx::RepositoryHelper
include InputSanitizeHelper
def prepare_row_columns(repository_data, my_module)
def prepare_row_columns(repository_data, my_module, repository)
result = [repository_data[:headers]]
repository_data[:rows].each do |record|
row = []
@ -16,9 +16,14 @@ module Reports::Docx::RepositoryHelper
custom_cells = record.repository_cells
custom_cells.each do |cell|
if cell.value.instance_of? RepositoryStockValue
consumption = record.my_module_repository_rows.find_by(my_module: my_module).stock_consumption || 0
unit = cell.value.repository_stock_unit_item&.data
cell_values[cell.repository_column_id] = "#{consumption} #{unit}"
if repository.is_a?(RepositorySnapshot)
consumed_stock = record.repository_stock_consumption_cell&.value&.formatted || 0
cell_values[cell.repository_column_id] = consumed_stock
else
consumption = record.my_module_repository_rows.find_by(my_module: my_module)&.stock_consumption || 0
unit = cell.value.repository_stock_unit_item&.data
cell_values[cell.repository_column_id] = "#{consumption} #{unit}"
end
else
cell_values[cell.repository_column_id] = cell.value.formatted
end