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

(fix) Non decimal number in inventory table has commas [gl_SCI_10086]

Browse source
This commit is contained in:
Gregor Lasnibat 2024-01-29 14:36:57 +01:00
parent 4a13476b90
commit 71bbe02eba
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/repositories/renderers/view_renderers.js
View file

@ -162,9 +162,9 @@ $.fn.dataTable.render.defaultRepositoryNumberValue = function() {
return ''; return '';
}; };
$.fn.dataTable.render.RepositoryNumberValue = function(data) { $.fn.dataTable.render.RepositoryNumberValue = function (data) {
return `<span class="number-value" data-value="${data.value}"> return `<span class="number-value" data-value="${data.value}">
${data.value.toLocaleString('en-US', { timeZone: 'UTC' })} ${data.value}
</span>`; </span>`;
}; };

2
app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue
View file

@ -33,7 +33,7 @@
'max-h-[4rem]': collapsed, 'max-h-[4rem]': collapsed,
'max-h-[40rem]': !collapsed 'max-h-[40rem]': !collapsed
}"> }">
{{ colVal.toLocaleString('en-US', { timezone: 'UTC' }) }} {{ colval }}
</div> </div>
<div v-else <div v-else
class="text-sn-dark-grey font-inter text-sm font-normal leading-5"> class="text-sn-dark-grey font-inter text-sm font-normal leading-5">

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

@ -4,7 +4,7 @@ module RepositoryDatatable
class RepositoryNumberValueSerializer < RepositoryBaseValueSerializer class RepositoryNumberValueSerializer < RepositoryBaseValueSerializer
def value def value
decimals = scope[:column].metadata.fetch('decimals', Constants::REPOSITORY_NUMBER_TYPE_DEFAULT_DECIMALS).to_i decimals = scope[:column].metadata.fetch('decimals', Constants::REPOSITORY_NUMBER_TYPE_DEFAULT_DECIMALS).to_i
value_object.data.round(value_object.data.scale.zero? ? 0 : decimals) value_object.data.round(value_object.data.scale.zero? ? 0 : decimals).to_s
end end
end end
end end