scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-26 09:43:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

Switch input type to text for Numbers in repositories [SCI-4258]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2020-01-17 16:04:19 +01:00
parent 16724f622c
commit fa0bff93ff
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/repositories/renderers/edit_renderers.js
View file

@ -133,17 +133,23 @@ $.fn.dataTable.render.editRepositoryChecklistValue = function(formId, columnId,
ChecklistColumnHelper.initialChecklistEditMode(formId, columnId, $cell, currentValue);
};
$.fn.dataTable.render.editRepositoryNumberValue = function(formId, columnId, cell) {
$.fn.dataTable.render.editRepositoryNumberValue = function(formId, columnId, cell, $header) {
let $cell = $(cell.node());
let decimals = $header.data('metadata-decimals');
let number = $cell.find('.number-value').data('value');
if (!number) number = '';
$cell.html(`
<div class="sci-input-container text-field">
<input class="sci-input-field"
form="${formId}"
type="number"
type="text"
oninput="this.value = this.value.replace(/[^0-9.]/g, '');
this.value = this.value.match(/^\\d*(\\.\\d{0,${decimals}})?/)[0];"
name="repository_cells[${columnId}]"
placeholder="${I18n.t('repositories.table.number.enter_number')}"
value="${$cell.find('.number-value').data('value')}"
value="${number}"
data-type="RepositoryNumberValue">
</div>`);
};

8
app/assets/javascripts/repositories/renderers/new_renderers.js
View file

@ -64,12 +64,16 @@ $.fn.dataTable.render.newRepositoryChecklistValue = function(formId, columnId, $
ChecklistColumnHelper.initialChecklistEditMode(formId, columnId, $cell);
};
$.fn.dataTable.render.newRepositoryNumberValue = function(formId, columnId, $cell) {
$.fn.dataTable.render.newRepositoryNumberValue = function(formId, columnId, $cell, $header) {
let decimals = $header.data('metadata-decimals');
$cell.html(`
<div class="sci-input-container text-field">
<input class="sci-input-field"
form="${formId}"
type="number"
type="text"
oninput="this.value = this.value.replace(/[^0-9.]/g, '');
this.value = this.value.match(/^\\d*(\\.\\d{0,${decimals}})?/)[0];"
name="repository_cells[${columnId}]"
value=""
placeholder="${I18n.t('repositories.table.number.enter_number')}"

4
app/serializers/repository_datatable/repository_number_value_serializer.rb
View file

@ -3,8 +3,8 @@
module RepositoryDatatable
class RepositoryNumberValueSerializer < RepositoryBaseValueSerializer
def value
decimal_number = scope[:column].metadata.fetch('decimals') { Constants::REPOSITORY_NUMBER_TYPE_DEFAULT_DECIMALS }
BigDecimal(object.data).round(decimal_number.to_i)
decimals = scope[:column].metadata.fetch('decimals', Constants::REPOSITORY_NUMBER_TYPE_DEFAULT_DECIMALS).to_i
object.data.round(decimals).to_s('F').remove(/.0+$/)
end
end
end