From 71bbe02ebafc1ada0318a53facde3734722a475e Mon Sep 17 00:00:00 2001 From: Gregor Lasnibat Date: Mon, 29 Jan 2024 14:36:57 +0100 Subject: [PATCH] (fix) Non decimal number in inventory table has commas [gl_SCI_10086] --- .../javascripts/repositories/renderers/view_renderers.js | 4 ++-- .../repository_values/RepositoryNumberValue.vue | 2 +- .../repository_number_value_serializer.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/repositories/renderers/view_renderers.js b/app/assets/javascripts/repositories/renderers/view_renderers.js index 461c82d85..fd928fb26 100644 --- a/app/assets/javascripts/repositories/renderers/view_renderers.js +++ b/app/assets/javascripts/repositories/renderers/view_renderers.js @@ -162,9 +162,9 @@ $.fn.dataTable.render.defaultRepositoryNumberValue = function() { return ''; }; -$.fn.dataTable.render.RepositoryNumberValue = function(data) { +$.fn.dataTable.render.RepositoryNumberValue = function (data) { return ` - ${data.value.toLocaleString('en-US', { timeZone: 'UTC' })} + ${data.value} `; }; diff --git a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue index ba23c291c..16d67e885 100644 --- a/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue +++ b/app/javascript/vue/repository_item_sidebar/repository_values/RepositoryNumberValue.vue @@ -33,7 +33,7 @@ 'max-h-[4rem]': collapsed, 'max-h-[40rem]': !collapsed }"> - {{ colVal.toLocaleString('en-US', { timezone: 'UTC' }) }} + {{ colval }}
diff --git a/app/serializers/repository_datatable/repository_number_value_serializer.rb b/app/serializers/repository_datatable/repository_number_value_serializer.rb index f70426988..eaccc1dab 100644 --- a/app/serializers/repository_datatable/repository_number_value_serializer.rb +++ b/app/serializers/repository_datatable/repository_number_value_serializer.rb @@ -4,7 +4,7 @@ module RepositoryDatatable class RepositoryNumberValueSerializer < RepositoryBaseValueSerializer def value 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