diff --git a/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue b/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue index a4cddb759..3f6c18afb 100644 --- a/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue +++ b/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue @@ -34,7 +34,7 @@ class="font-inter text-base font-semibold leading-7 mb-4 transition-colors duration-300">{{ i18n.t('repositories.item_card.section.information') }} -
+
@@ -49,7 +49,8 @@
- {{ i18n.t('repositories.item_card.default_columns.id') + {{ + i18n.t('repositories.item_card.default_columns.id') }} {{ defaultColumns?.code }} @@ -79,6 +80,30 @@ {{ defaultColumns?.added_by }}
+ + +
+
+ {{ + i18n.t('repositories.item_card.default_columns.archived_on') + }} + + {{ defaultColumns.archived_on }} + +
+ + +
+
+ {{ + i18n.t('repositories.item_card.default_columns.archived_by') + }} + + {{ defaultColumns.archived_by.full_name }} + +
+ +
@@ -102,8 +127,8 @@ + :repositoryId="repository.id" :permissions="permissions" + @closeSidebar="toggleShowHideSidebar(null)" />
@@ -118,18 +143,19 @@
-
+
{{ i18n.t('repositories.item_card.section.assigned', { count: assignedModules ? assignedModules.total_assigned_size : 0 }) }} + :data-repository-row-id="repositoryRowId" @click="showRepositoryAssignModal"> {{ i18n.t('repositories.item_card.assigned.assign') }}
@@ -162,7 +188,8 @@
-
{{ i18n.t('repositories.item_card.section.qr') }}
+
{{ + i18n.t('repositories.item_card.section.qr') }}
@@ -188,7 +215,8 @@
-
@@ -329,7 +357,7 @@ export default { }); }, reload() { - if(this.isShowing) { + if (this.isShowing) { this.loadRepositoryRow(this.currentItemUrl); } }, @@ -339,7 +367,7 @@ export default { } }, generateBarCode(text) { - if(!text) return; + if (!text) return; const barCodeCanvas = bwipjs.toCanvas('bar-code-canvas', { bcid: 'qrcode', text, diff --git a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryChecklistValue.vue b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryChecklistValue.vue index 2504dbd83..d0c5eafd6 100644 --- a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryChecklistValue.vue +++ b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryChecklistValue.vue @@ -3,7 +3,7 @@
{{ colName }}
-
+
diff --git a/app/views/repository_rows/show.json.jbuilder b/app/views/repository_rows/show.json.jbuilder index 9c21c9893..76d915fd3 100644 --- a/app/views/repository_rows/show.json.jbuilder +++ b/app/views/repository_rows/show.json.jbuilder @@ -26,6 +26,10 @@ json.default_columns do json.added_on I18n.l(@repository_row.created_at, format: :full) json.added_by @repository_row.created_by&.full_name json.archived @repository_row.archived? + if @repository_row.archived? + json.archived_on I18n.l(@repository_row.archived_on, format: :full) + json.archived_by @repository_row.archived_by + end end json.custom_columns do diff --git a/config/locales/en.yml b/config/locales/en.yml index bf94d2aff..f59dd3017 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2242,6 +2242,8 @@ en: added_on: "Added on" added_at: "Added at" added_by: "Added by" + archived_on: "Archived on" + archived_by: "Archived by" reminders: stock_low: "Only %{stock_formated} left." stock_empty: "No stock left"