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

Fixed full view assigned items modal stock consumption (#3846)

Browse source
This commit is contained in:
artoscinote 2022-02-14 10:42:48 +01:00 committed by GitHub
parent ba4e6476b7
commit af011a3bb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/my_modules/repositories.js
View file

@ -21,7 +21,7 @@ var MyModuleRepositories = (function() {
{
visible: true,
searchable: false,
data: otherColumnCount + 1
data: 'consumedStock'
}
];
}
@ -75,9 +75,7 @@ var MyModuleRepositories = (function() {
});
if ($(tableContainer).data('stock-management')) {
let column = stockManagementColumns(columns.length)[1];
column.data -= 1;
columns.push(column);
columns.push(stockManagementColumns(columns.length)[1]);
}
return columns;

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

@ -205,8 +205,8 @@ $.fn.dataTable.render.RepositoryStockValue = function(data, row) {
</span>`;
};
$.fn.dataTable.render.RepositoryConsumedStockValue = function(data) {
if (data.value) {
$.fn.dataTable.render.RepositoryConsumedStockValue = function(data = {}) {
if (data.value && data.value.consumed_stock !== null) {
if (data.consumption_managable) {
return `<a href="${data.updateStockConsumptionUrl}" class="manage-repository-consumed-stock-value-link stock-value-view-render">
${data.value.consumed_stock} ${data.value.unit || ''}

25
app/helpers/repository_datatable_helper.rb
View file

@ -54,20 +54,21 @@ module RepositoryDatatableHelper
end
if options[:include_stock_consumption] && record.repository.has_stock_management? && options[:my_module]
row[(default_cells.length + custom_cells.length + 1).to_s] =
if record.repository_stock_cell.present?
display_cell_value(record.repository_stock_cell, record.repository.team)
end
row[(default_cells.length + custom_cells.length + 2).to_s] = {
stock_present: record.repository_stock_cell.present?,
stock_present = record.repository_stock_cell.present?
consumption_managable =
stock_present && record.repository.is_a?(Repository) && can_update_my_module_stock_consumption?(options[:my_module])
row['consumedStock'] = {
stock_present: stock_present,
consumption_managable: consumption_managable,
updateStockConsumptionUrl: Rails.application.routes.url_helpers.consume_modal_my_module_repository_path(
options[:my_module],
record.repository,
row_id: record.id
),
value: {
consumed_stock_formatted: record.consumed_stock,
unit: record.repository_stock_value.repository_stock_unit_item&.data
consumed_stock: record.consumed_stock,
unit: record.repository_stock_value&.repository_stock_unit_item&.data
}
}
end
@ -94,26 +95,26 @@ module RepositoryDatatableHelper
row['1'] = stock_present ? display_cell_value(record.repository_stock_cell, record.repository.team) : {}
row['1'][:stock_managable] = stock_managable
row['2'] = {
row['consumedStock'] = {
stock_present: stock_present,
consumption_managable: consumption_managable
}
if record.repository.is_a?(RepositorySnapshot)
if record.repository_stock_consumption_value.present?
row['2'][:value] = {
row['consumedStock'][:value] = {
consumed_stock: record.repository_stock_consumption_value.amount,
unit: record.repository_stock_consumption_value.repository_stock_unit_item&.data
}
end
else
if consumption_managable
row['2'][:updateStockConsumptionUrl] =
row['consumedStock'][:updateStockConsumptionUrl] =
Rails.application.routes.url_helpers.consume_modal_my_module_repository_path(
my_module, record.repository, row_id: record.id
)
end
if record.consumed_stock.present?
row['2'][:value] = {
row['consumedStock'][:value] = {
consumed_stock: record.consumed_stock,
unit: record.repository_stock_value&.repository_stock_unit_item&.data
}