scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-05 20:54:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

Stock / stock consumption display fixes [SCI-6771] (#4054)

Browse source
This commit is contained in:
artoscinote 2022-04-25 15:23:12 +02:00 • committed by GitHub
parent 49bc361dee
commit da8250dba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/repositories/renderers/view_renderers.js
View file

@ -209,7 +209,7 @@ $.fn.dataTable.render.RepositoryStockValue = function(data) {
</a>`;
}
return `<span class="stock-value-view-render
${data.stock_managable !== undefined ? `stock-${data.stock_status}` : ''}">
${data.displayWarnings ? `stock-${data.stock_status}` : ''}">
${data.value.stock_formatted}
</span>`;
}
@ -231,18 +231,18 @@ $.fn.dataTable.render.defaultRepositoryStockValue = function() {
$.fn.dataTable.render.RepositoryStockConsumptionValue = function(data = {}) {
// covers case of snapshots
if (!data.stock_present && data.value && data.value.consumed_stock_formatted) {
if (!data.stock_present && data.value && data.value.consumed_stock !== null) {
return `<span class="empty-consumed-stock-render">${data.value.consumed_stock_formatted}</span>`;
}
if (!data.stock_present) {
return '<span class="empty-consumed-stock-render"> - </span>';
}
if (!data.consumptionManagable) {
if (!data.consumptionManagable && data.value && !data.value.consumed_stock) {
return `<span class="consumption-locked">
${I18n.t('libraries.manange_modal_column.stock_type.stock_consumption_locked')}
</span>`;
}
if (!data.consumptionPermitted) {
if (!data.consumptionPermitted || !data.consumptionManagable) {
return `<span class="empty-consumed-stock-render">${data.value.consumed_stock_formatted}</span>`;
}
if (!data.value.consumed_stock) {

23
app/helpers/repository_datatable_helper.rb
View file

@ -59,10 +59,8 @@ module RepositoryDatatableHelper
# always add stock cell, even if empty
row['stock'] = stock_present ? display_cell_value(record.repository_stock_cell, team, repository) : {}
row['stock'][:stock_managable] = stock_managable
if !options[:include_stock_consumption] || stock_consumption_permitted?(repository, options[:my_module])
row['stock'][:stock_status] = record.repository_stock_cell&.value&.status
end
row['stock']['displayWarnings'] = display_stock_warnings?(repository)
row['stock'][:stock_status] = record.repository_stock_cell&.value&.status
row['stock']['value_type'] = 'RepositoryStockValue'
@ -121,10 +119,8 @@ module RepositoryDatatableHelper
consumption_managable = stock_consumption_managable?(record, repository, my_module)
row['stock'] = stock_present ? display_cell_value(record.repository_stock_cell, record.repository.team, repository) : {}
if !options[:include_stock_consumption] || stock_consumption_permitted?(repository, my_module)
row['stock'][:stock_status] = record.repository_stock_cell&.value&.status
end
row['stock']['displayWarnings'] = display_stock_warnings?(repository)
row['stock'][:stock_status] = record.repository_stock_cell&.value&.status
row['stock'][:stock_managable] = stock_managable
if record.repository.is_a?(RepositorySnapshot)
@ -183,7 +179,12 @@ module RepositoryDatatableHelper
if options[:include_stock_consumption] && repository_snapshot.has_stock_management?
stock_present = record.repository_stock_cell.present?
row['stock'] = stock_present ? display_cell_value(record.repository_stock_cell, team, repository_snapshot) : {}
row['stock'] = if stock_present
display_cell_value(record.repository_stock_cell, team, repository_snapshot)
else
{ value_type: 'RepositoryStockValue' }
end
row['consumedStock'] =
if stock_present
display_cell_value(record.repository_stock_consumption_cell, team, repository_snapshot)
@ -289,4 +290,8 @@ module RepositoryDatatableHelper
true
end
def display_stock_warnings?(repository)
!repository.is_a?(RepositorySnapshot)
end
end