scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-23 15:24:57 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4039 from aignatov-bio/ai-sci-6744-fix-default-units

Browse source 
Fix default stock column default units selection [SCI-6744]
This commit is contained in:
aignatov-bio 2022-04-20 14:56:19 +02:00 committed by GitHub
commit 159180d8b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
app/assets/javascripts/repository_columns/columns_initializers/stock_column_type.js
View file

@ -16,6 +16,16 @@ var RepositoryStockColumnType = (function() {
});
}
function syncSelectedUnits() {
RepositoryListColumnType.refreshPreviewDropdownList(
previewContainer,
itemsTextarea,
delimiterDropdown,
dropdownOptions,
GLOBAL_CONSTANTS.REPOSITORY_STOCK_UNIT_ITEMS_PER_COLUMN
);
}
function initDropdownItemsTextArea() {
var $manageModal = $(manageModal);
@ -24,24 +34,12 @@ var RepositoryStockColumnType = (function() {
setTimeout(() => { initStockUnitDropdown(); }, 200);
})
.on('change keyup paste', itemsTextarea, function() {
RepositoryListColumnType.refreshPreviewDropdownList(
previewContainer,
itemsTextarea,
delimiterDropdown,
dropdownOptions,
GLOBAL_CONSTANTS.REPOSITORY_LIST_ITEMS_PER_COLUMN
);
syncSelectedUnits();
$('.changing-existing-stock-units-warning').removeClass('hidden');
initStockUnitDropdown();
})
.on('columnModal::partialLoadedForRepositoryStockValue', function() {
RepositoryListColumnType.refreshPreviewDropdownList(
previewContainer,
itemsTextarea,
delimiterDropdown,
dropdownOptions,
GLOBAL_CONSTANTS.REPOSITORY_STOCK_UNIT_ITEMS_PER_COLUMN
);
syncSelectedUnits();
initStockUnitDropdown();
});
}
@ -62,9 +60,10 @@ var RepositoryStockColumnType = (function() {
return count <= GLOBAL_CONSTANTS.REPOSITORY_STOCK_UNIT_ITEMS_PER_COLUMN;
},
loadParams: () => {
var repositoryColumnParams = {};
var options = JSON.parse($(dropdownOptions).val());
var decimals = $('.stock-column-type #decimals').val();
let repositoryColumnParams = {};
syncSelectedUnits();
let options = JSON.parse($(dropdownOptions).val());
let decimals = $('.stock-column-type #decimals').val();
repositoryColumnParams.repository_stock_unit_items_attributes = options;
repositoryColumnParams.metadata = { decimals: decimals };
return repositoryColumnParams;