Add locale support for numbers

Author: vaijira

Cargo.toml

@@ -31,9 +31,11 @@ gloo-utils = "0.2"
 html5ever = "0.25"
 infer = "0.16.0"
 instant = { version = "0.1", features =  [ "wasm-bindgen", "inaccurate" ] }
+isin = "0.1.18"
 js-sys = "0.3"
 log = "0.4"
 nom = "6.0"
+num-format = "0.4.4"
 once_cell = "1.5"
 pdf-extract = "0.7"
 rust_decimal = "1.7"
@@ -45,7 +47,6 @@ wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 wasm-logger = "0.2"
 zip = { version = "0.5", default-features = false, features = ["deflate"]}
-isin = "0.1.18"
 
 [dev-dependencies]
 ctor = "0.1"

src/data.rs

@@ -1,4 +1,5 @@
 use chrono::NaiveDate;
+use num_format::Locale;
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 use std::{convert::From, sync::Arc};
@@ -7,7 +8,9 @@ pub type AccountNotes = Vec<AccountNote>;
 pub type BalanceNotes = Vec<BalanceNote>;
 pub type Aeat720Records = Vec<Aeat720Record>;
 
+pub const DEFAULT_YEAR: usize = 2024;
 pub const SPAIN_COUNTRY_CODE: &str = "ES";
+pub const DEFAULT_LOCALE: &Locale = &Locale::es;
 
 #[derive(Clone, Debug, Eq, PartialEq, Deserialize, Serialize)]
 pub enum BrokerOperation {
@@ -142,8 +145,6 @@ pub struct Aeat720Information {
     pub personal_info: PersonalInformation,
 }
 
-pub const DEFAULT_YEAR: usize = 2024;
-
 impl Aeat720Information {
     pub fn full_name(&self) -> String {
         self.personal_info.surname.clone() + " " + &self.personal_info.name

src/table.rs

@@ -11,8 +11,8 @@ use web_sys::{HtmlElement, HtmlInputElement};
 
 use crate::{
     css::{TABLE_CAPTION, TABLE_ROW, TABLE_STYLE},
-    data::{Aeat720Record, BrokerInformation},
-    utils::{icons::render_svg_trash_icon, usize_to_date},
+    data::{Aeat720Record, BrokerInformation, DEFAULT_LOCALE},
+    utils::{decimal::decimal_to_str_locale, icons::render_svg_trash_icon, usize_to_date},
 };
 
 const ISIN_NOT_VALID_ERR_MSG: &str = "ISIN no válido";
@@ -250,7 +250,7 @@ impl Table {
                 .attr("type", "text")
                 .attr("size", "15")
                 .attr("maxlength", "15")
-                .attr("value", &r.record.value_in_euro.to_string())
+                .attr("value", &decimal_to_str_locale(&r.record.value_in_euro, DEFAULT_LOCALE))
               }))
             }))
         })
@@ -264,7 +264,7 @@ impl Table {
                 .attr("type", "text")
                 .attr("size", "15")
                 .attr("maxlength", "15")
-                .attr("value", &r.record.quantity.to_string())
+                .attr("value", &decimal_to_str_locale(&r.record.quantity, DEFAULT_LOCALE))
               }))
             }))
         })

src/utils/decimal.rs

@@ -1,7 +1,30 @@
+use num_format::Locale;
+use rust_decimal::Decimal;
+
 pub fn transform_i18n_es_str(input: &str) -> String {
     str::replace(&str::replace(input, ".", ""), ",", ".")
 }
 
 pub fn normalize_str(input: &str) -> String {
     str::replace(input, ",", "")
 }
+
+pub fn decimal_to_str_locale(number: &Decimal, locale: &Locale) -> String {
+    let mut result = number.to_string();
+    if let Some(idx) = result.rfind('.') {
+        result.replace_range(idx..idx + 1, locale.decimal());
+    }
+
+    result
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_decimal_to_str_locale() {
+        let x = Decimal::new(2314, 2);
+        assert_eq!("23,14", decimal_to_str_locale(&x, &Locale::es));
+    }
+}