scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 17:51:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Small fixes for inventory import [SCI-10797][SCI-10791]

Browse source
This commit is contained in:
Anton 2024-06-24 13:22:57 +02:00
parent 6cd68e6c09
commit 323e40dd2e
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/javascript/vue/repositories/modals/import/mapping_step_table_row.vue
View file

@ -22,6 +22,7 @@
@change="changeSelected"
:clearable="true"
:size="'sm'"
class="max-w-96"
:class="{
'outline-sn-alert-brittlebush outline-1 outline rounded': matchNotFound
}"

4
app/javascript/vue/repositories/modals/import/upload_step.vue
View file

@ -23,7 +23,7 @@
</a>
</div>
</div>
<div class="modal-content grow" :class="{'!rounded-s-none': showingInfo}">
<div class="modal-content grow flex flex-col" :class="{'!rounded-s-none': showingInfo}">
<div class="modal-header gap-4">
<button type="button" class="close" data-dismiss="modal" aria-label="Close" data-e2e="e2e-BT-newInventoryModal-close">
<i class="sn-icon sn-icon-close"></i>
@ -36,7 +36,7 @@
{{ i18n.t('repositories.import_records.steps.step1.title') }}
</h4>
</div>
<div class="modal-body">
<div class="modal-body flex flex-col grow">
<p class="text-sn-dark-grey">
{{ this.i18n.t('repositories.import_records.steps.step1.subtitle') }}
</p>

10
app/javascript/vue/shared/select_dropdown.vue
View file

@ -52,8 +52,8 @@
</div>
</div>
<i v-if="canClear" @click="clear" class="sn-icon ml-auto sn-icon-close"></i>
<i v-else class="sn-icon ml-auto"
:class="{ 'sn-icon-down': !isOpen, 'sn-icon-up': isOpen, 'text-sn-grey': disabled}"></i>
<i v-else class="sn-icon ml-auto" @click="handleClickArrow"
:class="{ 'sn-icon-down pointer-events-none': !isOpen, 'sn-icon-up': isOpen, 'text-sn-grey': disabled}"></i>
</div>
<template v-if="isOpen">
<teleport to="body">
@ -394,6 +394,12 @@ export default {
const normalizedObj1 = Object.fromEntries(Object.entries(o1).sort(([k1], [k2]) => k1.localeCompare(k2)));
const normalizedObj2 = Object.fromEntries(Object.entries(o2).sort(([k1], [k2]) => k1.localeCompare(k2)));
return JSON.stringify(normalizedObj1) === JSON.stringify(normalizedObj2);
},
handleClickArrow(e) {
if (this.isOpen) {
e.stopPropagation();
this.close();
}
}
}
};

1
config/locales/en.yml
View file

@ -2239,6 +2239,7 @@ en:
RepositoryDateTimeRangeValue: 'Date-time range'
RepositoryDateTimeValue: 'Date-time'
RepositoryDateValue: 'Date'
RepositoryTimeValue: 'Time'
RepositoryListValue: 'List'
RepositoryStatusValue: 'Status'
RepositoryStockValue: 'Stock'