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

Merge pull request #7768 from aignatov-bio/ai-sci-10921-add-stock-column-to-storage-locations

Browse source 
Add stock to storage locations [SCI-10921]
This commit is contained in:
aignatov-bio 2024-07-31 11:38:16 +02:00 committed by GitHub
parent 6ad8120e0d b774c04f5b
commit cdc5e66e4a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/vue/storage_locations/container.vue
View file

@ -117,7 +117,7 @@ export default {
columnDefs() { columnDefs() {
const columns = [{ const columns = [{
field: 'position', field: 'position_formatted',
headerName: this.i18n.t('storage_locations.show.table.position'), headerName: this.i18n.t('storage_locations.show.table.position'),
sortable: true, sortable: true,
notSelectable: true, notSelectable: true,

14
app/serializers/lists/storage_location_repository_row_serializer.rb
View file

@ -4,7 +4,7 @@ module Lists
class StorageLocationRepositoryRowSerializer < ActiveModel::Serializer class StorageLocationRepositoryRowSerializer < ActiveModel::Serializer
include Canaid::Helpers::PermissionsHelper include Canaid::Helpers::PermissionsHelper
attributes :created_by, :created_on, :position, :row_id, :row_name, :hidden attributes :created_by, :created_on, :position, :row_id, :row_name, :hidden, :position_formatted, :stock
def row_id def row_id
object.repository_row.id unless hidden object.repository_row.id unless hidden
@ -19,13 +19,23 @@ module Lists
end end
def created_on def created_on
I18n.l(object.created_at, format: :full) I18n.l(object.created_at, format: :full) unless hidden
end end
def position def position
object.metadata['position'] object.metadata['position']
end end
def position_formatted
"#{('A'..'Z').to_a[position[0] - 1]}#{position[1]}" if position
end
def stock
if object.repository_row.repository.has_stock_management? && !hidden
object.repository_row.repository_cells.find_by(value_type: 'RepositoryStockValue')&.value&.formatted
end
end
def hidden def hidden
!can_read_repository?(object.repository_row.repository) !can_read_repository?(object.repository_row.repository)
end end