From b6e34266f9f690deddcb4d2efff824c1713513f1 Mon Sep 17 00:00:00 2001 From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Date: Fri, 1 Apr 2022 13:59:44 +0200 Subject: [PATCH] Update repository card view for stock [SCI-6685] (#3982) Co-authored-by: Anton --- .../_repository_row_info_modal.html.erb | 22 ++++++++++++------- config/locales/en.yml | 2 ++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/views/repositories/_repository_row_info_modal.html.erb b/app/views/repositories/_repository_row_info_modal.html.erb index e3359f13a..2a8a7fbeb 100644 --- a/app/views/repositories/_repository_row_info_modal.html.erb +++ b/app/views/repositories/_repository_row_info_modal.html.erb @@ -34,14 +34,20 @@ <% @repository_row.repository_cells.each do |repository_cell| %>
- - <%= t 'repository_row.modal_info.column_name', cf: repository_cell.repository_column.name %> - <% if repository_cell.value_type == 'RepositoryAssetValue' %> - <%= render partial: 'assets/asset_link', locals: { asset: repository_cell.value.asset, display_image_tag: false }, formats: :html %> - <% else %> - <%= custom_auto_link(repository_cell.value.formatted, simple_format: false, team: current_team) %> - <% end %> - + <% if repository_cell.value_type == 'RepositoryStockValue' %> + <%= t('repository_row.modal_info.amount', value: repository_cell.value.formatted_value ) %> +
+ <%= t('repository_row.modal_info.unit', unit: repository_cell.value.repository_stock_unit_item&.data ) %> + <% else %> + + <%= t 'repository_row.modal_info.column_name', cf: repository_cell.repository_column.name %> + <% if repository_cell.value_type == 'RepositoryAssetValue' %> + <%= render partial: 'assets/asset_link', locals: { asset: repository_cell.value.asset, display_image_tag: false }, formats: :html %> + <% else %> + <%= custom_auto_link(repository_cell.value.formatted, simple_format: false, team: current_team) %> + <% end %> + + <% end %> <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 5980d2164..3259a6926 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1867,6 +1867,8 @@ en: title: "This item is assigned to %{nr} tasks." private_tasks: "%{nr} task(s) are private and will not be displayed." no_tasks: "This item in not assigned to any task." + amount: "Amount: %{value}" + unit: "Unit: %{unit}" modal_print_label: head_title: "Print label - %{repository_row}" head_title_multiple: "Print label - %{repository_rows} rows"